Changeset 3434

Timestamp:

10/05/08 22:50:54 (16 years ago)

Author:

jerome

Message:

Moved the progress report code to its own module.

Location:

pykota/trunk

Files:

• bin/edpykota (modified) (1 diff)
• bin/pkbcodes (modified) (1 diff)
• bin/pkinvoice (modified) (1 diff)
• bin/pkprinters (modified) (1 diff)
• bin/pkrefund (modified) (1 diff)
• bin/pkusers (modified) (1 diff)
• pykota/progressbar.py (added)
• pykota/tool.py (modified) (6 diffs)

pykota/trunk/bin/edpykota

@@ -30 +30 @@
 from pykota.commandline import PyKotaOptionParser
 from pykota.errors import PyKotaCommandLineError
-from pykota.tool import Percent, PyKotaTool
+from pykota.tool import PyKotaTool
 from pykota.storage import StorageUserPQuota, StorageGroupPQuota
+from pykota.progressbar import Percent
 
 class EdPyKota(PyKotaTool) :

pykota/trunk/bin/pkbcodes

@@ -32 +32 @@
 from pykota.commandline import PyKotaOptionParser
 from pykota.errors import PyKotaCommandLineError
-from pykota.tool import Percent, PyKotaTool
+from pykota.tool import PyKotaTool
 from pykota.storage import StorageBillingCode
+from pykota.progressbar import Percent
 
 class PKBcodes(PyKotaTool) :

pykota/trunk/bin/pkinvoice

@@ -54 +54 @@
 from pykota.pdfutils import getPageSize
 from pykota.errors import PyKotaToolError, PyKotaCommandLineError
-from pykota.tool import Percent, PyKotaTool
+from pykota.tool import PyKotaTool
+from pykota.progressbar import Percent
 
 class PKInvoice(PyKotaTool) :

pykota/trunk/bin/pkprinters

@@ -32 +32 @@
 from pykota.commandline import PyKotaOptionParser
 from pykota.errors import PyKotaCommandLineError
-from pykota.tool import Percent, PyKotaTool
+from pykota.tool import PyKotaTool
 from pykota.storage import StoragePrinter
+from pykota.progressbar import Percent
 
 from pkipplib import pkipplib

pykota/trunk/bin/pkrefund

@@ -53 +53 @@
 from pykota.pdfutils import getPageSize
 from pykota.errors import PyKotaToolError, PyKotaCommandLineError
-from pykota.tool import Percent, PyKotaTool
+from pykota.tool import PyKotaTool
+from pykota.progressbar import Percent
 
 class PKRefund(PyKotaTool) :

pykota/trunk/bin/pkusers

@@ -33 +33 @@
 from pykota.commandline import PyKotaOptionParser
 from pykota.errors import PyKotaCommandLineError
-from pykota.tool import Percent, PyKotaTool
+from pykota.tool import PyKotaTool
 from pykota.storage import StorageUser, StorageGroup
+from pykota.progressbar import Percent
 
 class PKUsers(PyKotaTool) :

pykota/trunk/pykota/tool.py

@@ -42 +42 @@
 from pykota import config, storage, logger
 from pykota.version import __version__, __author__, __years__, __gplblurb__
-
-class Percent :
-    """A class to display progress."""
-    def __init__(self, app, size=None) :
-        """Initializes the engine."""
-        self.isatty = sys.stdout.isatty()
-        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
-        if size :
-            self.factor = 100.0 / float(size)
-
-    def display(self, msg) :
-        """Displays the value."""
-        if self.isatty :
-            self.app.display(msg)
-            sys.stdout.flush()
-
-    def oneMore(self) :
-        """Increments internal counter."""
-        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."""
-        after = time.time()
-        if self.size :
-            try :
-                speed = self.size / ((after - self.before) + 0.00000000001) # adds an epsilon to avoid an user's problem I can't reproduce...
-            except ZeroDivisionError :
-                speed = 1 # Fake value in case of division by zero, shouldn't happen anyway with the epsilon above...
-            self.display("\r100.00%%\r        \r%s. %s : %.2f %s.\n" \
-                     % (_("Done"), _("Average speed"), speed, _("entries per second")))
-        else :
-            self.display("\r100.00%%\r        \r%s.\n" % _("Done"))
 
 class Tool :
@@ -342 +295 @@
         for c in list(invalidchars) :
             if c in name :
-                return 0
-        return 1
+                return False
+        return True
 
     def _checkUserPQuota(self, userpquota) :
@@ -466 +419 @@
 
         # indicates that a warning needs to be sent
-        warned = 0
+        warned = False
 
         # first we check any group the user is a member of
@@ -480 +433 @@
                             return action
                         elif action == "WARN" :
-                            warned = 1
+                            warned = True
 
         # Then we check the user's account balance
@@ -515 +468 @@
         else :
             # Then check the user quota on current printer and all its parents.
-            policyallowed = 0
+            policyallowed = False
             for upquota in [ userpquota ] + userpquota.ParentPrintersUserPQuota :
                 action = self._checkUserPQuota(upquota)
@@ -521 +474 @@
                     return action
                 elif action == "WARN" :
-                    warned = 1
+                    warned = True
                 elif action == "POLICY_ALLOW" :
-                    policyallowed = 1
+                    policyallowed = True
             if warned :
                 return "WARN"