Changeset 1a63bf7 for server/lib/gutenbach/server/job.py

Timestamp:

Dec 20, 2011, 11:17:58 AM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

08a764a

Parents:

6ed9d7a

git-author:

Jessica B. Hamrick <jhamrick@…> (12/20/11 11:17:58)

git-committer:

Jessica B. Hamrick <jhamrick@…> (12/20/11 11:17:58)

Message:

Remove ipp-specific objects from server/job and server/printers (but keep ipp-specific attribute names)

File:

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

server/lib/gutenbach/server/job.py

@@ -7 +7 @@
 class Job(object):
 
+    # for IPP
     attributes = [
         "job-id",
@@ -14 +15 @@
         "job-state",
         "job-printer-uri"
-        ]
+    ]
 
     def __init__(self, document=None):
@@ -23 +24 @@
         """
          
-        self._id = None
-        self._name = document
-        self._status = None
-        self._document = document
-        self._printer = None
+        self.jid = None
+        self.name = document
+        self.status = None
+        self.document = document
+        self.printer = None
+
+    def __getattr__(self, attr):
+        try:
+            return super(Job, self).__getattr__(attr)
+        except AttributeError:
+            pass
+
+        return super(Job, self).__getattr__(
+            attr.replace("-", "_"))
+
+    def __hasattr__(self, attr):
+        has = super(Job, self).__hasattr__(attr)
+        if not has:
+            has = super(Job, self).__hasattr__(
+                attr.replace("-", "_"))
+        return has
+
+    #### Job attributes
 
     @property
     def job_id(self):
-        return ipp.Attribute(
-            'job-id',
-            [ipp.Value(ipp.Tags.INTEGER, self._id)])
+        return self.jid
 
     @property
     def job_name(self):
-        return ipp.Attribute(
-            'job-name',
-            [ipp.Value(ipp.Tags.NAME_WITHOUT_LANGUAGE, self._name)])
+        return 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")])
+        return "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)])
+        return "job-k-octets"
 
     @property
     def job_state(self):
-        return ipp.Attribute(
-            'job-state',
-            [ipp.Value(ipp.Tags.ENUM, self._status)])
+        return self.status
 
     @property
     def job_printer_uri(self):
-        return ipp.Attribute(
-            'job-printer-uri',
-            [ipp.Value(ipp.Tags.URI, self._printer._uri)])
+        return self.printer.uri
 
     def get_job_attributes(self, request):
-        attributes = [getattr(self, attr.replace("-", "_")) for attr in self.attributes]
+        attributes = [(attr, getattr(self, attr)) for attr in self.attributes]
         return attributes
-
     
     #######
-    @property
-    def document(self):
-        return self._document
-
-    @document.setter
-    def document(self, path):
-        if not os.path.exists(path):
-            raise IOError("Document '%s' does not exist!" % path)
-        self._document = path
-
-    @property
-    def status(self):
-        return self._status
-
-    @property
-    def printer(self):
-        return self._printer
 
     def enqueue(self, printer, job_id):
-        if self._status != None:
+        if self.status != None:
             raise InvalidJobException(
                 "Cannot enqueue a job that has " + \
                 "already been initialized!")
-        self._printer = printer
-        self._job_id = job_id
-        self._status = const.JobStates.PENDING
+        self.printer = printer
+        self.jid = job_id
+        self.status = const.JobStates.PENDING
 
     def play(self):
@@ -105 +94 @@
                 "Cannot play an inactive job!")
         
-        self._status = const.JobStates.PROCESSING
+        self.status = const.JobStates.PROCESSING
         # TODO: add external call to music player
         print "Playing job %s" % str(self)
-        self._printer.complete_job(self._id)
+        self.printer.complete_job(self.jid)
 
     def finish(self):
-        self._status = const.JobStates.COMPLETE
+        self.status = const.JobStates.COMPLETE
 
     def __repr__(self):
@@ -118 +107 @@
     def __str__(self):
         return "<Job %d '%s'>" % \
-               (self._id if self._id is not None else -1, \
-                self._document)
+               (self.jid if self.jid is not None else -1, \
+                self.document)