1
1
# Copyright (C) 2005 Aaron Bentley <aaron.bentley@utoronto.ca>
2
# Copyright (C) 2005, 2006 Canonical Ltd
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.
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.
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
19
"""Simple text-mode progress indicator.
2
# Copyright (C) 2005 Canonical <canonical.com>
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.
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.
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
20
Simple text-mode progress indicator.
22
Everyone loves ascii art!
21
24
To display an indicator, create a ProgressBar object. Call it,
22
25
passing Progress objects indicating the current state. When done,
26
29
not to clutter log files.
32
# TODO: remove functions in favour of keeping everything in one class
29
34
# TODO: should be a global option e.g. --silent that disables progress
30
35
# indicators, preferably without needing to adjust all code that
31
36
# potentially calls them.
33
# TODO: If not on a tty perhaps just print '......' for the benefit of IDEs, etc
38
# TODO: Perhaps don't write updates faster than a certain rate, say
35
# TODO: Optionally show elapsed time instead/as well as ETA; nicer
36
# when the rate is unpredictable
42
from bzrlib.lazy_import import lazy_import
43
lazy_import(globals(), """
49
from bzrlib.trace import mutter
47
"""Return estimated terminal width.
49
TODO: Do something smart on Windows?
51
TODO: Is there anything that gets a better update when the window
52
is resized while the program is running?
56
return int(os.environ['COLUMNS'])
57
except (IndexError, KeyError, ValueError):
52
61
def _supports_progress(f):
53
"""Detect if we can use pretty progress bars on the output stream f.
55
If this returns true we expect that a human may be looking at that
56
output, and that we can repaint a line to update it.
58
isatty = getattr(f, 'isatty', None)
62
if not hasattr(f, 'isatty'):
63
67
if os.environ.get('TERM') == 'dumb':
64
68
# e.g. emacs compile window
69
_progress_bar_types = {}
72
def ProgressBar(to_file=None, **kwargs):
73
"""Abstract factory"""
76
requested_bar_type = os.environ.get('BZR_PROGRESS_BAR')
77
# An value of '' or not set reverts to standard processing
78
if requested_bar_type in (None, ''):
79
if _supports_progress(to_file):
80
return TTYProgressBar(to_file=to_file, **kwargs)
82
return DummyProgress(to_file=to_file, **kwargs)
84
# Minor sanitation to prevent spurious errors
85
requested_bar_type = requested_bar_type.lower().strip()
86
# TODO: jam 20060710 Arguably we shouldn't raise an exception
87
# but should instead just disable progress bars if we
88
# don't recognize the type
89
if requested_bar_type not in _progress_bar_types:
90
raise errors.InvalidProgressBarType(requested_bar_type,
91
_progress_bar_types.keys())
92
return _progress_bar_types[requested_bar_type](to_file=to_file, **kwargs)
95
class ProgressBarStack(object):
96
"""A stack of progress bars."""
105
to_messages_file=None,
107
"""Setup the stack with the parameters the progress bars should have."""
110
if to_messages_file is None:
111
to_messages_file = sys.stdout
112
self._to_file = to_file
113
self._show_pct = show_pct
114
self._show_spinner = show_spinner
115
self._show_eta = show_eta
116
self._show_bar = show_bar
117
self._show_count = show_count
118
self._to_messages_file = to_messages_file
120
self._klass = klass or ProgressBar
123
if len(self._stack) != 0:
124
return self._stack[-1]
129
if len(self._stack) != 0:
130
return self._stack[0]
134
def get_nested(self):
135
"""Return a nested progress bar."""
136
if len(self._stack) == 0:
139
func = self.top().child_progress
140
new_bar = func(to_file=self._to_file,
141
show_pct=self._show_pct,
142
show_spinner=self._show_spinner,
143
show_eta=self._show_eta,
144
show_bar=self._show_bar,
145
show_count=self._show_count,
146
to_messages_file=self._to_messages_file,
148
self._stack.append(new_bar)
151
def return_pb(self, bar):
152
"""Return bar after its been used."""
153
if bar is not self._stack[-1]:
154
raise errors.MissingProgressBarFinish()
158
class _BaseProgressBar(object):
167
to_messages_file=None,
169
object.__init__(self)
172
if to_messages_file is None:
173
to_messages_file = sys.stdout
174
self.to_file = to_file
175
self.to_messages_file = to_messages_file
178
self.last_total = None
179
self.show_pct = show_pct
180
self.show_spinner = show_spinner
181
self.show_eta = show_eta
182
self.show_bar = show_bar
183
self.show_count = show_count
186
self.MIN_PAUSE = 0.1 # seconds
189
self.start_time = now
190
# next update should not throttle
191
self.last_update = now - self.MIN_PAUSE - 1
194
"""Return this bar to its progress stack."""
196
assert self._stack is not None
197
self._stack.return_pb(self)
199
def note(self, fmt_string, *args, **kwargs):
200
"""Record a note without disrupting the progress bar."""
202
self.to_messages_file.write(fmt_string % args)
203
self.to_messages_file.write('\n')
205
def child_progress(self, **kwargs):
206
return ChildProgress(**kwargs)
209
class DummyProgress(_BaseProgressBar):
210
"""Progress-bar standin that does nothing.
212
This can be used as the default argument for methods that
213
take an optional progress indicator."""
217
def update(self, msg=None, current=None, total=None):
220
def child_update(self, message, current, total):
226
def note(self, fmt_string, *args, **kwargs):
227
"""See _BaseProgressBar.note()."""
229
def child_progress(self, **kwargs):
230
return DummyProgress(**kwargs)
233
_progress_bar_types['dummy'] = DummyProgress
234
_progress_bar_types['none'] = DummyProgress
237
class DotsProgressBar(_BaseProgressBar):
239
def __init__(self, **kwargs):
240
_BaseProgressBar.__init__(self, **kwargs)
247
def update(self, msg=None, current_cnt=None, total_cnt=None):
248
if msg and msg != self.last_msg:
250
self.to_file.write('\n')
251
self.to_file.write(msg + ': ')
254
self.to_file.write('.')
258
self.to_file.write('\n')
261
def child_update(self, message, current, total):
265
_progress_bar_types['dots'] = DotsProgressBar
268
class TTYProgressBar(_BaseProgressBar):
74
class ProgressBar(object):
269
75
"""Progress bar display object.
271
77
Several options are available to control the display. These can
286
92
The output file should be in line-buffered or unbuffered mode.
288
94
SPIN_CHARS = r'/-\|'
291
def __init__(self, **kwargs):
292
from bzrlib.osutils import terminal_width
293
_BaseProgressBar.__init__(self, **kwargs)
95
MIN_PAUSE = 0.1 # seconds
107
object.__init__(self)
108
self.to_file = to_file
109
self.suppressed = not _supports_progress(self.to_file)
294
110
self.spin_pos = 0
295
self.width = terminal_width()
296
self.last_updates = []
297
self._max_last_updates = 10
298
self.child_fraction = 0
299
self._have_output = False
302
def throttle(self, old_msg):
303
"""Return True if the bar was updated too recently"""
304
# time.time consistently takes 40/4000 ms = 0.01 ms.
305
# time.clock() is faster, but gives us CPU time, not wall-clock time
307
if self.start_time is not None and (now - self.start_time) < 1:
309
if old_msg != self.last_msg:
311
interval = now - self.last_update
313
if interval < self.MIN_PAUSE:
316
self.last_updates.append(now - self.last_update)
317
# Don't let the queue grow without bound
318
self.last_updates = self.last_updates[-self._max_last_updates:]
319
self.last_update = now
114
self.last_total = None
115
self.show_pct = show_pct
116
self.show_spinner = show_spinner
117
self.show_eta = show_eta
118
self.show_bar = show_bar
119
self.show_count = show_count
323
self.update(self.last_msg, self.last_cnt, self.last_total,
326
def child_update(self, message, current, total):
327
if current is not None and total != 0:
328
child_fraction = float(current) / total
329
if self.last_cnt is None:
331
elif self.last_cnt + child_fraction <= self.last_total:
332
self.child_fraction = child_fraction
334
mutter('not updating child fraction')
335
if self.last_msg is None:
339
def update(self, msg, current_cnt=None, total_cnt=None,
123
self.update(self.last_msg, self.last_cnt, self.last_total)
127
def update(self, msg, current_cnt=None, total_cnt=None):
341
128
"""Update and redraw progress bar."""
345
if total_cnt is None:
346
total_cnt = self.last_total
351
if current_cnt > total_cnt:
352
total_cnt = current_cnt
354
## # optional corner case optimisation
355
## # currently does not seem to fire so costs more than saved.
356
## # trivial optimal case:
357
## # NB if callers are doing a clear and restore with
358
## # the saved values, this will prevent that:
359
## # in that case add a restore method that calls
360
## # _do_update or some such
361
## if (self.last_msg == msg and
362
## self.last_cnt == current_cnt and
363
## self.last_total == total_cnt and
364
## self.child_fraction == child_fraction):
367
old_msg = self.last_msg
368
132
# save these for the tick() function
369
133
self.last_msg = msg
370
134
self.last_cnt = current_cnt
371
135
self.last_total = total_cnt
372
self.child_fraction = child_fraction
374
# each function call takes 20ms/4000 = 0.005 ms,
375
# but multiple that by 4000 calls -> starts to cost.
376
# so anything to make this function call faster
377
# will improve base 'diff' time by up to 0.1 seconds.
378
if self.throttle(old_msg):
381
if self.show_eta and self.start_time and self.last_total:
382
eta = get_eta(self.start_time, self.last_cnt + self.child_fraction,
383
self.last_total, last_updates = self.last_updates)
138
if self.start_time is None:
139
self.start_time = now
141
interval = now - self.last_update
142
if interval > 0 and interval < self.MIN_PAUSE:
145
self.last_update = now
150
assert current_cnt <= total_cnt
152
assert current_cnt >= 0
154
if self.show_eta and self.start_time and total_cnt:
155
eta = get_eta(self.start_time, current_cnt, total_cnt)
384
156
eta_str = " " + str_tdelta(eta)
393
165
# always update this; it's also used for the bar
394
166
self.spin_pos += 1
396
if self.show_pct and self.last_total and self.last_cnt:
397
pct = 100.0 * ((self.last_cnt + self.child_fraction) / self.last_total)
168
if self.show_pct and total_cnt and current_cnt:
169
pct = 100.0 * current_cnt / total_cnt
398
170
pct_str = ' (%5.1f%%)' % pct
402
174
if not self.show_count:
404
elif self.last_cnt is None:
176
elif current_cnt is None:
406
elif self.last_total is None:
407
count_str = ' %i' % (self.last_cnt)
178
elif total_cnt is None:
179
count_str = ' %i' % (current_cnt)
409
181
# make both fields the same size
410
t = '%i' % (self.last_total)
411
c = '%*i' % (len(t), self.last_cnt)
182
t = '%i' % (total_cnt)
183
c = '%*i' % (len(t), current_cnt)
412
184
count_str = ' ' + c + '/' + t
414
186
if self.show_bar:
415
187
# progress bar, if present, soaks up all remaining space
416
cols = self.width - 1 - len(self.last_msg) - len(spin_str) - len(pct_str) \
188
cols = width - 1 - len(msg) - len(spin_str) - len(pct_str) \
417
189
- len(eta_str) - len(count_str) - 3
420
192
# number of markers highlighted in bar
421
markers = int(round(float(cols) *
422
(self.last_cnt + self.child_fraction) / self.last_total))
193
markers = int(round(float(cols) * current_cnt / total_cnt))
423
194
bar_str = '[' + ('=' * markers).ljust(cols) + '] '
425
196
# don't know total, so can't show completion.
436
m = spin_str + bar_str + self.last_msg + count_str + pct_str + eta_str
437
self.to_file.write('\r%-*.*s' % (self.width - 1, self.width - 1, m))
438
self._have_output = True
207
m = spin_str + bar_str + msg + count_str + pct_str + eta_str
209
assert len(m) < width
210
self.to_file.write('\r' + m.ljust(width - 1))
439
211
#self.to_file.flush()
442
if self._have_output:
443
self.to_file.write('\r%s\r' % (' ' * (self.width - 1)))
444
self._have_output = False
218
self.to_file.write('\r%s\r' % (' ' * (_width() - 1)))
445
219
#self.to_file.flush()
448
_progress_bar_types['tty'] = TTYProgressBar
451
class ChildProgress(_BaseProgressBar):
452
"""A progress indicator that pushes its data to the parent"""
454
def __init__(self, _stack, **kwargs):
455
_BaseProgressBar.__init__(self, _stack=_stack, **kwargs)
456
self.parent = _stack.top()
459
self.child_fraction = 0
462
def update(self, msg, current_cnt=None, total_cnt=None):
463
self.current = current_cnt
464
self.total = total_cnt
466
self.child_fraction = 0
469
def child_update(self, message, current, total):
470
if current is None or total == 0:
471
self.child_fraction = 0
473
self.child_fraction = float(current) / total
477
if self.current is None:
480
count = self.current+self.child_fraction
481
if count > self.total:
483
mutter('clamping count of %d to %d' % (count, self.total))
485
self.parent.child_update(self.message, count, self.total)
490
def note(self, *args, **kwargs):
491
self.parent.note(*args, **kwargs)
494
223
def str_tdelta(delt):
added
removed
bzrlib/progress.py
