Changeset 2782 for pykota/trunk/bin/pkusers

Timestamp:

03/04/06 15:51:12 (18 years ago)

Author:

jerome

Message:

Code cleaning.
Topped to 10000 the number of times the percent will be displayed by not displaying it if there's no change.
This is very useful when adding 25000 users on 300 printers through an ssh connection...

Files:

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

pykota/trunk/bin/pkusers

@@ -30 +30 @@
 import grp
 
-from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.tool import Percent, PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
 from pykota.storage import StorageUser, StorageGroup
 
@@ -235 +235 @@
                     print
         elif options["delete"] :    
-            self.display("\n%s..." % _("Deletion"))
+            percent = Percent(self, "\n%s..." % _("Deletion"), len(entries))
             getattr(self.storage, "deleteMany%ss" % suffix)(entries)
-            self.display("\n")
+            percent.display("\n")
         else :
             limitby = options["limitby"]
@@ -286 +286 @@
             try :    
                 if options["add"] :    
-                    self.display("%s...\n" % _("Creation"))
                     rejectunknown = self.config.getRejectUnknown()    
-                    nbtotal = len(names)
-                    for i in range(nbtotal) :
-                        ename = names[i]
+                    percent = Percent(self, "%s...\n" % _("Creation"), len(names))
+                    for ename in names :
                         email = None
                         if not groups :
@@ -347 +345 @@
                         else :
                             raise PyKotaCommandLineError, _("Invalid name %s") % ename
-                        percent = 100.0 * float(i) / float(nbtotal)
-                        self.display("\r%.02f%%" % percent)
+                        percent.oneMore()
                 else :
-                    self.display("\n%s...\n" % _("Modification"))
-                    nbtotal = len(entries)
-                    for i in range(nbtotal) :        
-                        entry = entries[i]
+                    percent = Percent(self, "\n%s...\n" % _("Modification"), len(entries)) 
+                    for entry in entries :
                         if groups :
                             self.modifyEntry(entry, groups, limitby, description)
@@ -362 +357 @@
                             self.manageUsersGroups(usersgroups, entry, remove)                
                         entry.save()    
-                        percent = 100.0 * float(i) / float(nbtotal)
-                        self.display("\r%.02f%%" % percent)
+                        percent.oneMore()
             except :                    
                 self.storage.rollbackTransaction()
@@ -369 +363 @@
             else :    
                 self.storage.commitTransaction()
-                                
-        if not options["list"] :                
-            self.done()
+                
+        try :
+            percent.done()
+        except NameError :    
+            pass
                      
 if __name__ == "__main__" :