Changeset eee389a for server/lib/gutenbach/server/job.py

Timestamp:

Jan 11, 2012, 3:13:30 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

d21198f

Parents:

be6ff03

git-author:

Jessica B. Hamrick <jhamrick@…> (01/11/12 15:13:30)

git-committer:

Jessica B. Hamrick <jhamrick@…> (01/11/12 15:13:30)

Message:

Better threading model

File:

• server/lib/gutenbach/server/job.py (modified) (10 diffs)

server/lib/gutenbach/server/job.py

@@ -1 @@
-from . import InvalidJobException, InvalidPrinterStateException
+from . import InvalidJobStateException, MissingDataException
+from .player import Player
 from gutenbach.ipp import JobStates as States
 import os
 import gutenbach.ipp as ipp
 import logging
-import subprocess
-import time
 
 # initialize logger
@@ -34 +33 @@
         self.name = name
         self.size = size
-        self.status = States.HELD
-
-        self.document = None
+        self.state = States.HELD
+        self.priority = 1
+
         self.document_name = None
         self.document_format = None
@@ -48 +47 @@
         return "<Job %d '%s'>" % (self.id, self.name)
 
+    def __cmp__(self, other):
+        return cmp(self.priority, other.priority)
+
     ######################################################################
     ###                          Properties                            ###
@@ -98 +100 @@
 
         """
-        if self.document:
-            size = os.path.getsize(self.document.name)
-        else:
-            size = self._size
-        return size
+        return self._size
     @size.setter
     def size(self, val):
@@ -110 +108 @@
             self._size = 0
 
+    @property
+    def is_playing(self):
+        return self.state == States.PROCESSING
+
+    @property
+    def is_ready(self):
+        return self.state == States.PENDING
+
+    @property
+    def is_finished(self):
+        return self.state != States.PENDING and self.state != States.PROCESSING
+        
     ######################################################################
     ###                            Methods                             ###
@@ -115 +125 @@
 
     def play(self):
+        """Non-blocking play function.
+
+        """
+        
+        # make sure the job is waiting to be played and that it's
+        # valid
+        if self.state != States.PENDING:
+            raise InvalidJobStateException(self.state)
+        
+        # and set the state to processing if we're good to go
         logger.info("playing job %s" % str(self))
-        self.status = States.PROCESSING
-        self.player = subprocess.Popen(
-            "/usr/bin/mplayer -really-quiet -slave %s" % self.document.name,
-            shell=True,
-            stderr=subprocess.PIPE,
-            stdout=subprocess.PIPE)
-        while self.player.poll() is None:
-            time.sleep(0.1)
-        logger.info("mplayer finished with code %d" % self.player.returncode)
-        stderr = self.player.stderr.read()
-        stdout = self.player.stdout.read()
-        if stderr.strip() != "":
-            logger.error(stderr)
-        logger.debug(stdout)
-        self.player = None
-        self.printer.complete_job(self.id)
-
-    def finish(self):
-        logger.info("finished job %s" % str(self))
-        self.status = States.COMPLETE
+        self.state = States.PROCESSING
+        self.player.callback = self._completed
+        self.player.run()
+
+    def pause(self):
+        if self.player:
+            self.player.mplayer_pause()
+
+    def stop(self):
+        if self.player:
+            self.player.callback = self._stopped
+            self.player.mplayer_stop()
+
+    def _completed(self):
+        if self.state != States.PROCESSING:
+            raise InvalidJobStateException(self.state)
+        logger.info("completed job %s" % str(self))
+        self.state = States.COMPLETE
+        self.player = None
+
+    def _canceled(self):
+        if self.state != States.PROCESSING:
+            raise InvalidJobStateException(self.state)
+        logger.info("canceled job %s" % str(self))
+        self.state = States.CANCELLED
+        self.player = None
+
+    def _stopped(self):
+        if self.state != States.PROCESSING:
+            raise InvalidJobStateException(self.state)
+        logger.info("stopped job %s" % str(self))
+        self.state = States.STOPPED
+        self.player = None
+
+    def _aborted(self):
+        if self.state != States.PROCESSING:
+            raise InvalidJobStateException(self.state)
+        logger.info("aborted job %s" % str(self))
+        self.state = States.ABORTED
+        self.player = None
 
     ######################################################################
@@ -149 +189 @@
         return ipp.JobName(self.name)
 
-    # XXX: we need to actually calculate this!
     @property
     def job_originating_user_name(self):
         return ipp.JobOriginatingUserName(self.creator)
 
-    # XXX: we need to actually calculate this!
     @property
     def job_k_octets(self):
@@ -161 +199 @@
     @property
     def job_state(self):
-        return ipp.JobState(self.status)
+        return ipp.JobState(self.state)
 
     @property
@@ -175 +213 @@
         pass
 
-    def send_document(self,
-                      document,
-                      document_name=None,
-                      document_format=None,
-                      document_natural_language=None,
-                      requesting_user_name=None,
-                      compression=None,
+    def send_document(self, document, document_name=None,
+                      document_format=None, document_natural_language=None,
+                      requesting_user_name=None, compression=None,
                       last_document=None):
 
-        if self.status != States.HELD:
-            raise InvalidJobStateException(self.status)
-        
-        self.document = document
+        if self.state != States.HELD:
+            raise InvalidJobStateException(self.state)
+
+        self.player = Player(document)
+
+        if self.size == 0:
+            self.size = os.path.getsize(document.name)
+        
         self.document_name = str(document_name)
         self.document_format = str(document_format)
@@ -193 +231 @@
         self.creator = str(requesting_user_name)
         self.compression = str(compression)
-        self.status = States.PENDING
+        self.state = States.PENDING
 
         logger.debug("document for job %d is '%s'" % (self.id, self.document_name))