Changeset 5d24a81 for server/lib/gutenbach/server/job.py

Timestamp:

Mar 14, 2011, 11:28:58 PM (13 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

5c5fe6d

Parents:

1a98666

git-author:

Jessica B. Hamrick <jhamrick@…> (03/14/11 23:28:58)

git-committer:

Jessica B. Hamrick <jhamrick@…> (03/14/11 23:28:58)

Message:

Fix bugs in Job and Printer

File:

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

server/lib/gutenbach/server/job.py

@@ -55 +55 @@
             "Please use enqueue().")
 
-    def enqueue(self, printer):
+    def enqueue(self, printer, jobid):
         if self.status != 'initializing':
             raise InvalidJobException(
@@ -61 +61 @@
                 "already been initialized!")
         self._printer = printer
+        self._jobid = jobid
         self._status = 'active'
 
@@ -70 +71 @@
         self._status = 'playing'
         # TODO: add external call to music player
+        print "Playing job %s" % str(self)
         self.printer.complete_job(self.jobid)
 
-    def finished(self):
+    def finish(self):
         self._status = 'finished'
 
@@ -79 +81 @@
 
     def __str__(self):
-        return "<Job %d>" % self.jobid
+        return "<Job %d '%s'>" % \
+               (self.jobid if self.jobid is not None else -1, \
+                                  self.document)