Changeset 3095

Timestamp:

11/30/06 23:41:00 (18 years ago)

Author:

jerome

Message:

Now pkrefund displays progression percent when extracting datas too.

Files:

• pykota/trunk/bin/pkrefund (modified) (5 diffs)

pykota/trunk/bin/pkrefund

@@ -293 +293 @@
             raise PyKotaCommandLineError, _("Refunding for no reason is forbidden. Please use the --reason command line option.")
             
-        if options["output"] :
-            options["output"] = options["output"].strip()
-            if options["output"] == "-" :
+        outfname = options["output"]
+        if outfname :
+            outfname = outfname.strip()
+            if outfname == "-" :
                 options["force"] = True
                 self.printInfo(_("The PDF file containing the receipts will be sent to stdout. --force is assumed."), "warn")
@@ -323 +324 @@
                 else :    
                     extractonly.update({ filterkey : filtervalue })
+            
+        percent = Percent(self)
+        if outfname != "-" :
+            percent.display("%s..." % _("Extracting datas"))
             
         username = extractonly.get("username")    
@@ -353 +358 @@
         nbcredits = 0.0
         reason = (options.get("reason") or "").strip()
+        percent.setSize(len(jobs))
+        if outfname != "-" :
+            percent.display("\n")
         for job in jobs :                                    
             if job.JobSize and (job.JobAction not in ("DENY", "CANCEL", "REFUND")) :
@@ -364 +372 @@
                     counters["nbjobs"] += 1
                     nbjobs += 1
+                    if outfname != "-" :
+                        percent.oneMore()
                 else :    
                     print _("Date : %s") % str(job.JobDate)[:19]
@@ -389 +399 @@
                             break
                     print        
-        self.genReceipts(peruser, options["logo"].strip(), options["output"], firstnumber, reason, options["unit"])
-        if options["output"] != "-" :    
+        if outfname != "-" :
+            percent.done()
+        self.genReceipts(peruser, options["logo"].strip(), outfname, firstnumber, reason, options["unit"])
+        if outfname != "-" :    
             print _("Refunded %i users for %i jobs, %i pages and %.3f credits") % (len(peruser), nbjobs, nbpages, nbcredits)