Changeset 2783 for pykota/trunk/bin/pkprinters

Timestamp:

03/05/06 09:36:47 (18 years ago)

Author:

jerome

Message:

Now outputs the average speed, so no need to do this in filldb anymore.

Files:

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

pykota/trunk/bin/pkprinters

@@ -150 +150 @@
             raise PyKotaCommandLineError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], _("You're not allowed to use this command."))
             
+        if not options["list"] :    
+            percent = Percent(self)
+            
         if not options["add"] :
             if not options["list"] :
-                self.display(_("Extracting datas..."))
+                percent.display(_("Extracting datas..."))
             if not names :      # NB : can't happen for --delete because it's catched earlier
                 names = ["*"]
@@ -158 +161 @@
             if not printers :
                 raise PyKotaCommandLineError, _("There's no printer matching %s") % " ".join(names)
+            if not options["list"] :    
+                percent.setSize(len(printers))
                 
         if options["list"] :
@@ -171 +176 @@
                 print    
         elif options["delete"] :    
-            percent = Percent(self, "\n%s..." % _("Deletion"), len(printers))
+            percent.display("\n%s..." % _("Deletion"))
             self.storage.deleteManyPrinters(printers)
             percent.display("\n")
@@ -217 +222 @@
             try :
                 if options["add"] :    
-                    percent = Percent(self, "%s...\n" % _("Creation"), len(names))
+                    percent.display("%s...\n" % _("Creation"))
+                    percent.setSize(len(names))
                     for pname in names :
                         if self.isValidName(pname) :
@@ -244 +250 @@
                         percent.oneMore()
                 else :        
-                    percent = Percent(self, "\n%s...\n" % _("Modification"), len(printers))
+                    percent.display("\n%s...\n" % _("Modification"))
                     for printer in printers :        
                         self.modifyPrinter(printer, charges, perpage, perjob, \
@@ -258 +264 @@
                 self.storage.commitTransaction()
                 
-        try :
+        if not options["list"] :
             percent.done()
-        except NameError :    
-            pass
                      
 if __name__ == "__main__" :