Changeset 973 for pykota/trunk/pykota

Timestamp:

04/29/03 20:37:54 (21 years ago)

Author:

jalet

Message:

Pluggable accounting methods (actually doesn't support external scripts)

Location:

pykota/trunk/pykota

Files:

• accounter.py (added)
• accounters (added)
• accounters/__init__.py (added)
• accounters/querying.py (added)
• config.py (modified) (3 diffs)
• tool.py (modified) (2 diffs)
• version.py (modified) (1 diff)

pykota/trunk/pykota/config.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.24  2003/04/29 18:37:54  jalet
+# Pluggable accounting methods (actually doesn't support external scripts)
+#
 # Revision 1.23  2003/04/24 11:53:48  jalet
 # Default policy for unknown users/groups is to DENY printing instead
@@ -139 +142 @@
         self.config = ConfigParser.ConfigParser()
         self.config.read([self.filename])
-        self.checkConfiguration()
-        
-    def checkConfiguration(self) :
-        """Checks if configuration is correct.
-        
-           raises PyKotaConfigError in case a problem is detected
-        """
-        validmethods = [ "lazy" ] # TODO add more methods            
-        if self.config.get("global", "method", raw=1).lower() not in validmethods :             
-            raise PyKotaConfigError, _("Option method only supports values in %s") % str(validmethods)
                         
     def getPrinterNames(self) :    
@@ -198 +191 @@
         return logger    
         
+    def getAccounterBackend(self, printer) :    
+        """Returns the accounter backend to use for a given printer.
+        
+           if it is not set, it defaults to 'querying' which means ask printer
+           for its internal lifetime page counter.
+        """   
+        validaccounters = [ "querying" ]     
+        try :
+            accounter = self.getPrinterOption(printer, "accounter").lower()
+        except PyKotaConfigError :    
+            accounter = "querying"
+        if accounter not in validaccounters :
+            raise PyKotaConfigError, _("Option accounter in section %s only supports values in %s") % (printer, str(validaccounters))
+        return accounter
+        
     def getRequesterBackend(self, printer) :    
         """Returns the requester backend to use for a given printer, with its arguments."""
-        fullrequester = self.getPrinterOption(printer, "requester")
-        try :
-            (requester, args) = [x.strip() for x in fullrequester.split('(', 1)]
-        except ValueError :    
-            raise PyKotaConfigError, _("Invalid requester %s for printer %s") % (fullrequester, printer)
-        if args.endswith(')') :
-            args = args[:-1]
-        if not args :
-            raise PyKotaConfigError, _("Invalid requester %s for printer %s") % (fullrequester, printer)
-        validrequesters = [ "snmp", "external" ] # TODO : add more requesters
-        if requester not in validrequesters :
-            raise PyKotaConfigError, _("Option requester for printer %s only supports values in %s") % (printer, str(validrequesters))
-        return (requester, args)
+        try :
+            fullrequester = self.getPrinterOption(printer, "requester")
+        except PyKotaConfigError :    
+            # No requester defined, maybe it is not needed if accounting method
+            # is not set to 'querying', but if we are called, then the accounting
+            # method really IS 'querying', and so there's a big problem.
+            raise PyKotaConfigError, _("Option requester for printer %s was not set") % printer
+        else :    
+            try :
+                (requester, args) = [x.strip() for x in fullrequester.split('(', 1)]
+            except ValueError :    
+                raise PyKotaConfigError, _("Invalid requester %s for printer %s") % (fullrequester, printer)
+            if args.endswith(')') :
+                args = args[:-1]
+            if not args :
+                raise PyKotaConfigError, _("Invalid requester %s for printer %s") % (fullrequester, printer)
+            validrequesters = [ "snmp", "external" ] # TODO : add more requesters
+            if requester not in validrequesters :
+                raise PyKotaConfigError, _("Option requester for printer %s only supports values in %s") % (printer, str(validrequesters))
+            return (requester, args)
         
     def getPrinterPolicy(self, printer) :    

pykota/trunk/pykota/tool.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.39  2003/04/29 18:37:54  jalet
+# Pluggable accounting methods (actually doesn't support external scripts)
+#
 # Revision 1.38  2003/04/24 11:53:48  jalet
 # Default policy for unknown users/groups is to DENY printing instead
@@ -200 +203 @@
         self.storage = storage.openConnection(self.config, asadmin=asadmin)
         self.smtpserver = self.config.getSMTPServer()
-        
-    def extractInfoFromCupsOrLprng(self) :    
-        """Returns a tuple (printingsystem, printerhostname, printername, username, jobid, filename) depending on the printing system in use (as seen by the print filter).
-        
-           Returns (None, None, None, None, None, None) if no printing system is recognized.
-        """
-        # Try to detect CUPS
-        if os.environ.has_key("CUPS_SERVERROOT") and os.path.isdir(os.environ.get("CUPS_SERVERROOT", "")) :
-            if len(sys.argv) == 7 :
-                inputfile = sys.argv[6]
-            else :    
-                inputfile = None
-                
-            device_uri = os.environ.get("DEVICE_URI", "")
-            # TODO : check this for more complex urls than ipp://myprinter.dot.com:631/printers/lp
-            try :
-                (backend, destination) = device_uri.split(":", 1) 
-            except ValueError :    
-                raise PyKotaToolError, "Invalid DEVICE_URI : %s\n" % device_uri
-            while destination.startswith("/") :
-                destination = destination[1:]
-            printerhostname = destination.split("/")[0].split(":")[0]
-            return ("CUPS", printerhostname, os.environ.get("PRINTER"), sys.argv[2].strip(), sys.argv[1].strip(), inputfile)
-        else :    
-            # Try to detect LPRng
-            jseen = Jseen = Pseen = nseen = rseen = None
-            for arg in sys.argv :
-                if arg.startswith("-j") :
-                    jseen = arg[2:].strip()
-                elif arg.startswith("-J") :    
-                    Jseen = arg[2:].strip()
-                    if Jseen == "(STDIN)" :
-                        Jseen = None
-                elif arg.startswith("-n") :     
-                    nseen = arg[2:].strip()
-                elif arg.startswith("-P") :    
-                    Pseen = arg[2:].strip()
-                elif arg.startswith("-r") :    
-                    rseen = arg[2:].strip()
-            if jseen and Pseen and nseen and rseen :        
-                return ("LPRNG", rseen, Pseen, nseen, jseen, Jseen)
-        return (None, None, None, None, None, None)   # Unknown printing system          
         
     def display_version_and_quit(self) :

pykota/trunk/pykota/version.py

@@ -21 +21 @@
 #
 
-__version__ = "1.05alpha1-unofficial"
+__version__ = "1.05alpha2-unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""