Changeset 5d24a81

Timestamp:

Mar 14, 2011, 11:28:58 PM (14 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

Location:

server/lib/gutenbach/server

Files:

• job.py (modified) (4 diffs)
• printer.py (modified) (3 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)

server/lib/gutenbach/server/printer.py

@@ -25 +25 @@
         self.jobs = {}
 
-        self._next_jobid = -1
+        self._next_jobid = 0
 
     @property
@@ -40 +40 @@
         self.active_jobs.append(jobid)
         self.jobs[jobid] = job
-        job.jobid = jobid
-        job.enqueue(self)
+        job.enqueue(self, jobid)
         return jobid
 
     def complete_job(self, jobid):
-        job = self.active_jobs.pop(0)
+        job = self.jobs[self.active_jobs.pop(0)]
         if job.jobid != jobid:
             raise InvalidJobException(
@@ -56 +55 @@
 
     def start_job(self, jobid):
-        job = self.active_jobs[0]
+        job = self.jobs[self.active_jobs[0]]
         if job.jobid != jobid:
             raise InvalidJobException(