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

Timestamp:

Jan 12, 2012, 2:35:57 AM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

c94fa32

Parents:

adf8cf0

git-author:

Jessica B. Hamrick <jhamrick@…> (01/12/12 02:35:57)

git-committer:

Jessica B. Hamrick <jhamrick@…> (01/12/12 02:35:57)

Message:

Better threading with job.py and player.py

File:

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

server/lib/gutenbach/server/job.py

@@ -323 +323 @@
 
     def cancel(self):
-        """Non-blocking cancel. The job must not have been previously
+        """Blocking cancel. The job must not have been previously
         aborted or completed (though this method will succeed if it
         was previously cancelled).  This should be used to stop the
@@ -335 +335 @@
         """
         
-        def _cancelled():
-            logger.info("cancelled job %s" % str(self))
-            self._why_done = "cancelled"
-
         if self.is_playing:
-            self.player.callback = _cancelled
+            self.player._callback = None
             self.player.mplayer_stop()
+
         elif self.is_done and not self._why_done == "cancelled":
             raise errors.InvalidJobStateException(self.state)
-        else:
-            _cancelled()
+
+        logger.info("cancelled job %s" % str(self))
+        self._why_done = "cancelled"
 
     def abort(self):
-        """Non-blocking abort. The job must not have been previously
+        """Blocking abort. The job must not have been previously
         cancelled or completed (though this method will succeed if it
         was previously aborted).  This should be used to stop the job
@@ -360 +358 @@
         """
 
-        def _aborted():
-            logger.info("aborted job %s" % str(self))
-            self._why_done = "aborted"
-
         if self.is_playing:
-            self.player.callback = _aborted
+            self.player._callback = None
             self.player.mplayer_stop()
+
         elif self.is_done and not self._why_done == "aborted":
             raise errors.InvalidJobStateException(self.state)
-        else:
-            _aborted()
+
+        logger.info("aborted job %s" % str(self))
+        self._why_done = "aborted"
 
     def restart(self):