Attachment 303174 Details for Bug 437197 – Revised patch

[patch] Revised patch

urlgrabber-terminal-width.diff (text/plain), 2.92 KB, created by Mary Ellen Foster on 2008-04-21 17:24:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mary Ellen Foster

Created: 2008-04-21 17:24:01 UTC

Size: 2.92 KB

patch

obsolete

>diff -ur urlgrabber-3.0.0.orig/urlgrabber/progress.py urlgrabber-3.0.0/urlgrabber/progress.py
>--- urlgrabber-3.0.0.orig/urlgrabber/progress.py	2008-04-21 17:11:27.000000000 +0100
>+++ urlgrabber-3.0.0/urlgrabber/progress.py	2008-04-21 18:21:14.000000000 +0100
>@@ -24,6 +24,9 @@
> import math
> import thread
> import types
>+import fcntl
>+import struct
>+import termios
>     
> class BaseMeter:
>     def __init__(self):
>@@ -95,6 +98,12 @@
>     _text_meter_total_size = size
>     _text_meter_sofar_size = downloaded
> 
>+# Code from http://mail.python.org/pipermail/python-list/2000-May/033365.html
>+def get_terminal_width():
>+    buf = 'abcdefgh'
>+    buf = fcntl.ioctl(0, termios.TIOCGWINSZ, buf)
>+    return struct.unpack('hhhh', buf)[1]
>+
> class TextMeter(BaseMeter):
>     def __init__(self, fo=sys.stderr):
>         BaseMeter.__init__(self)
>@@ -116,8 +125,9 @@
>             sofar_pc   = (sofar_size * 100) / _text_meter_total_size
> 
>         if self.size is None:
>-            out = '\r%-60.60s    %5sB %s ' % \
>-                  (text, fread, fetime)
>+            width = get_terminal_width() - 20
>+            fmt = '\r%%-%d.%ds    %%5sB %%s ' % (width, width)
>+            out = fmt % (text, fread, fetime)
>         else:
>             rtime = self.re.remaining_time()
>             frtime = format_time(rtime)
>@@ -126,10 +136,14 @@
>             bar = '='*int(10 * frac)
>             ave_dl = format_number(self.re.average_rate())
>             if sofar_size is None:
>-                out = '\r%-25.25s %3i%% |%-14.14s| %5sB/s | %5sB %9s ETA ' % \
>-                      (text, frac*100, bar, ave_dl, fread, frtime)
>+                width = get_terminal_width() - 55
>+                fmt = '\r%%-%d.%ds %%3i%%%% |%%-14.14s| %%5sB/s | %%5sB %%9s ETA ' % \
>+                        (width, width)
>+                out = fmt % (text, frac*100, bar, ave_dl, fread, frtime)
>             else:
>-                fmt ='\r%-22.22s %3i%% |%4i%% |%-10.10s| %5sB/s | %5sB %9s ETA '
>+                width = get_terminal_width() - 58
>+                fmt ='\r%%-%d.%ds %%3i%%%% |%%4i%%%% |%%-10.10s| %%5sB/s | %%5sB %%9s ETA ' % \
>+                        (width, width)
>                 out = fmt % (text, sofar_pc,frac*100,bar,ave_dl, fread,frtime)
> 
>         self.fo.write(out)
>@@ -146,11 +160,13 @@
>         else:
>             text = self.basename
>         if self.size is None:
>-            out = '\r%-60.60s    %5sB %s ' % \
>-                  (text, total_size, total_time)
>+            width = get_terminal_width() - 20
>+            fmt = '\r%%-%d.%ds    %%5sB %%s ' % (width, width)
>+            out = fmt % (text, total_size, total_time)
>         else:
>-            out = '\r%-56.56s | %5sB %9s    ' % \
>-                  (text, total_size, total_time)
>+            width = get_terminal_width() - 24
>+            fmt = '\r%%-%d.%ds | %%5sB %%9s    ' % (width, width)
>+            out = fmt % (text, total_size, total_time)
>                 
>         self.fo.write(out + '\n')
>         self.fo.flush()

Actions: View | Diff

Attachments on bug 437197: 303171 | 303174