Changeset 1483 for pykota/trunk/pykota

Timestamp:

05/18/04 16:49:34 (20 years ago)

Author:

jalet

Message:

Big code changes to completely remove the need for "requester" directives,
jsut use "hardware(... your previous requester directive's content ...)"

Location:

pykota/trunk/pykota

Files:

• accounter.py (modified) (3 diffs)
• accounters/hardware.py (modified) (5 diffs)
• accounters/software.py (modified) (5 diffs)
• config.py (modified) (3 diffs)
• Makefile.am (modified) (2 diffs)
• requester.py (deleted)
• requesters (deleted)
• tool.py (modified) (2 diffs)
• version.py (modified) (1 diff)

pykota/trunk/pykota/accounter.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.14  2004/05/18 14:49:19  jalet
+# Big code changes to completely remove the need for "requester" directives,
+# jsut use "hardware(... your previous requester directive's content ...)"
+#
 # Revision 1.13  2004/01/12 22:43:40  jalet
 # New formula to compute a job's price
@@ -63 +67 @@
 
 import sys
+from pykota import pdlanalyzer
 
 class PyKotaAccounterError(Exception):
@@ -80 +85 @@
         self.arguments = arguments
         self.isDelayed = 0      # Accounting is immediate by default
+        self.firstPassSize = None
+        
+    def getSoftwareJobSize(self) :    
+        """Pre-computes the job's size with a software method."""
+        if self.filter.preserveinputfile is None :
+            raise PyKotaAccounterError, "Only supports raw jobs for now."""
+        else :    
+            fname = self.filter.preserveinputfile
+        parser = pdfanalyzer.PDLAnalyzer(fname)    
+        try : 
+            jobsize = parser.getJobSize()
+        except TypeError, msg :    
+            raise PyKotaAccounterError, msg
+        else :    
+            self.firstPassSize = jobsize
         
     def getLastPageCounter(self) :    
         """Returns last internal page counter value (possibly faked)."""
         try :
-            return self.LastPageCounter
+            return self.LastPageCounter or 0
         except :    
             return 0

pykota/trunk/pykota/accounters/hardware.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.2  2004/05/18 14:49:22  jalet
+# Big code changes to completely remove the need for "requester" directives,
+# jsut use "hardware(... your previous requester directive's content ...)"
+#
 # Revision 1.1  2004/05/13 13:59:30  jalet
 # Code simplifications
@@ -30 +34 @@
 import sys
 import os
+import popen2
 from pykota.accounter import AccounterBase, PyKotaAccounterError
-from pykota.requester import openRequester, PyKotaRequesterError
 
 class Accounter(AccounterBase) :
@@ -37 +41 @@
         """Initializes querying accounter."""
         AccounterBase.__init__(self, kotabackend, arguments)
-        self.requester = openRequester(kotabackend, kotabackend.printername)
         self.isDelayed = 1 # With the pykota filter, accounting is delayed by one job
         
@@ -44 +47 @@
         self.filter.logdebug("Reading printer's internal page counter...")
         try :
-            counter = self.requester.getPrinterPageCounter(self.filter.printerhostname)
-        except PyKotaRequesterError, msg :
+            counter = self.askPrinterPageCounter(self.filter.printerhostname)
+        except PyKotaAccounterError, msg :
             # can't get actual page counter, assume printer is off or warming up
             # log the message anyway.
@@ -97 +100 @@
         userpquota.Printer.addJobToHistory(self.filter.jobid, userpquota.User, counterbeforejob, action, filename=self.filter.preserveinputfile, title=self.filter.title, copies=self.filter.copies, options=self.filter.options)
         return action
+        
+    def askPrinterPageCounter(self, printer) :
+        """Returns the page counter from the printer via an external command.
+        
+           The external command must report the life time page number of the printer on stdout.
+        """
+        commandline = self.arguments.strip() % locals()
+        if printer is None :
+            raise PyKotaAccounterError, _("Unknown printer address in HARDWARE(%s) for printer %s") % (commandline, self.filter.printername)
+        error = 1
+        pagecounter = None
+        child = popen2.Popen4(commandline)    
+        try :
+            pagecounter = int(child.fromchild.readline().strip())
+        except ValueError :    
+            pass
+        except IOError :    
+            # we were interrupted by a signal, certainely a SIGTERM
+            # caused by the user cancelling the current job
+            try :
+                os.kill(child.pid, signal.SIGTERM)
+            except :    
+                pass # already killed ?
+            self.filter.logger.log_message(_("SIGTERM was sent to hardware accounter %s (pid: %s)") % (commandline, child.pid), "info")
+        else :    
+            error = 0
+        child.fromchild.close()    
+        child.tochild.close()
+        status = child.wait()
+        if (not error) and os.WIFEXITED(status) and (not os.WEXITSTATUS(status)) :
+            return pagecounter
+        else :    
+            raise PyKotaAccounterError, _("Unable to query printer %s via HARDWARE(%s)") % (printer, commandline) 
             

pykota/trunk/pykota/accounters/software.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.2  2004/05/18 14:49:23  jalet
+# Big code changes to completely remove the need for "requester" directives,
+# jsut use "hardware(... your previous requester directive's content ...)"
+#
 # Revision 1.1  2004/05/13 13:59:30  jalet
 # Code simplifications
@@ -45 +49 @@
             infile = open(self.filter.inputfile, "rb")
             
-        # launches external accounter
+        # launches software accounter
         # TODO : USE tempfile.mkstemp() instead ! Needs some work !
         infilename = tempfile.mktemp()
@@ -68 +72 @@
             # check exit status
             if (os.WIFEXITED(retcode) and not os.WEXITSTATUS(retcode)) or os.stat(errfilename) :
-                # tries to extract the job size from the external accounter's
+                # tries to extract the job size from the software accounter's
                 # standard output
                 childoutput = open(outfilename, "r")
@@ -74 +78 @@
                     pagecount = int(childoutput.readline().strip())
                 except (AttributeError, ValueError) :
-                    self.filter.logger.log_message(_("Unable to compute job size with external accounter %s") % self.arguments)
+                    self.filter.logger.log_message(_("Unable to compute job size with accounter %s") % self.arguments)
                     pagecount = 0
                 childoutput.close()    
             else :
-                self.filter.logger.log_message(_("Unable to compute job size with external accounter %s") % self.arguments)
+                self.filter.logger.log_message(_("Unable to compute job size with accounter %s") % self.arguments)
                 pagecount = 0
             os.remove(infilename)
@@ -86 +90 @@
             # TODO : temporary files may remain on the filesystem...
             msg = "%s : %s" % (self.arguments, msg) 
-            self.filter.logger.log_message(_("Unable to compute job size with external accounter %s") % msg)
+            self.filter.logger.log_message(_("Unable to compute job size with accounter %s") % msg)
             pagecount = 0
             

pykota/trunk/pykota/config.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.47  2004/05/18 14:49:20  jalet
+# Big code changes to completely remove the need for "requester" directives,
+# jsut use "hardware(... your previous requester directive's content ...)"
+#
 # Revision 1.46  2004/05/13 13:59:28  jalet
 # Code simplifications
@@ -311 +315 @@
         validaccounters = [ "hardware", "software" ]     
         fullaccounter = self.getPrinterOption(printername, "accounter").strip()
-        if fullaccounter.lower().startswith("software") :    
+        flower = fullaccounter.lower()
+        if flower.startswith("software") or flower.startswith("hardware") :    
             try :
                 (accounter, args) = [x.strip() for x in fullaccounter.split('(', 1)]
             except ValueError :    
-                raise PyKotaConfigError, _("Invalid external accounter %s for printer %s") % (fullaccounter, printername)
+                raise PyKotaConfigError, _("Invalid accounter %s for printer %s") % (fullaccounter, printername)
             if args.endswith(')') :
                 args = args[:-1]
             if not args :
-                raise PyKotaConfigError, _("Invalid external accounter %s for printer %s") % (fullaccounter, printername)
+                raise PyKotaConfigError, _("Invalid accounter %s for printer %s") % (fullaccounter, printername)
             return (accounter.lower(), args)    
-        elif fullaccounter.lower() not in validaccounters :
+        else :
             raise PyKotaConfigError, _("Option accounter in section %s only supports values in %s") % (printername, str(validaccounters))
-        else :    
-            return (fullaccounter.lower(), None)
         
     def getPreHook(self, printername) :    
@@ -340 +343 @@
             return      # No command to launch in the post-hook
             
-    def getRequesterBackend(self, printername) :    
-        """Returns the requester backend to use for a given printer, with its arguments."""
-        try :
-            fullrequester = self.getPrinterOption(printername, "requester")
-        except PyKotaConfigError :    
-            # No requester defined, maybe it is not needed if accounting method
-            # is not set to 'hardware', but if we are called, then the accounting
-            # method really IS 'hardware', and so there's a big problem.
-            raise PyKotaConfigError, _("Option requester for printer %s was not set") % printername
-        else :    
-            try :
-                (requester, args) = [x.strip() for x in fullrequester.split('(', 1)]
-            except ValueError :    
-                raise PyKotaConfigError, _("Invalid requester %s for printer %s") % (fullrequester, printername)
-            if args.endswith(')') :
-                args = args[:-1]
-            if not args :
-                raise PyKotaConfigError, _("Invalid requester %s for printer %s") % (fullrequester, printername)
-            validrequesters = [ "external" ] 
-            requester = requester.lower()
-            if requester not in validrequesters :
-                raise PyKotaConfigError, _("Option requester for printer %s only supports values in %s") % (printername, str(validrequesters))
-            return (requester, args)
-        
     def getPrinterPolicy(self, printername) :    
         """Returns the default policy for the current printer."""

pykota/trunk/pykota/Makefile.am

@@ -7 +7 @@
         logger.py               \
         reporter.py             \
-        requester.py    \
         storage.py              \
         tool.py                 \
@@ -13 +12 @@
         version.py
 
-SUBDIRS = accounters loggers reporters requesters storages
+SUBDIRS = accounters loggers reporters storages
 

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.88  2004/05/18 14:49:20  jalet
+# Big code changes to completely remove the need for "requester" directives,
+# jsut use "hardware(... your previous requester directive's content ...)"
+#
 # Revision 1.87  2004/05/17 19:14:59  jalet
 # Now catches SIGPIPE and SIGCHLD
@@ -764 +768 @@
          self.options, \
          self.originalbackend) = self.extractInfoFromCupsOrLprng()
-        self.username = self.username or 'root' 
+        self.username = self.username or 'root' # when printing test page from CUPS web interface, username is empty
         if self.config.getUserNameToLower() :
             self.username = self.username.lower()

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.19alpha9_unofficial"
+__version__ = "1.19alpha10_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""