Changeset 2783 for pykota/trunk/bin/pkusers

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/pkusers (modified) (6 diffs)

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