Changeset 2783 for pykota/trunk/bin/edpykota

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/edpykota (modified) (5 diffs)

pykota/trunk/bin/edpykota

@@ -177 +177 @@
             
         if not options["list"] :
-            self.display(_("Extracting datas..."))
+            percent = Percent(self)
+            percent.display(_("Extracting datas..."))
         printers = self.storage.getMatchingPrinters(options["printer"])
         entries = getattr(self.storage, "getMatching%ss" % suffix)(",".join(names))
+        if not options["list"] :
+            percent.setSize(len(printers) * len(entries))
         
         if options["list"] :
@@ -197 +200 @@
                         print
         elif options["delete"] :    
-            percent = Percent(self, "\n%s..." % _("Deletion"), len(printers) * len(entries))
+            percent.display("\n%s..." % _("Deletion"))
             getattr(self.storage, "deleteMany%sPQuotas" % suffix)(printers, entries)
             percent.display("\n")
@@ -252 +255 @@
             try :
                 if options["add"] :
-                    percent = Percent(self, "\n%s...\n" % _("Creation"), len(printers) * len(entries))
+                    percent.display("\n%s...\n" % _("Creation"))
                     dicnames = {}
                     for m in entries :
@@ -284 +287 @@
                             percent.oneMore()
                 else :        
-                    percent = Percent(self, "\n%s...\n" % _("Modification"), len(entries) * len(printers))
+                    percent.display("\n%s...\n" % _("Modification"))
                     for printer in printers :
                         for entry in entries :
@@ -302 +305 @@
                 self.storage.commitTransaction()
                             
-        try :
+        if not options["list"] :
             percent.done()
-        except NameError :    
-            pass
             
 if __name__ == "__main__" :