Changeset 7f1098c for server/lib/gutenbach

Timestamp:

Jan 21, 2012, 6:24:36 PM (12 years ago)

Author:

Daniel Cooper <danny@…>

Branches:

no-cups

Children:

6c60b2e

Parents:

279640c (diff), bd5bffc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Daniel Cooper <danny@…> (01/21/12 18:24:36)

git-committer:

Daniel Cooper <danny@…> (01/21/12 18:24:36)

Message:

Merge branch 'no-cups' of github.com:jhamrick/gutenbach into no-cups

Location:

server/lib/gutenbach/server

Files:

• job.py (modified) (1 diff)
• player.py (modified) (3 diffs)
• requests.py (modified) (1 diff)

server/lib/gutenbach/server/job.py

@@ -56 +56 @@
     def __del__(self):
         if self.player:
-            self.player.mplayer_stop()
+            if self.player.is_playing:
+                self.player.mplayer_stop()
+            if self.player.fh:
+                if self.player.fh.closed:
+                    self.player.fh.close()
             self.player = None
-        if self.document and not self.document.closed:
-            self.document.close()
-            self.document = None
-
+
+        self.document = None
         self.id = None
         self.creator = None

server/lib/gutenbach/server/player.py

@@ -28 +28 @@
     def is_playing(self):
         if self._dryrun:
-            return self.isAlive() and not self.is_done
+            return self.ident is not None and \
+                   self.isAlive() and \
+                   not self.is_done
         else:
-            return self.isAlive() and \
-                      not self.is_done and \
-                      self.player is not None and \
-                      self.player.poll() is None
-
+            return self.ident is not None and \
+                   self.isAlive() and \
+                   not self.is_done and \
+                   self.player is not None and \
+                   self.player.poll() is None
+        
     @property
     @sync
@@ -121 +124 @@
                 logger.warning("trying to pause non-playing job")
         time.sleep(self._lag)
-                
+
     def mplayer_stop(self):
-        # Note: Inner Lock due to join.
+        # Note: Inner lock due to join.
         with self.lock:
             if self.is_playing:
@@ -134 +137 @@
                 logger.warning("trying to stop non-playing job")
         self.join()
+

server/lib/gutenbach/server/requests.py

@@ -169 +169 @@
 
         """
+        operation = request.attribute_groups[0]
+        # requested printer uri
+        if 'printer-uri' not in operation:
+            raise ipp.errors.ClientErrorBadRequest("Missing 'printer-uri' attribute")
+        printer_uri = verify_attribute(operation['printer-uri'], ipp.PrinterUri)[0]
+        if printer_uri not in self.printer.uris:
+            raise ipp.errors.ClientErrorAttributes(
+                str(operation['printer-uri']), operation['printer-uri'])
+
+        if 'requesting-user-name' in operation:
+            user_name = verify_attribute(
+                operation['requesting-user-name'], ipp.RequestingUserName)[0]
+
+        if 'job-name' in operation:
+            job_name = verify_attribute(
+                operation['job-name'], ipp.JobName)[0]
+
+        if 'job-k-octets' in operation:
+            job_k_octets = verify_attribute(
+                operation['job-k-octets'], ipp.JobKOctets)[0]
+
+        if 'ipp-attribute-fidelity' in operation:
+            pass # don't care
+        if 'job-impressions' in operation:
+            pass # don't care
+        if 'job-media-sheets' in operation:
+            pass # don't care
+
+        # get attributes from the printer and add to response
+        job_id = self.printer.create_job(
+            requesting_user_name=requesting_user_name,
+            job_name=job_name,
+            job_k_octets=job_k_octets)
+        attrs = self.printer.get_job_attributes(job_id)
+        response.attribute_groups.append(ipp.AttributeGroup(
+            ipp.AttributeTags.JOB, attrs))
+            #raise ipp.errors.ServerErrorOperationNotSupported
+        # Get nescessary information for calling send_document
+        # Any field being set to None here just means that we either aren't using or haven't implemented parsing it
+        document = request.attribute_groups[2]
+        #XXX
+        document_format = None
+        document_natural_language = None
+        compression = None
+        last_document = None
+
+
         
-        raise ipp.errors.ServerErrorOperationNotSupported
-
+        # Actually put the document in the job
+        self.printer.send_document(job_id,document,
+                document_name = document_name,
+                document_format = document_format,
+                document_natural_language = document_natural_language,
+                requesting_user_name = requesting_user_name,
+                compression = compression,
+                last_document = last_document)
+        #fix this once jess pushes
+        self.print_job()
     @handler_for(ipp.OperationCodes.VALIDATE_JOB)
     def validate_job(self, request, response):