[gentoo-commits] proj/g-sorcery:master commit in: g_sorcery/

["Jauhien Piatlicki" <piatlicki@gmail.com>]

commit:     3128ec6e5ec9e3bd472d63621af521153f922d4a
Author:     Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com>
AuthorDate: Sun Aug 11 20:34:08 2013 +0000
Commit:     Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com>
CommitDate: Sun Aug 11 20:34:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=3128ec6e

g_sorcery/logger: ProgressBar

---
 g_sorcery/logger.py     | 40 ++++++++++++++++++++++++++++++++++++++++
 g_sorcery/package_db.py | 25 ++++++-------------------
 2 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/g_sorcery/logger.py b/g_sorcery/logger.py
index 5d6a839..5848715 100644
--- a/g_sorcery/logger.py
+++ b/g_sorcery/logger.py
@@ -11,6 +11,8 @@
     :license: GPL-2, see LICENSE for more details.
 """
 
+import sys
+
 import portage
 
 
@@ -29,3 +31,41 @@ class Logger(object):
 
     def warn(self, message):
         self.out.ewarn(message)
+
+
+class ProgressBar(object):
+    """
+    A progress bar for CLI
+    """
+
+    __slots__ = ('length', 'total', 'processed', 'chars')
+    
+    def __init__(self, length, total, processed = 0):
+        self.length = length
+        self.total = total
+        self.chars = ['-', '\\', '|', '/']
+        self.processed = processed
+
+    def begin(self):
+        self.processed = 0
+        self.display()
+
+    def display(self, processed = None):
+        if processed:
+            self.processed = processed
+
+        show = self.chars[self.processed % 4]
+        percent = (self.processed * 100)//self.total
+        progress = (percent * self.length)//100
+        blank = self.length - progress
+        sys.stdout.write("\r %s [%s%s] %s%%" % \
+                             (show, "#" * progress, " " * blank, percent))
+        sys.stdout.flush()
+
+    def increment(self, count = 1):
+        self.processed += count
+        self.display()
+
+    def end(self):
+        self.processed = self.total
+        self.display()

diff --git a/g_sorcery/package_db.py b/g_sorcery/package_db.py
index f8ba1a2..12873eb 100644
--- a/g_sorcery/package_db.py
+++ b/g_sorcery/package_db.py
@@ -26,7 +26,7 @@ from .exceptions import DBStructureError, IntegrityError, \
      InvalidKeyError, SyncError
 from .fileutils import FileJSON, hash_file, load_remote_file, copy_all, wget
 from .g_collections import Package
-from .logger import Logger
+from .logger import Logger, ProgressBar
 
 
 class PackageDB(object):
@@ -249,9 +249,9 @@ class PackageDB(object):
             logger = Logger()
             logger.info("writing database")
 
-        number_of_packages = len(list(self.database))
-        written_number = 0
-        length = 20
+        progress_bar = ProgressBar(20, len(list(self.database)))
+        if self.database:
+                progress_bar.begin()
         
         for pkgname, versions in self.database.items():
             category, name = pkgname.split('/')
@@ -273,19 +273,7 @@ class PackageDB(object):
                 pkgs = []
             pkgs.append(name)
             f.write(pkgs)
-
-            chars = ['-', '\\', '|', '/']
-            show = chars[written_number % 4]
-            percent = (written_number * 100)//number_of_packages
-            progress = (percent * length)//100
-            blank = length - progress
-
-            sys.stdout.write("\r %s [%s%s] %s%%" % \
-                             (show, "#" * progress, " " * blank, percent))
-            sys.stdout.flush()
-            written_number += 1
-
-            
+            progress_bar.increment()
 
         for category in self.categories:
             self.additional_write_category(category)
@@ -293,8 +281,7 @@ class PackageDB(object):
         self.additional_write()
 
         if self.database:
-            sys.stdout.write("\r %s [%s] %s%%" % ("-", "#" * length, 100))
-            sys.stdout.flush()
+            progress_bar.end()
             print("")
 
     def additional_write_version(self, category, package, version):