From a7d6ee81bbdf97be26da042931641b2dd51fcf68 Mon Sep 17 00:00:00 2001
From: aheadley <aheadley@waysaboutstuff.com>
Date: Sun, 18 Mar 2012 19:46:54 -0400
Subject: [PATCH] make progress bar more like wgets

---
 overviewer_core/observer.py    | 11 +++++++---
 overviewer_core/progressbar.py | 38 ++++++++++++++++++++++++++++------
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/overviewer_core/observer.py b/overviewer_core/observer.py
index bc1e873..57bfae3 100644
--- a/overviewer_core/observer.py
+++ b/overviewer_core/observer.py
@@ -114,9 +114,13 @@ class LoggingObserver(Observer):
         else:
             return cur_val - self.last_update > 100
 
-default_widgets = ['Rendering: ', progressbar.FractionWidget(), ' (',
-    progressbar.Percentage(), ') ', progressbar.Bar(left='[', right=']'),
-    ' ', progressbar.ETA()]
+default_widgets = [
+    progressbar.Percentage(), ' ',
+    progressbar.Bar(marker='=', left='[', right=']'), ' ',
+    progressbar.CounterWidget(), ' ',
+    progressbar.GenericSpeed(format='%.2ft/s'), ' ',
+    progressbar.ETA(prefix='eta ')
+]
 class ProgressBarObserver(progressbar.ProgressBar, Observer):
     """Display progress through a progressbar.
     """
@@ -131,6 +135,7 @@ class ProgressBarObserver(progressbar.ProgressBar, Observer):
 
     def start(self, max_value):
         self._set_max_value(max_value)
+        logging.info("Rendering %d total tiles." % max_value)
         super(ProgressBarObserver, self).start()
 
     def is_started(self):
diff --git a/overviewer_core/progressbar.py b/overviewer_core/progressbar.py
index 6acfe89..f0c8706 100644
--- a/overviewer_core/progressbar.py
+++ b/overviewer_core/progressbar.py
@@ -103,17 +103,35 @@ class ProgressBarWidgetHFill(object):
 
 class ETA(ProgressBarWidget):
     "Widget for the Estimated Time of Arrival"
+    def __init__(self, prefix='ETA: ', format='%H:%M:%S'):
+        self.format = format
+        self.prefix = prefix
+
     def format_time(self, seconds):
-        return time.strftime('%H:%M:%S', time.gmtime(seconds))
+        return time.strftime(self.format, time.gmtime(seconds))
+
     def update(self, pbar):
         if pbar.currval == 0:
-            return 'ETA:  --:--:--'
+            return self.prefix + '-' * len(self.format)
         elif pbar.finished:
             return 'Time: %s' % self.format_time(pbar.seconds_elapsed)
         else:
-            elapsed = pbar.seconds_elapsed
-            eta = elapsed * pbar.maxval / pbar.currval - elapsed
-            return 'ETA:  %s' % self.format_time(eta)
+            eta = pbar.seconds_elapsed * pbar.maxval / pbar.currval - pbar.seconds_elapsed
+            return self.prefix + self.format_time(eta)
+
+class GenericSpeed(ProgressBarWidget):
+    "Widget for showing the values/s"
+    def __init__(self, format='%6.2f ?/s'):
+        if callable(format):
+            self.format = format
+        else:
+            self.format = lambda speed: format % speed
+    def update(self, pbar):
+        if pbar.seconds_elapsed < 2e-6:
+            speed = 0.0
+        else:
+            speed = float(pbar.currval) / pbar.seconds_elapsed
+        return self.format(speed)
 
 class FileTransferSpeed(ProgressBarWidget):
     "Widget for showing the transfer speed (useful for file transfers)."
@@ -145,8 +163,16 @@ class RotatingMarker(ProgressBarWidget):
 
 class Percentage(ProgressBarWidget):
     "Just the percentage done."
+    def __init__(self, format='%3d%%'):
+        self.format = format
+
     def update(self, pbar):
-        return '%3d%%' % pbar.percentage()
+        return self.format % pbar.percentage()
+
+class CounterWidget(ProgressBarWidget):
+    "Simple display of (just) the current value"
+    def update(self, pbar):
+        return str(pbar.currval)
 
 class FractionWidget(ProgressBarWidget):
     def __init__(self, sep=' / '):