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
35
# TODO: Optionally show elapsed time instead/as well as ETA; nicer
36
# when the rate is unpredictable
38
# TODO: Perhaps don't write updates faster than a certain rate, say
43
import bzrlib.errors as errors
44
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):
47
61
def _supports_progress(f):
48
isatty = getattr(f, 'isatty', None)
62
if not hasattr(f, 'isatty'):
53
67
if os.environ.get('TERM') == 'dumb':
54
68
# e.g. emacs compile window
59
_progress_bar_types = {}
62
def ProgressBar(to_file=None, **kwargs):
63
"""Abstract factory"""
66
requested_bar_type = os.environ.get('BZR_PROGRESS_BAR')
67
# An value of '' or not set reverts to standard processing
68
if requested_bar_type in (None, ''):
69
if _supports_progress(to_file):
70
return TTYProgressBar(to_file=to_file, **kwargs)
72
return DotsProgressBar(to_file=to_file, **kwargs)
74
# Minor sanitation to prevent spurious errors
75
requested_bar_type = requested_bar_type.lower().strip()
76
# TODO: jam 20060710 Arguably we shouldn't raise an exception
77
# but should instead just disable progress bars if we
78
# don't recognize the type
79
if requested_bar_type not in _progress_bar_types:
80
raise errors.InvalidProgressBarType(requested_bar_type,
81
_progress_bar_types.keys())
82
return _progress_bar_types[requested_bar_type](to_file=to_file, **kwargs)
85
class ProgressBarStack(object):
86
"""A stack of progress bars."""
95
to_messages_file=None,
97
"""Setup the stack with the parameters the progress bars should have."""
100
if to_messages_file is None:
101
to_messages_file = sys.stdout
102
self._to_file = to_file
103
self._show_pct = show_pct
104
self._show_spinner = show_spinner
105
self._show_eta = show_eta
106
self._show_bar = show_bar
107
self._show_count = show_count
108
self._to_messages_file = to_messages_file
110
self._klass = klass or ProgressBar
113
if len(self._stack) != 0:
114
return self._stack[-1]
119
if len(self._stack) != 0:
120
return self._stack[0]
124
def get_nested(self):
125
"""Return a nested progress bar."""
126
if len(self._stack) == 0:
129
func = self.top().child_progress
130
new_bar = func(to_file=self._to_file,
131
show_pct=self._show_pct,
132
show_spinner=self._show_spinner,
133
show_eta=self._show_eta,
134
show_bar=self._show_bar,
135
show_count=self._show_count,
136
to_messages_file=self._to_messages_file,
138
self._stack.append(new_bar)
141
def return_pb(self, bar):
142
"""Return bar after its been used."""
143
if bar is not self._stack[-1]:
144
raise errors.MissingProgressBarFinish()
148
class _BaseProgressBar(object):
157
to_messages_file=None,
159
object.__init__(self)
162
if to_messages_file is None:
163
to_messages_file = sys.stdout
164
self.to_file = to_file
165
self.to_messages_file = to_messages_file
168
self.last_total = None
169
self.show_pct = show_pct
170
self.show_spinner = show_spinner
171
self.show_eta = show_eta
172
self.show_bar = show_bar
173
self.show_count = show_count
176
self.MIN_PAUSE = 0.1 # seconds
179
self.start_time = now
180
# next update should not throttle
181
self.last_update = now - self.MIN_PAUSE - 1
184
"""Return this bar to its progress stack."""
186
assert self._stack is not None
187
self._stack.return_pb(self)
189
def note(self, fmt_string, *args, **kwargs):
190
"""Record a note without disrupting the progress bar."""
192
self.to_messages_file.write(fmt_string % args)
193
self.to_messages_file.write('\n')
195
def child_progress(self, **kwargs):
196
return ChildProgress(**kwargs)
199
class DummyProgress(_BaseProgressBar):
200
"""Progress-bar standin that does nothing.
202
This can be used as the default argument for methods that
203
take an optional progress indicator."""
207
def update(self, msg=None, current=None, total=None):
210
def child_update(self, message, current, total):
216
def note(self, fmt_string, *args, **kwargs):
217
"""See _BaseProgressBar.note()."""
219
def child_progress(self, **kwargs):
220
return DummyProgress(**kwargs)
223
_progress_bar_types['dummy'] = DummyProgress
224
_progress_bar_types['none'] = DummyProgress
227
class DotsProgressBar(_BaseProgressBar):
229
def __init__(self, **kwargs):
230
_BaseProgressBar.__init__(self, **kwargs)
237
def update(self, msg=None, current_cnt=None, total_cnt=None):
238
if msg and msg != self.last_msg:
240
self.to_file.write('\n')
241
self.to_file.write(msg + ': ')
244
self.to_file.write('.')
248
self.to_file.write('\n')
251
def child_update(self, message, current, total):
255
_progress_bar_types['dots'] = DotsProgressBar
258
class TTYProgressBar(_BaseProgressBar):
74
class ProgressBar(object):
259
75
"""Progress bar display object.
261
77
Several options are available to control the display. These can
276
92
The output file should be in line-buffered or unbuffered mode.
278
94
SPIN_CHARS = r'/-\|'
281
def __init__(self, **kwargs):
282
from bzrlib.osutils import terminal_width
283
_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)
284
110
self.spin_pos = 0
285
self.width = terminal_width()
286
self.last_updates = []
287
self._max_last_updates = 10
288
self.child_fraction = 0
289
self._have_output = False
292
def throttle(self, old_msg):
293
"""Return True if the bar was updated too recently"""
294
# time.time consistently takes 40/4000 ms = 0.01 ms.
295
# but every single update to the pb invokes it.
296
# so we use time.clock which takes 20/4000 ms = 0.005ms
297
# on the downside, time.clock() appears to have approximately
298
# 10ms granularity, so we treat a zero-time change as 'throttled.'
300
if self.start_time is not None and (now - self.start_time) < 1:
302
if old_msg != self.last_msg:
304
interval = now - self.last_update
306
if interval < self.MIN_PAUSE:
309
self.last_updates.append(now - self.last_update)
310
# Don't let the queue grow without bound
311
self.last_updates = self.last_updates[-self._max_last_updates:]
312
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
316
self.update(self.last_msg, self.last_cnt, self.last_total,
319
def child_update(self, message, current, total):
320
if current is not None and total != 0:
321
child_fraction = float(current) / total
322
if self.last_cnt is None:
324
elif self.last_cnt + child_fraction <= self.last_total:
325
self.child_fraction = child_fraction
327
mutter('not updating child fraction')
328
if self.last_msg is None:
332
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):
334
128
"""Update and redraw progress bar."""
338
if total_cnt is None:
339
total_cnt = self.last_total
344
if current_cnt > total_cnt:
345
total_cnt = current_cnt
347
## # optional corner case optimisation
348
## # currently does not seem to fire so costs more than saved.
349
## # trivial optimal case:
350
## # NB if callers are doing a clear and restore with
351
## # the saved values, this will prevent that:
352
## # in that case add a restore method that calls
353
## # _do_update or some such
354
## if (self.last_msg == msg and
355
## self.last_cnt == current_cnt and
356
## self.last_total == total_cnt and
357
## self.child_fraction == child_fraction):
360
old_msg = self.last_msg
361
132
# save these for the tick() function
362
133
self.last_msg = msg
363
134
self.last_cnt = current_cnt
364
135
self.last_total = total_cnt
365
self.child_fraction = child_fraction
367
# each function call takes 20ms/4000 = 0.005 ms,
368
# but multiple that by 4000 calls -> starts to cost.
369
# so anything to make this function call faster
370
# will improve base 'diff' time by up to 0.1 seconds.
371
if self.throttle(old_msg):
374
if self.show_eta and self.start_time and self.last_total:
375
eta = get_eta(self.start_time, self.last_cnt + self.child_fraction,
376
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)
377
156
eta_str = " " + str_tdelta(eta)
386
165
# always update this; it's also used for the bar
387
166
self.spin_pos += 1
389
if self.show_pct and self.last_total and self.last_cnt:
390
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
391
170
pct_str = ' (%5.1f%%)' % pct
395
174
if not self.show_count:
397
elif self.last_cnt is None:
176
elif current_cnt is None:
399
elif self.last_total is None:
400
count_str = ' %i' % (self.last_cnt)
178
elif total_cnt is None:
179
count_str = ' %i' % (current_cnt)
402
181
# make both fields the same size
403
t = '%i' % (self.last_total)
404
c = '%*i' % (len(t), self.last_cnt)
182
t = '%i' % (total_cnt)
183
c = '%*i' % (len(t), current_cnt)
405
184
count_str = ' ' + c + '/' + t
407
186
if self.show_bar:
408
187
# progress bar, if present, soaks up all remaining space
409
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) \
410
189
- len(eta_str) - len(count_str) - 3
413
192
# number of markers highlighted in bar
414
markers = int(round(float(cols) *
415
(self.last_cnt + self.child_fraction) / self.last_total))
193
markers = int(round(float(cols) * current_cnt / total_cnt))
416
194
bar_str = '[' + ('=' * markers).ljust(cols) + '] '
418
196
# don't know total, so can't show completion.
429
m = spin_str + bar_str + self.last_msg + count_str + pct_str + eta_str
207
m = spin_str + bar_str + msg + count_str + pct_str + eta_str
431
assert len(m) < self.width
432
self.to_file.write('\r' + m.ljust(self.width - 1))
433
self._have_output = True
209
assert len(m) < width
210
self.to_file.write('\r' + m.ljust(width - 1))
434
211
#self.to_file.flush()
437
if self._have_output:
438
self.to_file.write('\r%s\r' % (' ' * (self.width - 1)))
439
self._have_output = False
218
self.to_file.write('\r%s\r' % (' ' * (_width() - 1)))
440
219
#self.to_file.flush()
443
_progress_bar_types['tty'] = TTYProgressBar
446
class ChildProgress(_BaseProgressBar):
447
"""A progress indicator that pushes its data to the parent"""
449
def __init__(self, _stack, **kwargs):
450
_BaseProgressBar.__init__(self, _stack=_stack, **kwargs)
451
self.parent = _stack.top()
454
self.child_fraction = 0
457
def update(self, msg, current_cnt=None, total_cnt=None):
458
self.current = current_cnt
459
self.total = total_cnt
461
self.child_fraction = 0
464
def child_update(self, message, current, total):
465
if current is None or total == 0:
466
self.child_fraction = 0
468
self.child_fraction = float(current) / total
472
if self.current is None:
475
count = self.current+self.child_fraction
476
if count > self.total:
478
mutter('clamping count of %d to %d' % (count, self.total))
480
self.parent.child_update(self.message, count, self.total)
485
def note(self, *args, **kwargs):
486
self.parent.note(*args, **kwargs)
489
223
def str_tdelta(delt):
added
removed
bzrlib/progress.py
