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=sys.stderr, **kwargs):
62
"""Abstract factory"""
63
if _supports_progress(to_file):
64
return TTYProgressBar(to_file=to_file, **kwargs)
66
return DotsProgressBar(to_file=to_file, **kwargs)
69
class ProgressBarStack(object):
70
"""A stack of progress bars."""
79
to_messages_file=sys.stdout,
81
"""Setup the stack with the parameters the progress bars should have."""
82
self._to_file = to_file
83
self._show_pct = show_pct
84
self._show_spinner = show_spinner
85
self._show_eta = show_eta
86
self._show_bar = show_bar
87
self._show_count = show_count
88
self._to_messages_file = to_messages_file
90
self._klass = klass or TTYProgressBar
93
if len(self._stack) != 0:
94
return self._stack[-1]
99
if len(self._stack) != 0:
100
return self._stack[0]
104
def get_nested(self):
105
"""Return a nested progress bar."""
106
if len(self._stack) == 0:
109
func = self.top().child_progress
110
new_bar = func(to_file=self._to_file,
111
show_pct=self._show_pct,
112
show_spinner=self._show_spinner,
113
show_eta=self._show_eta,
114
show_bar=self._show_bar,
115
show_count=self._show_count,
116
to_messages_file=self._to_messages_file,
118
self._stack.append(new_bar)
121
def return_pb(self, bar):
122
"""Return bar after its been used."""
123
if bar is not self._stack[-1]:
124
raise errors.MissingProgressBarFinish()
128
class _BaseProgressBar(object):
137
to_messages_file=sys.stdout,
139
object.__init__(self)
140
self.to_file = to_file
141
self.to_messages_file = to_messages_file
144
self.last_total = None
145
self.show_pct = show_pct
146
self.show_spinner = show_spinner
147
self.show_eta = show_eta
148
self.show_bar = show_bar
149
self.show_count = show_count
152
self.MIN_PAUSE = 0.1 # seconds
155
self.start_time = now
156
# next update should not throttle
157
self.last_update = now - self.MIN_PAUSE - 1
160
"""Return this bar to its progress stack."""
162
assert self._stack is not None
163
self._stack.return_pb(self)
165
def note(self, fmt_string, *args, **kwargs):
166
"""Record a note without disrupting the progress bar."""
168
self.to_messages_file.write(fmt_string % args)
169
self.to_messages_file.write('\n')
171
def child_progress(self, **kwargs):
172
return ChildProgress(**kwargs)
175
class DummyProgress(_BaseProgressBar):
176
"""Progress-bar standin that does nothing.
178
This can be used as the default argument for methods that
179
take an optional progress indicator."""
183
def update(self, msg=None, current=None, total=None):
186
def child_update(self, message, current, total):
192
def note(self, fmt_string, *args, **kwargs):
193
"""See _BaseProgressBar.note()."""
195
def child_progress(self, **kwargs):
196
return DummyProgress(**kwargs)
198
class DotsProgressBar(_BaseProgressBar):
200
def __init__(self, **kwargs):
201
_BaseProgressBar.__init__(self, **kwargs)
208
def update(self, msg=None, current_cnt=None, total_cnt=None):
209
if msg and msg != self.last_msg:
211
self.to_file.write('\n')
213
self.to_file.write(msg + ': ')
216
self.to_file.write('.')
220
self.to_file.write('\n')
222
def child_update(self, message, current, total):
225
class TTYProgressBar(_BaseProgressBar):
74
class ProgressBar(object):
226
75
"""Progress bar display object.
228
77
Several options are available to control the display. These can
243
92
The output file should be in line-buffered or unbuffered mode.
245
94
SPIN_CHARS = r'/-\|'
248
def __init__(self, **kwargs):
249
from bzrlib.osutils import terminal_width
250
_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)
251
110
self.spin_pos = 0
252
self.width = terminal_width()
253
self.start_time = None
254
self.last_updates = deque()
255
self.child_fraction = 0
259
"""Return True if the bar was updated too recently"""
260
# time.time consistently takes 40/4000 ms = 0.01 ms.
261
# but every single update to the pb invokes it.
262
# so we use time.clock which takes 20/4000 ms = 0.005ms
263
# on the downside, time.clock() appears to have approximately
264
# 10ms granularity, so we treat a zero-time change as 'throttled.'
267
interval = now - self.last_update
269
if interval < self.MIN_PAUSE:
272
self.last_updates.append(now - self.last_update)
273
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
278
self.update(self.last_msg, self.last_cnt, self.last_total,
281
def child_update(self, message, current, total):
282
if current is not None and total != 0:
283
child_fraction = float(current) / total
284
if self.last_cnt is None:
286
elif self.last_cnt + child_fraction <= self.last_total:
287
self.child_fraction = child_fraction
289
mutter('not updating child fraction')
290
if self.last_msg is None:
295
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):
297
128
"""Update and redraw progress bar."""
302
if current_cnt > total_cnt:
303
total_cnt = current_cnt
305
## # optional corner case optimisation
306
## # currently does not seem to fire so costs more than saved.
307
## # trivial optimal case:
308
## # NB if callers are doing a clear and restore with
309
## # the saved values, this will prevent that:
310
## # in that case add a restore method that calls
311
## # _do_update or some such
312
## if (self.last_msg == msg and
313
## self.last_cnt == current_cnt and
314
## self.last_total == total_cnt and
315
## self.child_fraction == child_fraction):
318
old_msg = self.last_msg
319
132
# save these for the tick() function
320
133
self.last_msg = msg
321
134
self.last_cnt = current_cnt
322
135
self.last_total = total_cnt
323
self.child_fraction = child_fraction
325
# each function call takes 20ms/4000 = 0.005 ms,
326
# but multiple that by 4000 calls -> starts to cost.
327
# so anything to make this function call faster
328
# will improve base 'diff' time by up to 0.1 seconds.
329
if old_msg == self.last_msg and self.throttle():
332
if self.show_eta and self.start_time and self.last_total:
333
eta = get_eta(self.start_time, self.last_cnt + self.child_fraction,
334
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)
335
156
eta_str = " " + str_tdelta(eta)
344
165
# always update this; it's also used for the bar
345
166
self.spin_pos += 1
347
if self.show_pct and self.last_total and self.last_cnt:
348
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
349
170
pct_str = ' (%5.1f%%)' % pct
353
174
if not self.show_count:
355
elif self.last_cnt is None:
176
elif current_cnt is None:
357
elif self.last_total is None:
358
count_str = ' %i' % (self.last_cnt)
178
elif total_cnt is None:
179
count_str = ' %i' % (current_cnt)
360
181
# make both fields the same size
361
t = '%i' % (self.last_total)
362
c = '%*i' % (len(t), self.last_cnt)
182
t = '%i' % (total_cnt)
183
c = '%*i' % (len(t), current_cnt)
363
184
count_str = ' ' + c + '/' + t
365
186
if self.show_bar:
366
187
# progress bar, if present, soaks up all remaining space
367
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) \
368
189
- len(eta_str) - len(count_str) - 3
371
192
# number of markers highlighted in bar
372
markers = int(round(float(cols) *
373
(self.last_cnt + self.child_fraction) / self.last_total))
193
markers = int(round(float(cols) * current_cnt / total_cnt))
374
194
bar_str = '[' + ('=' * markers).ljust(cols) + '] '
376
196
# don't know total, so can't show completion.
387
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
389
assert len(m) < self.width
390
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))
391
211
#self.to_file.flush()
394
self.to_file.write('\r%s\r' % (' ' * (self.width - 1)))
218
self.to_file.write('\r%s\r' % (' ' * (_width() - 1)))
395
219
#self.to_file.flush()
398
class ChildProgress(_BaseProgressBar):
399
"""A progress indicator that pushes its data to the parent"""
400
def __init__(self, _stack, **kwargs):
401
_BaseProgressBar.__init__(self, _stack=_stack, **kwargs)
402
self.parent = _stack.top()
405
self.child_fraction = 0
408
def update(self, msg, current_cnt=None, total_cnt=None):
409
self.current = current_cnt
410
self.total = total_cnt
412
self.child_fraction = 0
415
def child_update(self, message, current, total):
416
if current is None or total == 0:
417
self.child_fraction = 0
419
self.child_fraction = float(current) / total
423
if self.current is None:
426
count = self.current+self.child_fraction
427
if count > self.total:
429
mutter('clamping count of %d to %d' % (count, self.total))
431
self.parent.child_update(self.message, count, self.total)
436
def note(self, *args, **kwargs):
437
self.parent.note(*args, **kwargs)
440
223
def str_tdelta(delt):
469
252
assert total_duration >= elapsed
471
if last_updates and len(last_updates) >= n_recent:
472
while len(last_updates) > n_recent:
473
last_updates.popleft()
474
avg = sum(last_updates) / float(len(last_updates))
475
time_left = avg * (total - current)
477
old_time_left = total_duration - elapsed
479
# We could return the average, or some other value here
480
return (time_left + old_time_left) / 2
482
254
return total_duration - elapsed
485
class ProgressPhase(object):
486
"""Update progress object with the current phase"""
487
def __init__(self, message, total, pb):
488
object.__init__(self)
490
self.message = message
492
self.cur_phase = None
494
def next_phase(self):
495
if self.cur_phase is None:
499
assert self.cur_phase < self.total
500
self.pb.update(self.message, self.cur_phase, self.total)
505
259
result = doctest.testmod()
added
removed
bzrlib/progress.py
