Changeset 279640c

Timestamp:

Jan 21, 2012, 5:20:56 PM (12 years ago)

Author:

Daniel Cooper <danny@…>

Branches:

no-cups

Children:

7f1098c

Parents:

f70792f (diff), 57bc2dc (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 17:20:56)

git-committer:

Daniel Cooper <danny@…> (01/21/12 17:20:56)

Message:

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

Location:

server/lib

Files:

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

server/lib/TODO

@@ -69 +69 @@
    [ ] http://gutenbach.mit.edu/ticket/41
    [ ] http://gutenbach.mit.edu/ticket/18
+
+ === CONSIDERATIONS FOR MPD ===
+
+We are considering using MPD (the Music Player Daemon) for playback, instead
+of mplayer.  This gives us a pony (gapless playback), and makes some other
+things, like keeping track of the queue, much easier.  There is a lot of work
+needed to make this work, though.
+
+THIS ADDS A DEPENDENCY:  python-mpd
+
+We will have to re-implement all the functions in jobs.py, and completely
+re-structure player.py
+
+If we want video playback eventually (and we do), there will be some hackery
+involved.  We will pause mpd playback, do the video playback completely
+separately, and then resume mpd playback.
+
+Some almost-pseudocode:
+
+startup:
+  client = MPDClient()
+  client.connect(**{'host':'/var/run/mpd/socket', 'port':'6600'})
+
+adding a song to the queue:
+  Receive job
+  Put it into a file                    [gutenbach/FILENAME]
+  Tell MPD to add it to the queue       [client.addid('gutenbach/FILENAME')]
+  Find out what the id is
+  Store all the data [including the temporary filename]
+  IF WE ARE SUPPOSED TO BE PLAYING, MAKE SURE WE *ARE* PLAYING
+    In particular, if the queue was empty, start playback   [gutenbach.play()]
+
+when a job completes playing:
+  Remove the file                       [rm gutenbach/FILENAME]
+
+getting the queue:
+  get playlist, parse return            [client.playlistid()]
+
+removing a job:
+  dequeue it                  [client.deleteid('NUMBER')]
+  remove the file
+  tell them what you did
+
+restart song:
+  client.seek(0,1)   [0% through song 1...]
+

server/lib/gutenbach/server/job.py

@@ -53 +53 @@
         """
         return cmp(self.priority, other.priority)
+
+    def __del__(self):
+        if self.player:
+            self.player.mplayer_stop()
+            self.player = None
+        if self.document and not self.document.closed:
+            self.document.close()
+            self.document = None
+
+        self.id = None
+        self.creator = None
+        self.name = None
+        self.priority = None
+        self._why_done = None
 
     ######################################################################
@@ -259 +273 @@
         if not hasattr(document, "close"):
             raise errors.InvalidDocument, "no close attribute"
+        if not hasattr(document, "closed"):
+            raise errors.InvalidDocument, "no closed attribute"
 
     def spool(self, document=None):

server/lib/gutenbach/server/printer.py

@@ -9 +9 @@
 import traceback
 import sys
+import tempfile
 from . import sync
 
@@ -361 +362 @@
     ######################################################################
 
-    def print_job(self):
-        pass
-
-    def validate_job(self):
-        pass
+    def print_job(self, document, document_name=None, document_format=None,
+                  document_natural_language=None, requesting_user_name=None,
+                  compression=None, job_name=None, job_k_octets=None):
+
+        # create the job
+        job_id = self.create_job(
+            requesting_user_name=requesting_user_name,
+            job_name=job_name,
+            job_k_octets=job_k_octets)
+        
+        # send the document
+        self.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=False)
+
+        return job_id
+
+    def verify_job(self, document_name=None, document_format=None,
+                  document_natural_language=None, requesting_user_name=None,
+                  compression=None, job_name=None, job_k_octets=None):
+
+        job_id = self._next_job_id
+        job = GutenbachJob(
+            job_id,
+            creator=requesting_user_name,
+            name=job_name)
+        job.spool(tempfile.TemporaryFile())
+        job.abort()
+        del job
 
     def get_jobs(self, requesting_user_name=None, which_jobs=None,
@@ -397 +428 @@
         pass
 
-    def create_job(self, requesting_user_name=None, job_name=None, job_k_octets=None):
+    def create_job(self, requesting_user_name=None, job_name=None,
+                   job_k_octets=None):
+
         job_id = self._next_job_id
         self._next_job_id += 1
@@ -405 +438 @@
             creator=requesting_user_name,
             name=job_name)
-        
+
         self.jobs[job_id] = job
         self.pending_jobs.append(job_id)
@@ -425 +458 @@
         self.paused = True
 
-
-
     @sync
     def resume_printer(self):
@@ -441 +472 @@
         self.paused = False
 
+    @sync
     def get_printer_attributes(self, requested_attributes=None):
         if requested_attributes is None:
@@ -452 +484 @@
         return attributes
 
+    @sync
     def set_printer_attributes(self, job_id, attributes):
         for attr in attributes:
@@ -459 +492 @@
                 raise ipp.errors.ClientErrorAttributes
 
+    @sync
     def cancel_job(self, job_id, requesting_user_name=None):
         job = self.get_job(job_id)
@@ -467 +501 @@
             raise
 
+    @sync
     def send_document(self, job_id, document, document_name=None,
                       document_format=None, document_natural_language=None,
@@ -475 +510 @@
         job.spool(document)
 
+    @sync
     def send_uri(self, job_id, document_uri, document_name=None,
                  document_format=None, document_natural_language=None,
@@ -484 +520 @@
         #job.spool_uri(document_uri)
 
+    @sync
     def get_job_attributes(self, job_id, requested_attributes=None):
         if requested_attributes is None:
@@ -495 +532 @@
         return attributes
 
+    @sync
     def set_job_attributes(self, job_id, attributes):
         job = self.get_job(job_id)
@@ -504 +542 @@
             elif attr == "job-originating-user-name":
                 job.creator = attributes[attr] # XXX: do we want this?
-                
+
+    @sync
     def restart_job(self, job_id, requesting_user_name=None):
         job = self.get_job(job_id)
@@ -513 +552 @@
             raise ipp.errors.ClientErrorNotPossible
 
-        with self.lock:
-            self.finished_jobs.remove(job_id)
-            self.pending_jobs.append(job_id)
-
+        self.finished_jobs.remove(job_id)
+        self.pending_jobs.append(job_id)
+
+    @sync
     def promote_job(self, job_id, requesting_user_name=None):
         # According to RFC 3998, we need to put the job at the front

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):