Changeset 2782 for pykota/trunk/bin/pkprinters

Timestamp:

03/04/06 15:51:12 (18 years ago)

Author:

jerome

Message:

Code cleaning.
Topped to 10000 the number of times the percent will be displayed by not displaying it if there's no change.
This is very useful when adding 25000 users on 300 printers through an ssh connection...

Files:

• pykota/trunk/bin/pkprinters (modified) (6 diffs)

pykota/trunk/bin/pkprinters

@@ -29 +29 @@
 import pwd
 
-from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.tool import Percent, PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
 from pykota.storage import StoragePrinter
 
@@ -171 +171 @@
                 print    
         elif options["delete"] :    
-            self.display("\n%s..." % _("Deletion"))
+            percent = Percent(self, "\n%s..." % _("Deletion"), len(printers))
             self.storage.deleteManyPrinters(printers)
-            self.display("\n")
+            percent.display("\n")
         else :
             if options["groups"] :        
@@ -217 +217 @@
             try :
                 if options["add"] :    
-                    self.display("%s...\n" % _("Creation"))
-                    nbtotal = len(names)
-                    for i in range(nbtotal) :
-                        pname = names[i]
+                    percent = Percent(self, "%s...\n" % _("Creation"), len(names))
+                    for pname in names :
                         if self.isValidName(pname) :
                             printer = StoragePrinter(self.storage, pname)
@@ -244 +242 @@
                         else :    
                             raise PyKotaCommandLineError, _("Invalid printer name %s") % pname
-                        percent = 100.0 * float(i) / float(nbtotal)
-                        self.display("\r%.02f%%" % percent)
+                        percent.oneMore()
                 else :        
-                    self.display("\n%s...\n" % _("Modification"))
-                    nbtotal = len(printers)
-                    for i in range(nbtotal) :        
-                        printer = printers[i]
+                    percent = Percent(self, "\n%s...\n" % _("Modification"), len(printers))
+                    for printer in printers :        
                         self.modifyPrinter(printer, charges, perpage, perjob, \
                                            description, passthrough, \
@@ -256 +251 @@
                         printer.save()    
                         self.managePrintersGroups(printersgroups, printer, remove)
-                        percent = 100.0 * float(i) / float(nbtotal)
-                        self.display("\r%.02f%%" % percent)
+                        percent.oneMore()
             except :                    
                 self.storage.rollbackTransaction()
@@ -263 +257 @@
             else :    
                 self.storage.commitTransaction()
-        if not options["list"] :                
-            self.done()
+                
+        try :
+            percent.done()
+        except NameError :    
+            pass
                      
 if __name__ == "__main__" :