Changeset 2790

Timestamp:

03/06/06 08:50:32 (18 years ago)

Author:

jerome

Message:

Now uses the Percent class like other tools do.

Files:

• pykota/trunk/bin/pkinvoice (modified) (3 diffs)

pykota/trunk/bin/pkinvoice

@@ -47 +47 @@
     hasPIL = 1
 
-from pykota.tool import PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.tool import Percent, PyKotaToolError, PyKotaCommandLineError, crashed, N_
 from pykota.dumper import DumPyKota
-from pykota.config import PyKotaConfigError
-from pykota.storage import PyKotaStorageError
 
 __doc__ = N_("""pkinvoice v%(__version__)s (c) %(__years__)s %(__author__)s
@@ -282 +280 @@
             names = [ "*" ]
             
+        percent = Percent(self)
         outfname = options["output"]    
         if outfname != "-" :
-            self.display("%s...\n" % _("Processing"))
-            
+            percent.display("%s..." % _("Extracting datas"))
         entries = self.storage.getMatchingUsers(",".join(names))
+        percent.setSize(len(entries))
         if entries :
+            percent.display("\n%s\n" % _("Generating invoices"))
             self.initPDF(options["logo"].strip())
-            nbtotal = len(entries)
-            for i in range(nbtotal) :
-                entry = entries[i]
+            for entry in entries :
                 number += self.pagePDF(number, entry, vat, options["start"], options["end"], options["unit"])
                 if outfname != "-" :
-                    percent = 100.0 * float(i) / float(nbtotal)
-                    self.display("\r%.02f%%" % percent)
+                    percent.oneMore()
                     
             if number > firstnumber :
@@ -301 +298 @@
             
         if outfname != "-" :
-            self.display("\r100.00%%\r        ")
-            self.display("\r%s\n" % _("Done."))
+            percent.done()
                      
 if __name__ == "__main__" :