Changeset 1342

Timestamp:

02/09/04 13:35:19 (20 years ago)

Author:

jalet

Message:

De-uglyfication.
Now works with older CUPS (1.14) which don't detect the cupspykota backend but accept it anyway.

Files:

• pykota/trunk/bin/pkhint (modified) (7 diffs)

pykota/trunk/bin/pkhint

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.4  2004/02/09 12:35:19  jalet
+# De-uglyfication.
+# Now works with older CUPS (1.14) which don't detect the cupspykota backend but accept it anyway.
+#
 # Revision 1.3  2004/02/07 13:56:03  jalet
 # Help
@@ -84 +88 @@
         
 SNMPTESTS = [ \
-              '/usr/bin/npadmin --pagecount %(printer)s', \
-              '/usr/bin/snmpget -v1 -c public -Ov %(printer)s mib-2.43.10.2.1.4.1.1 | cut -f 2,2 -d " "', \
-              '/usr/bin/snmpwalk -v 1 -Cc -c public %(printer)s | grep mib-2.43.10.2.1.4.1.1 | cut -d " " -f4', \
-              '/usr/bin/snmpwalk -v 1 -Cc -c public -Ov %(printer)s | grep Counter32 | tail -2 | head -1 | cut -d " " -f2', \
+              '/usr/bin/npadmin --pagecount %(printer)s 2>/dev/null', \
+              '/usr/bin/snmpget -v1 -c public -Ov %(printer)s mib-2.43.10.2.1.4.1.1 2>/dev/null | cut -f 2,2 -d " "', \
+              '/usr/bin/snmpwalk -v 1 -Cc -c public %(printer)s 2>/dev/null | grep mib-2.43.10.2.1.4.1.1 | cut -d " " -f4', \
+              '/usr/bin/snmpwalk -v 1 -Cc -c public -Ov %(printer)s 2>/dev/null | grep Counter32 | tail -2 | head -1 | cut -d " " -f2', \
             ]
 
@@ -135 +139 @@
     def searchDeviceType(self, devicestypes, device) :    
         """Returns the device type for current device."""
+        if device.startswith("cupspykota:") :
+            fulldevice = device[:]
+            device = fulldevice[len("cupspykota:"):]
+            if device.startswith("//") :
+                device = device[2:]
         for (k, v) in devicestypes.items() :
             if device.startswith(k) :
@@ -157 +166 @@
         return destination.split("/")[0]
         
-    def acceptsSNMP(self, printer) :    
+    def accepts(self, printer, commands) :    
         """Tries to get the printer's internal page counter via SNMP."""
-        for command in SNMPTESTS :
-            inp = os.popen((command + " 2>/dev/null") % locals())
+        for command in commands :
+            inp = os.popen(command % locals())
             value = inp.readline().strip()
             inp.close()
@@ -172 +181 @@
     def main(self, args, options) :
         """Main work is done here."""
-        print "Put the following lines into your /etc/pykota/pykota.conf file :\n"
+        print "\nPlease wait while pkhint analyzes your printing system's configuration..."
         printers = self.extractPrintersInformation()
         devicestypes = self.extractDevices() # TODO : IT'S CUPS ONLY FOR NOW
+        configuration = []
         for (printer, device) in printers.items() :
             if self.matchString(printer, args) :
-                print "[%s]" % printer
                 devicetype = self.searchDeviceType(devicestypes, device)
                 device = self.extractDeviceFromURI(device)
@@ -187 +196 @@
                     except ValueError :    
                         hostname = device
-                    snmpcommand = self.acceptsSNMP(hostname)
+                    snmpcommand = self.accepts(hostname, SNMPTESTS)
                     if snmpcommand is not None :
-                        print "accounter: querying"
-                        print 'requester: external(/usr/bin/waitprinter.sh %(printer)s && ' + snmpcommand + ')'
+                        accounter = "querying"
+                        requester = 'external(/usr/bin/waitprinter.sh %(printer)s && ' + snmpcommand + ')'
+                        configuration.append((printer, accounter, requester))
                 elif devicetype == "direct" : 
                     sys.stderr.write("Can't currently handle device %s for printer %s\n" % (device, printer))
@@ -197 +207 @@
                 else :
                     sys.stderr.write("Can't currently handle device %s for printer %s\n" % (device, printer))
+                    
+        if not configuration :            
+            print "\nSorry, pkhint can't help you for now. Please configure PyKota manually."
+        else :
+            print "\nPut the following lines into your /etc/pykota/pykota.conf file :\n"
+            for (printer, accounter, requester) in configuration :
+                print "[%s]" % printer
+                print "accounter: %s" % accounter
+                if requester is not None :
+                    print "requester: %s" % requester
                 print