[yum-commits] urlgrabber/progress.py

[zpavlas at osuosl.org]

 urlgrabber/progress.py |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

New commits:
commit 0510186714c183b889a2714a6a6d5cb414bf5cab
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Mon Dec 9 17:46:32 2013 +0100

    single/multi progress: Use the same time formatting.
    
    Add exactly two spaces before the formatted time. Before this
    single downloaded used 2 or 5 spaces, while multi downloader
    used 2 or 3 spaces depending on the screen width.

diff --git a/urlgrabber/progress.py b/urlgrabber/progress.py
index 5d148f0..9b77c54 100644
--- a/urlgrabber/progress.py
+++ b/urlgrabber/progress.py
@@ -254,7 +254,7 @@ class TextMeter(BaseMeter):
             use_hours = False
         ui_size = tl.add(' | %5sB' % fread)
         if self.size is None:
-            ui_time = tl.add(' %9s' % format_time(etime, use_hours))
+            ui_time = tl.add('  %s' % format_time(etime, use_hours))
             ui_end  = tl.add(' ' * 5)
             ui_rate = tl.add(' %5sB/s' % ave_dl)
             out = '%-*.*s%s%s%s%s\r' % (tl.rest(), tl.rest(), text,
@@ -264,7 +264,7 @@ class TextMeter(BaseMeter):
             frtime = format_time(rtime, use_hours)
             frac = self.re.fraction_read()
 
-            ui_time = tl.add(' %9s' % frtime)
+            ui_time = tl.add('  %s' % frtime)
             ui_end  = tl.add(' ETA ')
 
             if sofar_size is None:
@@ -301,7 +301,7 @@ class TextMeter(BaseMeter):
         else:
             use_hours = False
         ui_size = tl.add(' | %5sB' % total_size)
-        ui_time = tl.add(' %9s' % format_time(self.re.elapsed_time(),use_hours))
+        ui_time = tl.add('  %s' % format_time(self.re.elapsed_time(), use_hours))
         ui_end, not_done = _term_add_end(tl, self.size, amount_read)
         out = '\r%-*.*s%s%s%s\n' % (tl.rest(), tl.rest(), text,
                                     ui_size, ui_time, ui_end)
@@ -541,21 +541,17 @@ class TextMultiFileMeter(MultiFileMeter):
             tl = TerminalLine(8, 8+1+8)
             if tl._llen > 80:
                 use_hours = True # For big screens, make it more readable.
-                time_len  = 9
             else:
                 use_hours = False
-                time_len  = 7
-
             ui_size = tl.add(' | %5sB' % format_number(dd))
-
             if not self.re.total:
-                ui_time = tl.add(' %*s' % (time_len,format_time(dt, use_hours)))
+                ui_time = tl.add('  %s' % format_time(dt, use_hours))
                 ui_end  = tl.add(' ' * 5)
                 ui_rate = tl.add(' %5sB/s' % ave_dl)
                 out = '\r%-*.*s%s%s%s%s\r' % (tl.rest(), tl.rest(), text,
                                               ui_rate, ui_size, ui_time, ui_end)
             else:
-                ui_time = tl.add(' %*s' % (time_len,format_time(rt, use_hours)))
+                ui_time = tl.add('  %s' % format_time(rt, use_hours))
                 ui_end  = tl.add(' ETA ')
 
                 ui_sofar_pc = tl.add(' %i%%' % pf,
@@ -594,12 +590,10 @@ class TextMultiFileMeter(MultiFileMeter):
             tl = TerminalLine(8)
             if tl._llen > 80:
                 use_hours = True # For big screens, make it more readable.
-                time_len  = 9
             else:
                 use_hours = False
-                time_len  = 7
             ui_size = tl.add(' | %5sB' % total_size)
-            ui_time = tl.add(' %*s' % (time_len, format_time(et, use_hours)))
+            ui_time = tl.add('  %s' % format_time(et, use_hours))
             ui_end, not_done = _term_add_end(tl, meter.size, size)
             out = '\r%-*.*s%s%s%s\n' % (tl.rest(), tl.rest(), text,
                                         ui_size, ui_time, ui_end)