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
42
from collections import deque
45
import bzrlib.errors as errors
46
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):
49
61
def _supports_progress(f):
61
def ProgressBar(to_file=None, **kwargs):
62
"""Abstract factory"""
65
if _supports_progress(to_file):
66
return TTYProgressBar(to_file=to_file, **kwargs)
68
return DotsProgressBar(to_file=to_file, **kwargs)
71
class ProgressBarStack(object):
72
"""A stack of progress bars."""
81
to_messages_file=None,
83
"""Setup the stack with the parameters the progress bars should have."""
86
if to_messages_file is None:
87
to_messages_file = sys.stdout
88
self._to_file = to_file
89
self._show_pct = show_pct
90
self._show_spinner = show_spinner
91
self._show_eta = show_eta
92
self._show_bar = show_bar
93
self._show_count = show_count
94
self._to_messages_file = to_messages_file
96
self._klass = klass or TTYProgressBar
99
if len(self._stack) != 0:
100
return self._stack[-1]
105
if len(self._stack) != 0:
106
return self._stack[0]
110
def get_nested(self):
111
"""Return a nested progress bar."""
112
if len(self._stack) == 0:
115
func = self.top().child_progress
116
new_bar = func(to_file=self._to_file,
117
show_pct=self._show_pct,
118
show_spinner=self._show_spinner,
119
show_eta=self._show_eta,
120
show_bar=self._show_bar,
121
show_count=self._show_count,
122
to_messages_file=self._to_messages_file,
124
self._stack.append(new_bar)
127
def return_pb(self, bar):
128
"""Return bar after its been used."""
129
if bar is not self._stack[-1]:
130
raise errors.MissingProgressBarFinish()
134
class _BaseProgressBar(object):
143
to_messages_file=None,
145
object.__init__(self)
148
if to_messages_file is None:
149
to_messages_file = sys.stdout
150
self.to_file = to_file
151
self.to_messages_file = to_messages_file
154
self.last_total = None
155
self.show_pct = show_pct
156
self.show_spinner = show_spinner
157
self.show_eta = show_eta
158
self.show_bar = show_bar
159
self.show_count = show_count
162
self.MIN_PAUSE = 0.1 # seconds
165
self.start_time = now
166
# next update should not throttle
167
self.last_update = now - self.MIN_PAUSE - 1
170
"""Return this bar to its progress stack."""
172
assert self._stack is not None
173
self._stack.return_pb(self)
175
def note(self, fmt_string, *args, **kwargs):
176
"""Record a note without disrupting the progress bar."""
178
self.to_messages_file.write(fmt_string % args)
179
self.to_messages_file.write('\n')
181
def child_progress(self, **kwargs):
182
return ChildProgress(**kwargs)
185
class DummyProgress(_BaseProgressBar):
186
"""Progress-bar standin that does nothing.
188
This can be used as the default argument for methods that
189
take an optional progress indicator."""
193
def update(self, msg=None, current=None, total=None):
196
def child_update(self, message, current, total):
202
def note(self, fmt_string, *args, **kwargs):
203
"""See _BaseProgressBar.note()."""
205
def child_progress(self, **kwargs):
206
return DummyProgress(**kwargs)
209
class DotsProgressBar(_BaseProgressBar):
211
def __init__(self, **kwargs):
212
_BaseProgressBar.__init__(self, **kwargs)
219
def update(self, msg=None, current_cnt=None, total_cnt=None):
220
if msg and msg != self.last_msg:
222
self.to_file.write('\n')
223
self.to_file.write(msg + ': ')
226
self.to_file.write('.')
230
self.to_file.write('\n')
233
def child_update(self, message, current, total):
237
class TTYProgressBar(_BaseProgressBar):
74
class ProgressBar(object):
238
75
"""Progress bar display object.
240
77
Several options are available to control the display. These can
255
92
The output file should be in line-buffered or unbuffered mode.
257
94
SPIN_CHARS = r'/-\|'
260
def __init__(self, **kwargs):
261
from bzrlib.osutils import terminal_width
262
_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)
263
110
self.spin_pos = 0
264
self.width = terminal_width()
265
self.start_time = None
266
self.last_updates = deque()
267
self.child_fraction = 0
271
"""Return True if the bar was updated too recently"""
272
# time.time consistently takes 40/4000 ms = 0.01 ms.
273
# but every single update to the pb invokes it.
274
# so we use time.clock which takes 20/4000 ms = 0.005ms
275
# on the downside, time.clock() appears to have approximately
276
# 10ms granularity, so we treat a zero-time change as 'throttled.'
279
interval = now - self.last_update
281
if interval < self.MIN_PAUSE:
284
self.last_updates.append(now - self.last_update)
285
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
289
self.update(self.last_msg, self.last_cnt, self.last_total,
292
def child_update(self, message, current, total):
293
if current is not None and total != 0:
294
child_fraction = float(current) / total
295
if self.last_cnt is None:
297
elif self.last_cnt + child_fraction <= self.last_total:
298
self.child_fraction = child_fraction
300
mutter('not updating child fraction')
301
if self.last_msg is None:
305
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):
307
128
"""Update and redraw progress bar."""
311
if total_cnt is None:
312
total_cnt = self.last_total
317
if current_cnt > total_cnt:
318
total_cnt = current_cnt
320
## # optional corner case optimisation
321
## # currently does not seem to fire so costs more than saved.
322
## # trivial optimal case:
323
## # NB if callers are doing a clear and restore with
324
## # the saved values, this will prevent that:
325
## # in that case add a restore method that calls
326
## # _do_update or some such
327
## if (self.last_msg == msg and
328
## self.last_cnt == current_cnt and
329
## self.last_total == total_cnt and
330
## self.child_fraction == child_fraction):
333
old_msg = self.last_msg
334
132
# save these for the tick() function
335
133
self.last_msg = msg
336
134
self.last_cnt = current_cnt
337
135
self.last_total = total_cnt
338
self.child_fraction = child_fraction
340
# each function call takes 20ms/4000 = 0.005 ms,
341
# but multiple that by 4000 calls -> starts to cost.
342
# so anything to make this function call faster
343
# will improve base 'diff' time by up to 0.1 seconds.
344
if old_msg == self.last_msg and self.throttle():
347
if self.show_eta and self.start_time and self.last_total:
348
eta = get_eta(self.start_time, self.last_cnt + self.child_fraction,
349
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)
350
156
eta_str = " " + str_tdelta(eta)
359
165
# always update this; it's also used for the bar
360
166
self.spin_pos += 1
362
if self.show_pct and self.last_total and self.last_cnt:
363
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
364
170
pct_str = ' (%5.1f%%)' % pct
368
174
if not self.show_count:
370
elif self.last_cnt is None:
176
elif current_cnt is None:
372
elif self.last_total is None:
373
count_str = ' %i' % (self.last_cnt)
178
elif total_cnt is None:
179
count_str = ' %i' % (current_cnt)
375
181
# make both fields the same size
376
t = '%i' % (self.last_total)
377
c = '%*i' % (len(t), self.last_cnt)
182
t = '%i' % (total_cnt)
183
c = '%*i' % (len(t), current_cnt)
378
184
count_str = ' ' + c + '/' + t
380
186
if self.show_bar:
381
187
# progress bar, if present, soaks up all remaining space
382
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) \
383
189
- len(eta_str) - len(count_str) - 3
386
192
# number of markers highlighted in bar
387
markers = int(round(float(cols) *
388
(self.last_cnt + self.child_fraction) / self.last_total))
193
markers = int(round(float(cols) * current_cnt / total_cnt))
389
194
bar_str = '[' + ('=' * markers).ljust(cols) + '] '
391
196
# don't know total, so can't show completion.
402
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
404
assert len(m) < self.width
405
self.to_file.write('\r' + m.ljust(self.width - 1))
209
assert len(m) < width
210
self.to_file.write('\r' + m.ljust(width - 1))
406
211
#self.to_file.flush()
409
self.to_file.write('\r%s\r' % (' ' * (self.width - 1)))
218
self.to_file.write('\r%s\r' % (' ' * (_width() - 1)))
410
219
#self.to_file.flush()
413
class ChildProgress(_BaseProgressBar):
414
"""A progress indicator that pushes its data to the parent"""
416
def __init__(self, _stack, **kwargs):
417
_BaseProgressBar.__init__(self, _stack=_stack, **kwargs)
418
self.parent = _stack.top()
421
self.child_fraction = 0
424
def update(self, msg, current_cnt=None, total_cnt=None):
425
self.current = current_cnt
426
self.total = total_cnt
428
self.child_fraction = 0
431
def child_update(self, message, current, total):
432
if current is None or total == 0:
433
self.child_fraction = 0
435
self.child_fraction = float(current) / total
439
if self.current is None:
442
count = self.current+self.child_fraction
443
if count > self.total:
445
mutter('clamping count of %d to %d' % (count, self.total))
447
self.parent.child_update(self.message, count, self.total)
452
def note(self, *args, **kwargs):
453
self.parent.note(*args, **kwargs)
456
223
def str_tdelta(delt):
485
252
assert total_duration >= elapsed
487
if last_updates and len(last_updates) >= n_recent:
488
while len(last_updates) > n_recent:
489
last_updates.popleft()
490
avg = sum(last_updates) / float(len(last_updates))
491
time_left = avg * (total - current)
493
old_time_left = total_duration - elapsed
495
# We could return the average, or some other value here
496
return (time_left + old_time_left) / 2
498
254
return total_duration - elapsed
501
class ProgressPhase(object):
502
"""Update progress object with the current phase"""
503
def __init__(self, message, total, pb):
504
object.__init__(self)
506
self.message = message
508
self.cur_phase = None
510
def next_phase(self):
511
if self.cur_phase is None:
515
assert self.cur_phase < self.total
516
self.pb.update(self.message, self.cur_phase, self.total)
521
259
result = doctest.testmod()
added
removed
bzrlib/progress.py
