Changeset 952 for pykota/trunk/bin

Timestamp:

04/24/03 00:13:57 (22 years ago)

Author:

jalet

Message:

Preliminary support for LPRng added BUT STILL UNTESTED.

Location:

pykota/trunk/bin

Files:

• edpykota (modified) (4 diffs)
• pykota (modified) (7 diffs)
• README (modified) (1 diff)
• repykota (modified) (2 diffs)
• warnpykota (modified) (2 diffs)

pykota/trunk/bin/edpykota

@@ -3 +3 @@
 # PyKota Print Quota Editor 
 #
-# PyKota - Print Quotas for CUPS
+# PyKota - Print Quotas for CUPS and LPRng
 #
 # (c) 2003 Jerome Alet <alet@librelogiciel.com>
@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.43  2003/04/23 22:13:56  jalet
+# Preliminary support for LPRng added BUT STILL UNTESTED.
+#
 # Revision 1.42  2003/04/17 13:38:47  jalet
 # Docstring corrected for better manual page
@@ -252 +255 @@
   user jerome is put into the groups "coders" and "it" which must
   already exist in the Quota Storage.
-  WARNING : the CUPS PPD file for this printer must still be modified
-            manually, as well as pykota's configuration file for a
-            new printer to be managed successfully.
+  WARNING : the CUPS PPD file for this printer or the /etc/printcap
+            file (depending on your printing backend)  must still be 
+            modified manually, as well as pykota's configuration file
+            for a new printer to be managed successfully.
             
   $ edpykota -g -S 500 -H 550 financial support            
@@ -474 +478 @@
                                 if groupid is not None :
                                     self.storage.addUserToGroup(ident, groupid)
+                                else :
+                                    self.logger.log_message(_("Group %s not found in the PyKota Storage.") % groupname)
                             self.warnUserPQuota(name, printer)    
                      

pykota/trunk/bin/pykota

@@ -3 +3 @@
 # PyKota accounting filter
 #
-# PyKota - Print Quotas for CUPS
+# PyKota - Print Quotas for CUPS and LPRng
 #
 # (c) 2003 Jerome Alet <alet@librelogiciel.com>
@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.24  2003/04/23 22:13:56  jalet
+# Preliminary support for LPRng added BUT STILL UNTESTED.
+#
 # Revision 1.23  2003/04/15 11:30:57  jalet
 # More work done on money print charging.
@@ -115 +118 @@
 class PyKotaFilter(PyKotaTool) :    
     """Class for the PyKota filter."""
-    def __init__(self, username) :
+    def __init__(self) :
         PyKotaTool.__init__(self)
-        self.username = username
+        (self.printingsystem, self.printerhostname, self.printername, self.username, self.jobid, self.inputfile) = self.extractInfoFromCupsOrLprng()
         self.requester = openRequester(self.config, self.printername)
-        self.printerhostname = self.getPrinterHostname()
-    
-    def getPrinterHostname(self) :
-        """Returns the printer hostname."""
-        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:]
-        return destination.split("/")[0].split(":")[0]
-        
+    
     def filterInput(self, inputfile) :
         """Transparent filter."""
@@ -148 +138 @@
             infile.close()
             
+    def acceptJob(self) :        
+        """Returns the exit code needed by the printing backend to accept the job and print it."""
+        if self.printingsystem == "CUPS" :
+            return 0
+        elif self.printingsystem == "LPRNG" :    
+            return 0
+        else :    
+            # UNKNOWN
+            return -1
+            
+    def removeJob(self) :            
+        """Returns the exit code needed by the printing backend to refuse the job and remove it."""
+        if self.printingsystem == "CUPS" :
+            return 1
+        elif self.printingsystem == "LPRNG" :    
+            return 3
+        else :    
+            # UNKNOWN
+            return -1
+            
 def main() :    
     """Do it, and do it right !"""
+        
+    # Initializes the current tool
+    kotafilter = PyKotaFilter()    
+    
     #
-    # This is a CUPS filter, so we should act and die like a CUPS filter when needed
-    narg = len(sys.argv)
-    if narg not in (6, 7) :    
-        sys.stderr.write("ERROR: %s job-id user title copies options [file]\n" % sys.argv[0])
-        return 1
-    elif narg == 7 :    
-        # input file
-        inputfile = sys.argv[6]
-    else :    
-        # stdin
-        inputfile = None
-        
-    #    
-    # According to CUPS documentation, the job id is the second command line argument
-    jobid = sys.argv[1].strip()
-    
-    #    
-    # According to CUPS documentation, the username is the third command line argument
-    username = sys.argv[2].strip()    
-    
-    # Initializes the current tool
-    kotafilter = PyKotaFilter(username)    
+    # If this is a CUPS filter, we should act and die like a CUPS filter when needed
+    if kotafilter.printingsystem == "CUPS" :
+        if len(sys.argv) not in (6, 7) :    
+            sys.stderr.write("ERROR: %s job-id user title copies options [file]\n" % sys.argv[0])
+            return kotafilter.removeJob()
     
     # Get the page counter directly from the printer itself
     try :
-        counterbeforejob = kotafilter.requester.getPrinterPageCounter(kotafilter.printerhostname) # TODO use printername instead, make them match from CUPS' config files
+        counterbeforejob = kotafilter.requester.getPrinterPageCounter(kotafilter.printerhostname)
     except PyKotaRequesterError, msg :
         # can't get actual page counter, assume printer is off, but warns in log
@@ -192 +189 @@
         kotafilter.logger.log_message(_("Printer %s not registered in the PyKota system") % kotafilter.printername, "warn")
     else :    
-        userid = kotafilter.storage.getUserId(username)
+        userid = kotafilter.storage.getUserId(kotafilter.username)
         if userid is None :
             # The user is unknown from the Quota Storage perspective
-            # we let the job pass through, but log a warning message
-            kotafilter.logger.log_message(_("User %s not registered in the PyKota system") % username, "warn")
+            # Depending on the default policy for this printer, we
+            # either let the job pass through or reject it, but we
+            # log a message in any case.
+            policy = kotafilter.config.getPrinterPolicy(kotafilter.printername)
+            if policy in [None, "ALLOW"] :
+                action = "POLICY_ALLOW"
+            else :    
+                action = "POLICY_DENY"
+            kotafilter.logger.log_message(_("User %s not registered in the PyKota system, applying default policy (%s) for printer %s") % (kotafilter.username, action, kotafilter.printername), "warn")
+            if action == "POLICY_DENY" :
+                return kotafilter.removeJob()
         else :
             # get last job information for this printer
@@ -203 +209 @@
                 # The printer hasn't been used yet, from PyKota's point of view
                 lasthistoryid = None
-                lastjobid = jobid
+                lastjobid = kotafilter.jobid
                 lastuserid = userid
-                lastusername = username
+                lastusername = kotafilter.username
                 lastpagecounter = counterbeforejob
             else :    
@@ -251 +257 @@
             
             # warns the last user if he is over quota
-            kotafilter.warnUserPQuota(lastusername)
+            kotafilter.warnUserPQuota(lastusername, kotafilter.printername)
                 
             # Is the current user allowed to print at all ?
-            action = kotafilter.warnUserPQuota(username)
+            action = kotafilter.warnUserPQuota(kotafilter.username, kotafilter.printername)
             
             # adds the current job to history    
-            kotafilter.storage.addJobToHistory(jobid, kotafilter.storage.getUserId(username), printerid, counterbeforejob, action)
+            kotafilter.storage.addJobToHistory(kotafilter.jobid, kotafilter.storage.getUserId(kotafilter.username), printerid, counterbeforejob, action)
             
             # if not allowed to print then die, else proceed.
             if action == "DENY" :
                 # No, just die cleanly
-                return 1
+                return kotafilter.removeJob()
         
     # pass the job untouched to the underlying layer
-    kotafilter.filterInput(inputfile)      
-    
-    return 0
+    kotafilter.filterInput(kotafilter.inputfile)      
+    
+    return kotafilter.acceptJob()
 
 if __name__ == "__main__" :    
-    sys.exit(main() or 0)
+    sys.exit(main())

pykota/trunk/bin/README

@@ -1 +1 @@
 # $Id$
 
-PyKota - Print Quota for CUPS
+PyKota - Print Quota for CUPS and LPRng
 
 (c) 2003 Jerome Alet <alet@librelogiciel.com>

pykota/trunk/bin/repykota

@@ -3 +3 @@
 # PyKota Print Quota Reports generator
 #
-# PyKota - Print Quotas for CUPS
+# PyKota - Print Quotas for CUPS and LPRng
 #
 # (c) 2003 Jerome Alet <alet@librelogiciel.com>
@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.32  2003/04/23 22:13:56  jalet
+# Preliminary support for LPRng added BUT STILL UNTESTED.
+#
 # Revision 1.31  2003/04/23 09:58:17  jalet
 # Prices per page/job are now displayed

pykota/trunk/bin/warnpykota

@@ -3 +3 @@
 # PyKota Print Quota Warning sender
 #
-# PyKota - Print Quotas for CUPS
+# PyKota - Print Quotas for CUPS and LPRng
 #
 # (c) 2003 Jerome Alet <alet@librelogiciel.com>
@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.18  2003/04/23 22:13:56  jalet
+# Preliminary support for LPRng added BUT STILL UNTESTED.
+#
 # Revision 1.17  2003/04/17 13:32:17  jalet
 # bad documentation string