Changeset 3052

Timestamp:

11/08/06 23:44:53 (18 years ago)

Author:

jerome

Message:

Now pkprinters reroutes CUPS print queues through PyKota or
through CUPS only when adding or deleting printers in the
database.
Fixed some display uglyness in case no entry was found.

Location:

pykota/trunk

Files:

• bin/pkbcodes (modified) (1 diff)
• bin/pkprinters (modified) (5 diffs)
• bin/pkusers (modified) (1 diff)
• NEWS (modified) (1 diff)

pykota/trunk/bin/pkbcodes

@@ -107 +107 @@
             billingcodes = self.storage.getMatchingBillingCodes(",".join(names))
             if not billingcodes :
+                if not options["list"] :
+                    percent.display("\n")
                 raise PyKotaCommandLineError, _("There's no billingcode matching %s") % " ".join(names)
             if not options["list"] :    

pykota/trunk/bin/pkprinters

@@ -149 +149 @@
     def getPrinterDeviceURI(self, printername) :            
         """Returns the Device URI attribute for a particular printer."""
+        if not printername :
+            return ""
         cups = pkipplib.CUPS()
         req = cups.newRequest(pkipplib.IPP_GET_PRINTER_ATTRIBUTES)
@@ -157 +159 @@
             return ""
         
-    def isPrinterCaptured(self, printername) :            
+    def isPrinterCaptured(self, printername=None, deviceuri=None) :
         """Returns True if the printer is already redirected through PyKota's backend, else False."""
-        if self.getPrinterDeviceURI(printername).find("cupspykota:") != -1 :
+        if (deviceuri or self.getPrinterDeviceURI(printername)).find("cupspykota:") != -1 :
             return True
         else :    
@@ -179 +181 @@
             printers = self.storage.getMatchingPrinters(",".join(names))
             if not printers :
+                if not options["list"] :
+                    percent.display("\n")
                 raise PyKotaCommandLineError, _("There's no printer matching %s") % " ".join(names)
             if not options["list"] :    
@@ -198 +202 @@
             percent.display("\n%s..." % _("Deletion"))
             self.storage.deleteManyPrinters(printers)
+            percent.display("\n%s...\n" % _("Rerouting printers to CUPS"))
+            for printer in printers :
+                uri = self.getPrinterDeviceURI(printer.Name)
+                if self.isPrinterCaptured(deviceuri=uri) :
+                     newuri = uri.replace("cupspykota:", "")
+                     if newuri.startswith("//") :
+                         newuri = newuri[2:]
+                     self.regainPriv() # to avoid having to enter password.
+                     os.system('lpadmin -p "%s" -v "%s"' % (printer.Name, newuri))
+                     self.logdebug("Printer %s rerouted to %s" % (printer.Name, newuri))
+                     self.dropPriv()    
+                percent.oneMore()
             percent.display("\n")
         else :
@@ -251 +267 @@
                                            nopassthrough, maxjobsize)
                             oldprinter = self.storage.addPrinter(printer)               
+                            
+                            uri = self.getPrinterDeviceURI(printer.Name)
+                            if not self.isPrinterCaptured(deviceuri=uri) :
+                                 newuri = "cupspykota://%s" % uri
+                                 self.regainPriv() # to avoid having to enter password.
+                                 os.system('lpadmin -p "%s" -v "%s"' % (printer.Name, newuri))
+                                 self.logdebug("Printer %s rerouted to %s" % (printer.Name, newuri))
+                                 self.dropPriv()
+                                     
                             if oldprinter is not None :
                                 if skipexisting :

pykota/trunk/bin/pkusers

@@ -215 +215 @@
             entries = getattr(self.storage, "getMatching%ss" % suffix)(",".join(names))
             if not entries :
+                if not options["list"] :
+                    percent.display("\n")
                 raise PyKotaCommandLineError, _("There's no %s matching %s") % (_(suffix.lower()), " ".join(names))
             if not options["list"] :    

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.25alpha15 (2006-11-06) :   
     
+        - pkprinters --add and --delete now automatically reroutes CUPS
+          print queues through PyKota or through CUPS only.
+          
         - Fixed date and time parsing problems.