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

Timestamp:

Dec 18, 2011, 11:18:16 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

9eeab06

Parents:

d04a689

git-author:

Jessica B. Hamrick <jhamrick@…> (12/18/11 23:18:16)

git-committer:

Jessica B. Hamrick <jhamrick@…> (12/18/11 23:18:16)

Message:

Refactor code to handle the operations a little bit more logically

File:

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

server/lib/gutenbach/server/job.py

@@ -7 +7 @@
 class Job(object):
 
+    attributes = [
+        "job-id",
+        "job-name",
+        "job-originating-user-name",
+        "job-k-octets",
+        "job-state",
+        "job-printer-uri"
+        ]
+
     def __init__(self, document=None):
         """Initialize a Gutenbach job.
@@ -14 +23 @@
         """
          
-        self._jobid = None
-        self._status = 'initializing'
+        self._id = None
+        self._name = document
+        self._status = None
         self._document = document
         self._printer = None
 
     @property
-    def jobid(self):
-        return self._jobid
+    def job_id(self):
+        return ipp.Attribute(
+            'job-id',
+            [ipp.Value(ipp.Tags.INTEGER, self._id)])
 
-    @jobid.setter
-    def jobid(self, val):
-        raise AttributeError("Setting jobid is illegal!")
+    @property
+    def job_name(self):
+        return ipp.Attribute(
+            'job-name',
+            [ipp.Value(ipp.Tags.NAME_WITHOUT_LANGUAGE, self._name)])
 
+    # XXX: we need to actually calculate this!
+    @property
+    def job_originating_user_name(self):
+        return ipp.Attribute(
+            'job-originating-user-name',
+            [ipp.Value(ipp.Tags.NAME_WITHOUT_LANGUAGE, "jhamrick")])
+
+    # XXX: we need to actually calculate this!
+    @property
+    def job_k_octets(self):
+        return ipp.Attribute(
+            'job-k-octets',
+            [ipp.Value(ipp.Tags.INTEGER, 1)])
+
+    @property
+    def job_state(self):
+        return ipp.Attribute(
+            'job-state',
+            [ipp.Value(ipp.Tags.ENUM, self._status)])
+
+    @property
+    def job_printer_uri(self):
+        return ipp.Attribute(
+            'job-printer-uri',
+            [ipp.Value(ipp.Tags.URI, self._printer._uri)])
+
+    def get_job_attributes(self, request):
+        attributes = [getattr(self, attr.replace("-", "_")) for attr in self.attributes]
+        return attributes
+
+    
+    #######
     @property
     def document(self):
@@ -41 +87 @@
         return self._status
 
-    @status.setter
-    def status(self, val):
-        raise AttributeError(
-            "Setting status directly is illegal!  " + \
-            "Please use enqueue(), play(), or finish().")
-
     @property
     def printer(self):
         return self._printer
 
-    @printer.setter
-    def printer(self, val):
-        raise AttributeError(
-            "Setting printer directly is illegal!  " + \
-            "Please use enqueue().")
-
-    def enqueue(self, printer, jobid):
-        if self.status != 'initializing':
+    def enqueue(self, printer, job_id):
+        if self._status != None:
             raise InvalidJobException(
                 "Cannot enqueue a job that has " + \
                 "already been initialized!")
         self._printer = printer
-        self._jobid = jobid
-        self._status = 'active'
+        self._job_id = job_id
+        self._status = const.JobStates.PENDING
 
     def play(self):
@@ -71 +105 @@
                 "Cannot play an inactive job!")
         
-        self._status = 'playing'
+        self._status = const.JobStates.PROCESSING
         # TODO: add external call to music player
         print "Playing job %s" % str(self)
-        self.printer.complete_job(self.jobid)
+        self._printer.complete_job(self._id)
 
     def finish(self):
-        self._status = 'finished'
+        self._status = const.JobStates.COMPLETE
 
     def __repr__(self):
@@ -84 +118 @@
     def __str__(self):
         return "<Job %d '%s'>" % \
-               (self.jobid if self.jobid is not None else -1, \
-                                  self.document)
+               (self._id if self._id is not None else -1, \
+                self._document)