Changeset 34a4e5d for server/lib/gutenbach/server/job.py

Timestamp:

Jan 11, 2012, 4:51:13 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

4126d3d

Parents:

d21198f

git-author:

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

git-committer:

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

Message:

Cancelling jobs work

File:

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

server/lib/gutenbach/server/job.py

@@ -69 +69 @@
 
     @property
+    def uri(self):
+        return self.uris[0]
+
+    @property
+    def uris(self):
+        return ["ipp://localhost/jobs/%d" % self.id,
+                "ipp://localhost:8000/jobs/%d" % self.id]
+
+    @property
     def creator(self):
         """The user who created the job; analogous to the IPP
@@ -118 +127 @@
     @property
     def is_finished(self):
-        return self.state != States.PENDING and self.state != States.PROCESSING
+        return self.state != States.PENDING and \
+               self.state != States.PROCESSING and \
+               self.state != States.HELD
         
     ######################################################################
@@ -141 +152 @@
 
     def pause(self):
-        if self.player:
+        if self.is_playing:
             self.player.mplayer_pause()
-
-    def stop(self):
-        if self.player:
-            self.player.callback = self._stopped
+            self.state = States.STOPPED
+
+    def cancel(self):
+        if self.is_playing:
+            self.player.callback = self._canceled
             self.player.mplayer_stop()
+        self.state = States.CANCELLED
+
+    def abort(self):
+        if self.is_playing:
+            self.player.callback = self._aborted
+            self.player.mplayer_stop()
+        self.state = states.ABORTED
 
     def _completed(self):
-        if self.state != States.PROCESSING:
-            raise InvalidJobStateException(self.state)
         logger.info("completed job %s" % str(self))
         self.state = States.COMPLETE
@@ -157 +174 @@
 
     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