Changeset 2783

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.

Location:

pykota/trunk

Files:

• bin/edpykota (modified) (5 diffs)
• bin/pkbcodes (modified) (6 diffs)
• bin/pkprinters (modified) (6 diffs)
• bin/pkusers (modified) (6 diffs)
• pykota/tool.py (modified) (3 diffs)
• tests/filldb.py (modified) (9 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__" : 

pykota/trunk/bin/pkbcodes

@@ -97 +97 @@
             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 = ["*"]
@@ -105 +108 @@
             if not billingcodes :
                 raise PyKotaCommandLineError, _("There's no billingcode matching %s") % " ".join(names)
+            if not options["list"] :    
+                percent.setSize(len(billingcodes))
                         
         if options["list"] :
@@ -116 +121 @@
                        _("credits"))
         elif options["delete"] :    
-            percent = Percent(self, "\n%s..." % _("Deletion"), len(billingcodes))
+            percent.display("\n%s..." % _("Deletion"))
             self.storage.deleteManyBillingCodes(billingcodes)
             percent.display("\n")
@@ -129 +134 @@
             try :
                 if options["add"] :    
-                    percent = Percent(self, "%s...\n" % _("Creation"), len(names))
+                    percent.display("%s...\n" % _("Creation"))
+                    percent.setSize(len(names))
                     for bname in names :
                         billingcode = StorageBillingCode(self.storage, bname)
@@ -143 +149 @@
                         percent.oneMore()
                 else :        
-                    percent = Percent(self, "\n%s...\n" % _("Modification"), len(billingcodes))
+                    percent.display("\n%s...\n" % _("Modification"))
                     for billingcode in billingcodes :
                         self.modifyBillingCode(billingcode, reset, description)
@@ -154 +160 @@
                 self.storage.commitTransaction()
                         
-        try :
+        if not options["list"] :
             percent.done()
-        except NameError :    
-            pass
                      
 if __name__ == "__main__" : 

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__" : 

pykota/trunk/bin/pkusers

@@ -193 +193 @@
         suffix = (options["groups"] and "Group") or "User"        
         
+        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 = ["*"]
@@ -201 +204 @@
             if not entries :
                 raise PyKotaCommandLineError, _("There's no %s matching %s") % (_(suffix.lower()), " ".join(names))
+            if not options["list"] :    
+                percent.setSize(len(entries))
                 
         if options["list"] :
@@ -235 +240 @@
                     print
         elif options["delete"] :    
-            percent = Percent(self, "\n%s..." % _("Deletion"), len(entries))
+            percent.display("\n%s..." % _("Deletion"))
             getattr(self.storage, "deleteMany%ss" % suffix)(entries)
             percent.display("\n")
@@ -287 +292 @@
                 if options["add"] :    
                     rejectunknown = self.config.getRejectUnknown()    
-                    percent = Percent(self, "%s...\n" % _("Creation"), len(names))
+                    percent.display("%s...\n" % _("Creation"))
+                    percent.setSize(len(names))
                     for ename in names :
                         email = None
@@ -347 +353 @@
                         percent.oneMore()
                 else :
-                    percent = Percent(self, "\n%s...\n" % _("Modification"), len(entries)) 
+                    percent.display("\n%s...\n" % _("Modification"))
                     for entry in entries :
                         if groups :
@@ -364 +370 @@
                 self.storage.commitTransaction()
                 
-        try :
+        if not options["list"] :
             percent.done()
-        except NameError :    
-            pass
                      
 if __name__ == "__main__" : 

pykota/trunk/pykota/tool.py

@@ -35 +35 @@
 import tempfile
 import md5
+import time
 import ConfigParser
 import popen2
@@ -80 +81 @@
 class Percent :
     """A class to display progress."""
-    def __init__(self, app, title, size) :
+    def __init__(self, app, size=None) :
         """Initializes the engine."""
         self.app = app
+        self.size = None
+        if size :
+            self.setSize(size)
+        self.previous = None
+        self.before = time.time()
+        
+    def setSize(self, size) :     
+        """Sets the total size."""
+        self.number = 0
         self.size = size
-        self.number = 0
         self.factor = 100.0 / float(size)
-        self.previous = None
-        self.display(title)
         
     def display(self, msg) :    
@@ -95 +102 @@
     def oneMore(self) :    
         """Increments internal counter."""
-        self.number += 1
-        percent = "%.02f" % (float(self.number) * self.factor)
-        if percent != self.previous : # optimize for large number of items
-            self.display("\r%s%%" % percent)
-            self.previous = percent
+        if self.size :
+            self.number += 1
+            percent = "%.02f" % (float(self.number) * self.factor)
+            if percent != self.previous : # optimize for large number of items
+                self.display("\r%s%%" % percent)
+                self.previous = percent
             
     def done(self) :         
         """Displays the 'done' message."""
-        self.display("\r100.00%%\r        \r%s\n" % _("Done."))
+        after = time.time()
+        if self.size :
+            speed = int(self.size / (after - self.before))
+            self.display("\r100.00%%\r        \r%s. %s : %i %s.\n" \
+                     % (_("Done"), _("Average speed"), speed, _("entries per second")))
+        else :             
+            self.display("\r100.00%%\r        \r%s.\n" % _("Done"))
         
 class Tool :

pykota/trunk/tests/filldb.py

@@ -7 +7 @@
 import sys
 import os
-import time
 
-def showTiming(number, before) :
-    """Displays timing information."""
-    elapsed = time.time() - before
-    persecond = int(float(number) / elapsed)
-    sys.stdout.write("\nTime elapsed : %.2f seconds (%i entries per second)\n\n" % (elapsed, persecond))
-    
 def createBillingCodes(number) :
     """Creates a number of billing codes."""
@@ -24 +17 @@
         argsfile.write("%s\n" % bname)
     argsfile.close()    
-    before = time.time()
     os.system('pkbcodes --arguments arguments.list') 
-    showTiming(number, before)
     return billingcodes
 
@@ -37 +28 @@
         argsfile.write("%s\n" % bname)
     argsfile.close()    
-    before = time.time()
     os.system('pkbcodes --arguments arguments.list') 
-    showTiming(len(billingcodes), before)
     
 def createPrinters(number) :
@@ -50 +39 @@
         argsfile.write("%s\n" % pname)
     argsfile.close()    
-    before = time.time()
     os.system('pkprinters --arguments arguments.list') 
-    showTiming(number, before)
     return printernames
 
@@ -63 +50 @@
         argsfile.write("%s\n" % pname)
     argsfile.close()    
-    before = time.time()
     os.system('pkprinters --arguments arguments.list') 
-    showTiming(len(printernames), before)
     
 def createUsers(number) :
@@ -76 +61 @@
         argsfile.write("%s\n" % uname)
     argsfile.close()    
-    before = time.time()
     os.system('pkusers --arguments arguments.list') 
-    showTiming(number, before)
     return usernames
 
@@ -89 +72 @@
         argsfile.write("%s\n" % uname)
     argsfile.close()    
-    before = time.time()
     os.system('pkusers --arguments arguments.list') 
-    showTiming(len(usernames), before)
     
 def createUserPQuotas(usernames, printernames) :
@@ -103 +84 @@
         argsfile.write("%s\n" % uname)
     argsfile.close()    
-    before = time.time()
     os.system('edpykota --arguments arguments.list') 
-    showTiming(number, before)
 
 def deleteUserPQuotas(usernames, printernames) :
@@ -117 +96 @@
         argsfile.write("%s\n" % uname)
     argsfile.close()    
-    before = time.time()
     os.system('edpykota --arguments arguments.list') 
-    showTiming(number, before)
     
 if __name__ == "__main__" :