Changeset e58af05 for server/lib/gutenbach/server/printer.py

Timestamp:

Dec 27, 2011, 11:33:55 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

ce2abc5

Parents:

7c143c9

git-author:

Jessica B. Hamrick <jhamrick@…> (12/27/11 23:33:55)

git-committer:

Jessica B. Hamrick <jhamrick@…> (12/27/11 23:33:55)

Message:

Implement send-document operation and add threading so that the gutenbach server can play jobs

File:

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

server/lib/gutenbach/server/printer.py

@@ -1 +1 @@
 #import alsaaudio as aa
-from .exceptions import InvalidJobException, InvalidPrinterStateException
-from .job import Job
+from . import InvalidJobException, InvalidPrinterStateException
+from . import Job
 import gutenbach.ipp as ipp
 import logging
@@ -221 +221 @@
         return job
 
+    def send_document(self, jobid, document):
+        job = self.jobs[jobid]
+        if job.status != ipp.JobStates.HELD:
+            raise InvalidPrinterStateException(
+                "Invalid job state: %d" % job.status)
+        job.document = document
+        job.status = ipp.JobStates.PENDING
+
     def print_job(self, job):
         pass
@@ -226 +234 @@
     def complete_job(self, jobid):
         job = self.jobs[self.active_jobs.pop(0)]
-        if job.jobid != jobid:
-            raise InvalidJobException(
-                "Completed job %d has unexpected job id %d!" % \
-                (job.jobid, jobid))
-        
         self.finished_jobs.append(job)
         job.finish()
-        return job.jobid
+        return job.jid
 
     def start_job(self, jobid):
         job = self.jobs[self.active_jobs[0]]
-        if job.jobid != jobid:
-            raise InvalidJobException(
-                "Completed job %d has unexpected job id %d!" % \
-                (job.jobid, jobid))
-
-        if job.status == 'playing':
+        if job.status != ipp.JobStates.PENDING:
             raise InvalidPrinterStateException(
-                "Next job in queue (id %d) is " + \
-                "already playing!" % jobid)
-
+                "Invalid job state: %s" % job.status)
         job.play()
+
+    @property
+    def next_job(self):
+        if len(self.active_jobs) == 0:
+            job = None
+        else:
+            job = self.active_jobs[0]
+        return job        
 
     def get_job(self, jobid):