Changeset 8de3c81 for server

Timestamp:

Jan 21, 2012, 3:19:37 PM (12 years ago)

Author:

Daniel Cooper <danny@…>

Branches:

no-cups

Children:

5141ed8

Parents:

8d89b3d (diff), 7c8a2f8 (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 15:19:37)

git-committer:

Daniel Cooper <danny@…> (01/21/12 15:19:37)

Message:

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

Conflicts:

server/lib/gutenbach/server/requests.py

Location:

server/lib

Files:

• TODO (modified) (1 diff)
• gutenbach/server/job.py (modified) (1 diff)
• gutenbach/server/printer.py (modified) (1 diff)
• gutenbach/server/requests.py (modified) (1 diff)

server/lib/TODO

@@ -21 +21 @@
      [ ] send uri
      [ ] set job attributes
-     [ ] restart job
-     [ ] promote job
+     [X] restart job
+     [\] promote job
 
 - add support in job.py for:

server/lib/gutenbach/server/job.py

@@ -369 +369 @@
 
     def restart(self):
-        # XXX: Todo
-        pass
+        """Non-blocking restart.  Job must be finished (see
+        'GutenbachJob.is_done'), and will be ready to be played (see
+        'GutenbachJob.is_ready') if this method is successful.
+
+        Raises
+        ------
+        InvalidJobStateException
+            If the job is not done.
+
+        """
+
+        if not self.is_done:
+            raise errors.InvalidJobStateException(self.state)
+
+        logger.debug("restarting job %d" % (self.id, self.document))
+
+        self._why_done = None
+        self.spool(self.document)

server/lib/gutenbach/server/printer.py

@@ -402 +402 @@
         pass
 
-    def restart_job(self):
-        pass
-
-    def promote_job(self):
-        pass
+    def restart_job(self, job_id, requesting_user_name=None):
+        job = self.get_job(job_id)
+        try:
+            job.restart()
+        except InvalidJobStateException:
+            # XXX
+            raise ipp.errors.ClientErrorNotPossible
+
+        with self.lock:
+            self.finished_jobs.remove(job_id)
+            self.pending_jobs.append(job_id)
+
+    def promote_job(self, job_id, requesting_user_name=None):
+        # According to RFC 3998, we need to put the job at the front
+        # of the queue (so that when the currently playing job
+        # completes, this one will go next
+        
+        job = self.get_job(job_id)
+        job.priority = 1 # XXX we need to actually do something
+                         # correct here

server/lib/gutenbach/server/requests.py

@@ -896 +896 @@
     @handler_for(ipp.OperationCodes.SEND_URI)
     def send_uri(self, request, response):
+<<<<<<< HEAD
        raise ipp.errors.ServerErrorOperationNotSupported
+=======
+        """3.2.2 Send URI
+
+        This OPTIONAL operation is identical to the Send-Document
+        operation (see section 3.3.1) except that a client MUST supply
+        a URI reference ('document-uri' operation attribute) rather
+        than the document data itself.  If a Printer object supports
+        this operation, clients can use both Send-URI or Send-Document
+        operations to add new documents to an existing multi-document
+        Job object.  However, if a client needs to indicate that the
+        previous Send-URI or Send-Document was the last document, the
+        client MUST use the Send-Document operation with no document
+        data and the 'last-document' flag set to 'true' (rather than
+        using a Send-URI operation with no 'document-uri' operation
+        attribute).
+
+        If a Printer object supports this operation, it MUST also
+        support the Print-URI operation (see section 3.2.2).
+
+        The Printer object MUST validate the syntax and URI scheme of
+        the supplied URI before returning a response, just as in the
+        Print-URI operation.  The IPP Printer MAY validate the
+        accessibility of the document as part of the operation or
+        subsequently (see section 3.2.2).
+
+        Request
+        -------
+
+        Group 1: Operation Attributes
+            REQUIRED 'attributes-charset' 
+            REQUIRED 'attributes-natural-language' 
+            REQUIRED 'job-id' (integer(1:MAX)) and 'printer-uri' (uri)
+            REQUIRED 'document-uri' (uri)
+              -or-   'job-uri' (uri)
+            OPTIONAL 'requesting-user-name' (name(MAX))
+            OPTIONAL 'document-name' (name(MAX))
+            OPTIONAL 'compression' (type3 keyword)
+            OPTIONAL 'document-format' (mimeMediaType)
+            OPTIONAL 'document-natural-language' (naturalLanguage)
+        Group 2: Document Content
+            
+        Response
+        --------
+
+        Group 1: Operation Attributes
+            OPTIONAL 'status-message' (text(255))
+            OPTIONAL 'detailed-status-message' (text(MAX))
+            REQUIRED 'attributes-charset'
+            REQUIRED 'attributes-natural-language'
+        Group 2: Unsupported Attributes
+        Group 3: Job Object Attributes
+            REQUIRED 'job-uri' (uri)
+            REQUIRED 'job-id' (integer(1:MAX))
+            REQUIRED 'job-state' (type1 enum)
+            REQUIRED 'job-state-reasons' (1setOf type2 keyword)
+            OPTIONAL 'job-state-message' (text(MAX))
+            OPTIONAL 'number-of-intervening-jobs' (integer(0:MAX))
+
+        """
+        
+        operation = request.attribute_groups[0]
+
+        job_id = None
+        printer_uri = None
+        requesting_user_name = None
+        document_name = None
+        compression = None
+        document_format = None
+        document_natural_language = None
+        last_document = None
+
+        # required attributes
+        if 'job-id' not in operation:
+            raise ipp.errors.ClientErrorBadRequest("Missing 'job-id' attribute")
+        job_id = verify_attribute(operation['job-id'], ipp.JobId)[0]
+
+        if 'last-document' not in operation:
+            raise ipp.errors.ClientErrorBadRequest("Missing 'last-document' attribute")
+        last_document = verify_attribute(operation['last-document'], ipp.LastDocument)[0]
+
+        if 'document-uri' not in operation:
+            raise ipp.errors.ClientErrorBadRequest("Missing 'document-uri' attribute")
+        document_uri = verify_attribute(operation['document-uri'], ipp.DocumentUri)[0]
+        if not last_document:
+            raise ipp.errors.ServerErrorMultipleJobsNotSupported
+
+        # optional attributes
+        if 'printer-uri' in operation:
+            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 'document-name' in operation:
+            document_name = verify_attribute(
+                operation['document-name'], ipp.DocumentName)[0]
+
+        if 'compression' in operation:
+            compression = verify_attribute(
+                operation['compression'], ipp.Compression)[0]
+
+        if 'document-format' in operation:
+            document_format = verify_attribute(
+                operation['document-format'], ipp.DocumentFormat)[0]
+
+        if 'document-natural-language' in operation:
+            document_natural_language = verify_attribute(
+                operation['document_natural_language'],
+                ipp.DocumentNaturalLanguage)[0]
+
+        try:
+            self.printer.send_uri(
+                job_id,
+                document_uri=document_uri,
+                document_name=document_name,
+                document_format=document_format,
+                document_natural_language=document_natural_language,
+                requesting_user_name=user_name,
+                compression=compression,
+                last_document=last_document)
+            attrs = self.printer.get_job_attributes(job_id)
+        except InvalidJobException:
+            raise ipp.errors.ClientErrorNotFound("bad job: %d" % job_id)
+
+        response.attribute_groups.append(ipp.AttributeGroup(
+            ipp.AttributeTags.JOB, attrs))
+>>>>>>> 7c8a2f82df069878680146d8ac18339ec96bd487
 
     @handler_for(ipp.OperationCodes.GET_JOB_ATTRIBUTES)