bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
649
by Martin Pool
- some cleanups for the progressbar method |
1 |
# Copyright (C) 2005 Aaron Bentley <aaron.bentley@utoronto.ca>
|
2 |
# Copyright (C) 2005 Canonical <canonical.com>
|
|
648
by Martin Pool
- import aaron's progress-indicator code |
3 |
#
|
4 |
# This program is free software; you can redistribute it and/or modify
|
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
8 |
#
|
|
9 |
# This program is distributed in the hope that it will be useful,
|
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
13 |
#
|
|
14 |
# You should have received a copy of the GNU General Public License
|
|
15 |
# along with this program; if not, write to the Free Software
|
|
16 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
17 |
||
649
by Martin Pool
- some cleanups for the progressbar method |
18 |
|
19 |
"""
|
|
20 |
Simple text-mode progress indicator.
|
|
21 |
||
22 |
Everyone loves ascii art!
|
|
23 |
||
24 |
To display an indicator, create a ProgressBar object. Call it,
|
|
25 |
passing Progress objects indicating the current state. When done,
|
|
26 |
call clear().
|
|
27 |
||
28 |
Progress is suppressed when output is not sent to a terminal, so as
|
|
29 |
not to clutter log files.
|
|
30 |
"""
|
|
31 |
||
32 |
# TODO: remove functions in favour of keeping everything in one class
|
|
33 |
||
652
by Martin Pool
doc |
34 |
# TODO: should be a global option e.g. --silent that disables progress
|
35 |
# indicators, preferably without needing to adjust all code that
|
|
36 |
# potentially calls them.
|
|
37 |
||
655
by Martin Pool
- better calculation of progress bar position |
38 |
# TODO: Perhaps don't write updates faster than a certain rate, say
|
39 |
# 5/second.
|
|
40 |
||
649
by Martin Pool
- some cleanups for the progressbar method |
41 |
|
648
by Martin Pool
- import aaron's progress-indicator code |
42 |
import sys |
43 |
import datetime |
|
44 |
||
649
by Martin Pool
- some cleanups for the progressbar method |
45 |
|
46 |
def _width(): |
|
47 |
"""Return estimated terminal width. |
|
48 |
||
49 |
TODO: Do something smart on Windows?
|
|
50 |
||
51 |
TODO: Is there anything that gets a better update when the window
|
|
52 |
is resized while the program is running?
|
|
53 |
"""
|
|
54 |
import os |
|
55 |
try: |
|
56 |
return int(os.environ['COLUMNS']) |
|
57 |
except (IndexError, KeyError, ValueError): |
|
58 |
return 80 |
|
59 |
||
60 |
||
61 |
def _supports_progress(f): |
|
62 |
return hasattr(f, 'isatty') and f.isatty() |
|
63 |
||
64 |
||
65 |
||
648
by Martin Pool
- import aaron's progress-indicator code |
66 |
class ProgressBar(object): |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
67 |
"""Progress bar display object. |
68 |
||
69 |
Several options are available to control the display. These can
|
|
70 |
be passed as parameters to the constructor or assigned at any time:
|
|
71 |
||
72 |
show_pct
|
|
73 |
Show percentage complete.
|
|
74 |
show_spinner
|
|
75 |
Show rotating baton. This ticks over on every update even
|
|
76 |
if the values don't change.
|
|
77 |
show_eta
|
|
78 |
Show predicted time-to-completion.
|
|
79 |
show_bar
|
|
80 |
Show bar graph.
|
|
81 |
show_count
|
|
82 |
Show numerical counts.
|
|
83 |
||
84 |
The output file should be in line-buffered or unbuffered mode.
|
|
85 |
"""
|
|
86 |
SPIN_CHARS = r'/-\|' |
|
87 |
||
88 |
def __init__(self, |
|
89 |
to_file=sys.stderr, |
|
90 |
show_pct=False, |
|
91 |
show_spinner=False, |
|
92 |
show_eta=True, |
|
93 |
show_bar=True, |
|
94 |
show_count=True): |
|
649
by Martin Pool
- some cleanups for the progressbar method |
95 |
object.__init__(self) |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
96 |
self.start_time = None |
649
by Martin Pool
- some cleanups for the progressbar method |
97 |
self.to_file = to_file |
98 |
self.suppressed = not _supports_progress(self.to_file) |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
99 |
self.spin_pos = 0 |
100 |
||
101 |
self.show_pct = show_pct |
|
102 |
self.show_spinner = show_spinner |
|
103 |
self.show_eta = show_eta |
|
104 |
self.show_bar = show_bar |
|
105 |
self.show_count = show_count |
|
106 |
||
107 |
||
108 |
def tick(self): |
|
109 |
self.update(self.last_msg, self.last_cnt, self.last_total) |
|
110 |
||
111 |
||
112 |
||
113 |
def update(self, msg, current_cnt, total_cnt=None): |
|
114 |
"""Update and redraw progress bar.""" |
|
115 |
if self.start_time is None: |
|
116 |
self.start_time = datetime.datetime.now() |
|
117 |
||
118 |
# save these for the tick() function
|
|
119 |
self.last_msg = msg |
|
120 |
self.last_cnt = current_cnt |
|
121 |
self.last_total = total_cnt |
|
122 |
||
123 |
if self.suppressed: |
|
124 |
return
|
|
125 |
||
126 |
width = _width() |
|
127 |
||
128 |
if total_cnt: |
|
129 |
assert current_cnt <= total_cnt |
|
130 |
if current_cnt: |
|
131 |
assert current_cnt >= 0 |
|
132 |
||
133 |
if self.show_eta and self.start_time and total_cnt: |
|
134 |
eta = get_eta(self.start_time, current_cnt, total_cnt) |
|
135 |
eta_str = " " + str_tdelta(eta) |
|
136 |
else: |
|
137 |
eta_str = "" |
|
138 |
||
139 |
if self.show_spinner: |
|
140 |
spin_str = self.SPIN_CHARS[self.spin_pos % 4] + ' ' |
|
141 |
else: |
|
142 |
spin_str = '' |
|
143 |
||
144 |
# always update this; it's also used for the bar
|
|
145 |
self.spin_pos += 1 |
|
146 |
||
147 |
if self.show_pct and total_cnt and current_cnt: |
|
148 |
pct = 100.0 * current_cnt / total_cnt |
|
149 |
pct_str = ' (%5.1f%%)' % pct |
|
150 |
else: |
|
151 |
pct_str = '' |
|
152 |
||
153 |
if not self.show_count: |
|
154 |
count_str = '' |
|
155 |
elif current_cnt is None: |
|
156 |
count_str = '' |
|
157 |
elif total_cnt is None: |
|
158 |
count_str = ' %i' % (current_cnt) |
|
159 |
else: |
|
160 |
# make both fields the same size
|
|
161 |
t = '%i' % (total_cnt) |
|
162 |
c = '%*i' % (len(t), current_cnt) |
|
163 |
count_str = ' ' + c + '/' + t |
|
164 |
||
165 |
if self.show_bar: |
|
166 |
# progress bar, if present, soaks up all remaining space
|
|
167 |
cols = width - 1 - len(msg) - len(spin_str) - len(pct_str) \ |
|
168 |
- len(eta_str) - len(count_str) - 3 |
|
169 |
||
170 |
if total_cnt: |
|
171 |
# number of markers highlighted in bar
|
|
172 |
markers = int(round(float(cols) * current_cnt / total_cnt)) |
|
173 |
bar_str = '[' + ('=' * markers).ljust(cols) + '] ' |
|
174 |
else: |
|
175 |
# don't know total, so can't show completion.
|
|
176 |
# so just show an expanded spinning thingy
|
|
177 |
m = self.spin_pos % cols |
|
178 |
ms = ' ' * cols |
|
179 |
ms[m] = '*' |
|
180 |
||
181 |
bar_str = '[' + ms + '] ' |
|
182 |
else: |
|
183 |
bar_str = '' |
|
184 |
||
185 |
m = spin_str + bar_str + msg + count_str + pct_str + eta_str |
|
186 |
||
187 |
assert len(m) < width |
|
188 |
self.to_file.write('\r' + m.ljust(width - 1)) |
|
189 |
#self.to_file.flush()
|
|
190 |
||
649
by Martin Pool
- some cleanups for the progressbar method |
191 |
|
192 |
def clear(self): |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
193 |
if self.suppressed: |
194 |
return
|
|
195 |
||
196 |
self.to_file.write('\r%s\r' % (' ' * (_width() - 1))) |
|
197 |
#self.to_file.flush()
|
|
649
by Martin Pool
- some cleanups for the progressbar method |
198 |
|
199 |
||
648
by Martin Pool
- import aaron's progress-indicator code |
200 |
|
201 |
def divide_timedelta(delt, divisor): |
|
202 |
"""Divides a timedelta object""" |
|
203 |
return datetime.timedelta(float(delt.days)/divisor, |
|
204 |
float(delt.seconds)/divisor, |
|
205 |
float(delt.microseconds)/divisor) |
|
206 |
||
207 |
def str_tdelta(delt): |
|
208 |
if delt is None: |
|
209 |
return "-:--:--" |
|
210 |
return str(datetime.timedelta(delt.days, delt.seconds)) |
|
211 |
||
649
by Martin Pool
- some cleanups for the progressbar method |
212 |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
213 |
def get_eta(start_time, current, total, enough_samples=20): |
214 |
if start_time is None or current == 0: |
|
648
by Martin Pool
- import aaron's progress-indicator code |
215 |
return None |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
216 |
elif current < enough_samples: |
217 |
# FIXME: No good if it's not a count
|
|
648
by Martin Pool
- import aaron's progress-indicator code |
218 |
return None |
219 |
elapsed = datetime.datetime.now() - start_time |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
220 |
total_duration = divide_timedelta(elapsed * long(total), |
221 |
current) |
|
648
by Martin Pool
- import aaron's progress-indicator code |
222 |
if elapsed < total_duration: |
223 |
eta = total_duration - elapsed |
|
224 |
else: |
|
225 |
eta = total_duration - total_duration |
|
226 |
return eta |
|
227 |
||
649
by Martin Pool
- some cleanups for the progressbar method |
228 |
|
648
by Martin Pool
- import aaron's progress-indicator code |
229 |
def run_tests(): |
230 |
import doctest |
|
231 |
result = doctest.testmod() |
|
232 |
if result[1] > 0: |
|
233 |
if result[0] == 0: |
|
234 |
print "All tests passed" |
|
235 |
else: |
|
236 |
print "No tests to run" |
|
649
by Martin Pool
- some cleanups for the progressbar method |
237 |
|
238 |
||
239 |
def demo(): |
|
240 |
from time import sleep |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
241 |
pb = ProgressBar(show_pct=True, show_bar=True, show_spinner=False) |
649
by Martin Pool
- some cleanups for the progressbar method |
242 |
for i in range(100): |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
243 |
pb.update('Elephanten', i, 99) |
244 |
sleep(0.1) |
|
245 |
sleep(2) |
|
246 |
pb.clear() |
|
247 |
sleep(1) |
|
649
by Martin Pool
- some cleanups for the progressbar method |
248 |
print 'done!' |
249 |
||
648
by Martin Pool
- import aaron's progress-indicator code |
250 |
if __name__ == "__main__": |
649
by Martin Pool
- some cleanups for the progressbar method |
251 |
demo() |