Changeset 1180

Timestamp:

11/13/03 00:29:24 (20 years ago)

Author:

jalet

Message:

More work on new backend. This commit may be unstable.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (8 diffs)
• bin/edpykota (modified) (2 diffs)
• pykota/accounter.py (modified) (2 diffs)
• pykota/accounters/external.py (modified) (4 diffs)
• pykota/accounters/querying.py (modified) (5 diffs)
• pykota/accounters/stupid.py (modified) (4 diffs)

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.3  2003/11/12 23:27:44  jalet
+# More work on new backend. This commit may be unstable.
+#
 # Revision 1.2  2003/11/12 09:33:34  jalet
 # New CUPS backend supports device enumeration
@@ -120 +123 @@
         # we let the job pass through, but log a warning message
         thebackend.logger.log_message(_("Printer %s not registered in the PyKota system") % thebackend.printername, "warn")
+        action = "ALLOW"
     else :    
         for dummy in range(2) :
@@ -157 +161 @@
                 break    
                     
-        # if user exists, do accounting
         if user.Exists :
             # Is the current user allowed to print at all ?
@@ -168 +171 @@
             return 0
         
-    MAXTRIES = 12    # maximum number of tries to get the printer's internal page counter
-    TIMETOSLEEP = 10 # number of seconds to sleep between two tries to get the printer's internal page counter
-    requester = openRequester(thebackend.config, thebackend.printername)
-    def getPPC(requester, backend) :
-        for i in range(MAXTRIES) :
-            try :
-                counterbeforejob = requester.getPrinterPageCounter(backend.printerhostname)
-            except PyKotaRequesterError, msg :
-                # can't get actual page counter, assume printer is off or warming up
-                # log the message anyway.
-                backend.logger.log_message("%s" % msg, "warn")
-                counterbeforejob = None
-            else :    
-                # printer answered, it is on so we can exit the loop
-                break
-            time.sleep(TIMETOSLEEP)    
-        return counterbeforejob    
-        
     if action not in ["ALLOW", "WARN"] :    
         # if not allowed to print then die, else proceed.
@@ -193 +178 @@
     else :
         # pass the job untouched to the underlying layer
-        # but get printer page counter before and after
-        # print job is submitted to the hardware.
-        
-        # get page counter before job
-        before = getPPC(requester, thebackend)
-        
-        # executes backend
-        # TODO : use correct original backend.
+        # and starts accounting at the same time
+        thebackend.accounter.beginJob(printer, user)
+        
+        # executes original backend
+        #mustclose = 0    
+        #if thebackend.inputfile is not None :    
+        #    if hasattr(thebackend.inputfile, "read") :
+        #        infile = thebackend.inputfile
+        #    else :    
+        #        infile = open(thebackend.inputfile, "rb")
+        #    mustclose = 1
+        #else :    
+        #    infile = sys.stdin
+            
         realbackend = os.path.join(os.path.split(sys.argv[0])[0], thebackend.originalbackend)
         retcode = os.spawnve(os.P_WAIT, realbackend, [os.environ["DEVICE_URI"]] + sys.argv[1:], os.environ)
     
-    # get page counter after job
-    after = getPPC(requester, thebackend)
-    
-    # Computes the last job size as the difference between internal page
-    # counter in the printer and last page counter taken from the Quota
-    # Storage database for this particular printer
-    try :
-        jobsize = (after - before)    
-    except :    
-        jobsize = 0
-        
+    # stops accounting. 
+    thebackend.accounter.endJob(printer, user)
+        
+    # retrieve the job size    
+    jobsize = thebackend.accounter.getJobSize()
+    
     # update the quota for the current user on this printer 
     if printer.Exists :
@@ -223 +209 @@
         
         # adds the current job to history    
-        printer.addJobToHistory(thebackend.jobid, user, after, action, jobsize)
+        printer.addJobToHistory(thebackend.jobid, user, thebackend.accounter.getLastPageCounter(), action, jobsize)
     
     return retcode
@@ -242 +228 @@
             if status is None :
                 for d in devices :
+                    # each line is of the form : 'xxxx xxxx "xxxx xxx" "xxxx xxx"'
+                    # so we have to decompose it carefully
                     fdevice = cStringIO.StringIO("%s" % d)
                     tokenizer = shlex.shlex(fdevice)
@@ -253 +241 @@
                             break
                     fdevice.close()
-                    (devicetype, device, name, fullname) = arguments
-                    if name.startswith('"') and name.endswith('"') :
-                        name = name[1:-1]
-                    if fullname.startswith('"') and fullname.endswith('"') :
-                        fullname = fullname[1:-1]
-                    print '%s cupspykota:%s "PyKota+%s" "PyKota managed %s"' % (devicetype, device, name, fullname)    
+                    try :
+                        (devicetype, device, name, fullname) = arguments
+                    except ValueError :    
+                        pass    # ignore this 'bizarre' device
+                    else :    
+                        if name.startswith('"') and name.endswith('"') :
+                            name = name[1:-1]
+                        if fullname.startswith('"') and fullname.endswith('"') :
+                            fullname = fullname[1:-1]
+                        print '%s cupspykota:%s "PyKota+%s" "PyKota managed %s"' % (devicetype, device, name, fullname)    
         retcode = 0
     elif len(sys.argv) not in (6, 7) :    

pykota/trunk/bin/edpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.62  2003/11/12 23:28:38  jalet
+# More work on new backend. This commit may be unstable.
+#
 # Revision 1.61  2003/11/12 13:06:35  jalet
 # Bug fix wrt no user/group name command line argument to edpykota
@@ -516 +519 @@
                                 self.logger.log_message(_("Invalid user name %s") % entry.Name)
                                 
-                if not entrypquota.Exists :
+                if entry.Exists and (not entrypquota.Exists) :
                     # not found
                     if options["add"] :

pykota/trunk/pykota/accounter.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.6  2003/11/12 23:28:55  jalet
+# More work on new backend. This commit may be unstable.
+#
 # Revision 1.5  2003/10/07 09:07:28  jalet
 # Character encoding added to please latest version of Python
@@ -58 +61 @@
         self.arguments = arguments
         
+    def getLastPageCounter(self) :    
+        """Returns last internal page counter value (possibly faked)."""
+        try :
+            return self.LastPageCounter
+        except :    
+            return 0
+        
     def filterInput(self, inputfile) :
         """Transparent filter."""

pykota/trunk/pykota/accounters/external.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.8  2003/11/12 23:29:24  jalet
+# More work on new backend. This commit may be unstable.
+#
 # Revision 1.7  2003/10/07 09:07:28  jalet
 # Character encoding added to please latest version of Python
@@ -54 +57 @@
 
 class Accounter(AccounterBase) :
+    def beginJob(self, printer, user) :    
+        """Saves the computed job size."""
+        # computes job's size
+        self.JobSize = self.computeJobSize()
+        
+        # get last job information for this printer
+        if not printer.LastJob.Exists :
+            # The printer hasn't been used yet, from PyKota's point of view
+            self.LastPageCounter = 0
+        else :    
+            # get last job size and page counter from Quota Storage
+            # Last lifetime page counter before actual job is 
+            # last page counter + last job size
+            self.LastPageCounter = int(printer.LastJob.PrinterPageCounter or 0) + int(printer.LastJob.JobSize or 0)
+        
+    def endJob(self, printer, user) :    
+        """Do nothing."""
+        pass
+        
+    def getJobSize(self) :    
+        """Returns the actual job size."""
+        try :
+            return self.JobSize
+        except AttributeError :    
+            return 0
+        
     def doAccounting(self, printer, user) :
         """Deletgates the computation of the job size to an external command.
@@ -59 +88 @@
            The command must print the job size on its standard output and exit successfully.
         """
+        self.beginJob(printer, user)
+        
         # get the job size, which is real job size * number of copies.
         jobsize = self.getJobSize() * self.filter.copies
-            
-        # get last job information for this printer
-        if not printer.LastJob.Exists :
-            # The printer hasn't been used yet, from PyKota's point of view
-            counterbeforejob = 0
-        else :    
-            # get last job size and page counter from Quota Storage
-            # Last lifetime page counter before actual job is 
-            # last page counter + last job size
-            counterbeforejob = int(printer.LastJob.PrinterPageCounter or 0) + int(printer.LastJob.JobSize or 0)
             
         # Is the current user allowed to print at all ?
@@ -83 +104 @@
         
         # adds the current job to history    
-        printer.addJobToHistory(self.filter.jobid, user, counterbeforejob, action, jobsize)
+        printer.addJobToHistory(self.filter.jobid, user, self.getLastPageCounter(), action, jobsize)
+        
+        self.endJob(printer, user)
             
         return action
         
-    def getJobSize(self) :    
+    def computeJobSize(self) :    
         """Feeds an external command with our datas to let it compute the job size, and return its value."""
         temporary = None    

pykota/trunk/pykota/accounters/querying.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.7  2003/11/12 23:29:24  jalet
+# More work on new backend. This commit may be unstable.
+#
 # Revision 1.6  2003/10/07 09:07:29  jalet
 # Character encoding added to please latest version of Python
@@ -44 +47 @@
 
 import sys
+import os
 import time
 from pykota.accounter import AccounterBase, PyKotaAccounterError
@@ -52 +56 @@
 
 class Accounter(AccounterBase) :
+    def __init__(self, kotabackend, arguments) :
+        """Initializes querying accounter."""
+        AccounterBase.__init__(self, kotabackend, arguments)
+        self.requester = openRequester(kotabackend.config, kotabackend.printername)
+        
+    def getPrinterInternalPageCounter(self) :    
+        """Returns the printer's internal page counter."""
+        global MAXTRIES, TIMETOSLEEP
+        for i in range(MAXTRIES) :
+            try :
+                counter = self.requester.getPrinterPageCounter(self.filter.printerhostname)
+            except PyKotaRequesterError, msg :
+                # can't get actual page counter, assume printer is off or warming up
+                # log the message anyway.
+                self.filter.logger.log_message("%s" % msg, "warn")
+                counter = None
+            else :    
+                # printer answered, it is on so we can exit the loop
+                break
+            time.sleep(TIMETOSLEEP)    
+        return counter    
+        
+    def beginJob(self, printer, user) :    
+        """Saves printer internal page counter at start of job."""
+        # save page counter before job
+        self.LastPageCounter = self.counterbefore = self.getPrinterInternalPageCounter()
+        
+    def endJob(self, printer, user) :    
+        """Saves printer internal page counter at end of job."""
+        # save page counter after job
+        self.LastPageCounter = self.counterafter = self.getPrinterInternalPageCounter()
+        
+    def getJobSize(self) :    
+        """Returns the actual job size."""
+        try :
+            jobsize = (self.counterafter - self.counterbefore)    
+            if jobsize < 0 :
+                # Try to take care of HP printers 
+                # Their internal page counter is saved to NVRAM
+                # only every 10 pages. If the printer was switched
+                # off then back on during the job, and that the
+                # counters difference is negative, we know 
+                # the formula (we can't know if more than eleven
+                # pages were printed though) :
+                if jobsize > -10 :
+                    jobsize += 10
+                else :    
+                    # here we may have got a printer being replaced
+                    # DURING the job. This is HIGHLY improbable !
+                    jobsize = 0
+        except :    
+            # takes care of the case where one counter (or both) was never set.
+            jobsize = 0
+        return jobsize
+        
     def doAccounting(self, printer, user) :
         """Does print accounting and returns if the job status is ALLOW or DENY."""
@@ -57 +116 @@
         # Tries MAXTRIES times, sleeping two seconds each time, in case the printer is sleeping.
         # This was seen with my Apple LaserWriter 16/600 PS which doesn't answer before having warmed up.
-        global MAXTRIES, TIMETOSLEEP
-        requester = openRequester(self.filter.config, self.filter.printername)
-        for i in range(MAXTRIES) :
-            try :
-                counterbeforejob = requester.getPrinterPageCounter(self.filter.printerhostname)
-            except PyKotaRequesterError, msg :
-                # can't get actual page counter, assume printer is off or warming up
-                # log the message anyway.
-                self.filter.logger.log_message("%s" % msg, "warn")
-                counterbeforejob = None
-                printerIsOff = 1
-            else :    
-                # printer answered, it is on so we can exit the loop
-                printerIsOff = 0
-                break
-            time.sleep(TIMETOSLEEP)    
+        counterbeforejob = self.getPrinterInternalPageCounter()
         
         # get last job information for this printer
@@ -85 +129 @@
             
         # if printer is off then we assume the correct counter value is the last one
-        if printerIsOff :
+        if counterbeforejob is None :
             counterbeforejob = lastpagecounter
             

pykota/trunk/pykota/accounters/stupid.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.6  2003/11/12 23:29:24  jalet
+# More work on new backend. This commit may be unstable.
+#
 # Revision 1.5  2003/10/07 09:07:29  jalet
 # Character encoding added to please latest version of Python
@@ -46 +49 @@
 
 class Accounter(AccounterBase) :
+    def beginJob(self) :    
+        """Saves the computed job size."""
+        self.JobSize = self.computeJobSize()
+        
+        # get last job information for this printer
+        if not printer.LastJob.Exists :
+            # The printer hasn't been used yet, from PyKota's point of view
+            self.LastPageCounter = 0
+        else :    
+            # get last job size and page counter from Quota Storage
+            # Last lifetime page counter before actual job is 
+            # last page counter + last job size
+            self.LastPageCounter = int(printer.LastJob.PrinterPageCounter or 0) + int(printer.LastJob.JobSize or 0)
+        
+    def endJob(self) :    
+        """Do nothing."""
+        pass
+        
+    def getJobSize(self) :    
+        """Returns the actual job size."""
+        try :
+            return self.JobSize
+        except AttributeError :    
+            return 0
+        
     def doAccounting(self, printer, user) :
         """Does print accounting by stupidly counting the 'showpage' postscript instructions in the document.
@@ -55 +83 @@
         
         # get the job size    
-        jobsize = self.getJobSize() * self.filter.copies
+        jobsize = self.computeJobSize() * self.filter.copies
             
         # get last job information for this printer
@@ -82 +110 @@
         return action
         
-    def getJobSize(self) :    
+    def computeJobSize(self) :    
         """Computes the job size and return its value.