Changeset 2783 for pykota/trunk/pykota/tool.py

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/pykota/tool.py (modified) (3 diffs)

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 :