1
1
# Copyright (C) 2005 Aaron Bentley <aaron.bentley@utoronto.ca>
2
# Copyright (C) 2005 Canonical <canonical.com>
2
# Copyright (C) 2005, 2006 Canonical <canonical.com>
4
4
# This program is free software; you can redistribute it and/or modify
5
5
# it under the terms of the GNU General Public License as published by
45
"""Return estimated terminal width.
47
TODO: Do something smart on Windows?
49
TODO: Is there anything that gets a better update when the window
50
is resized while the program is running?
53
return int(os.environ['COLUMNS'])
54
except (IndexError, KeyError, ValueError):
42
from collections import deque
45
import bzrlib.errors as errors
46
from bzrlib.trace import mutter
58
49
def _supports_progress(f):
75
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
"""Return a nested progress bar."""
100
if len(self._stack) == 0:
103
func = self.top().child_progress
104
new_bar = func(to_file=self._to_file,
105
show_pct=self._show_pct,
106
show_spinner=self._show_spinner,
107
show_eta=self._show_eta,
108
show_bar=self._show_bar,
109
show_count=self._show_count,
110
to_messages_file=self._to_messages_file,
112
self._stack.append(new_bar)
115
def return_pb(self, bar):
116
"""Return bar after its been used."""
117
if bar is not self._stack[-1]:
118
raise errors.MissingProgressBarFinish()
78
122
class _BaseProgressBar(object):
79
124
def __init__(self,
80
125
to_file=sys.stderr,
82
127
show_spinner=False,
131
to_messages_file=sys.stdout,
86
133
object.__init__(self)
87
134
self.to_file = to_file
135
self.to_messages_file = to_messages_file
89
136
self.last_msg = None
90
137
self.last_cnt = None
91
138
self.last_total = None
94
141
self.show_eta = show_eta
95
142
self.show_bar = show_bar
96
143
self.show_count = show_count
146
self.MIN_PAUSE = 0.1 # seconds
149
self.start_time = now
150
# next update should not throttle
151
self.last_update = now - self.MIN_PAUSE - 1
154
"""Return this bar to its progress stack."""
156
assert self._stack is not None
157
self._stack.return_pb(self)
159
def note(self, fmt_string, *args, **kwargs):
160
"""Record a note without disrupting the progress bar."""
162
self.to_messages_file.write(fmt_string % args)
163
self.to_messages_file.write('\n')
165
def child_progress(self, **kwargs):
166
return ChildProgress(**kwargs)
100
169
class DummyProgress(_BaseProgressBar):
108
177
def update(self, msg=None, current=None, total=None):
180
def child_update(self, message, current, total):
186
def note(self, fmt_string, *args, **kwargs):
187
"""See _BaseProgressBar.note()."""
189
def child_progress(self, **kwargs):
190
return DummyProgress(**kwargs)
115
192
class DotsProgressBar(_BaseProgressBar):
116
194
def __init__(self, **kwargs):
117
195
_BaseProgressBar.__init__(self, **kwargs)
118
196
self.last_msg = None
157
237
The output file should be in line-buffered or unbuffered mode.
159
239
SPIN_CHARS = r'/-\|'
160
MIN_PAUSE = 0.1 # seconds
163
242
def __init__(self, **kwargs):
243
from bzrlib.osutils import terminal_width
164
244
_BaseProgressBar.__init__(self, **kwargs)
165
245
self.spin_pos = 0
166
self.width = _width()
246
self.width = terminal_width()
167
247
self.start_time = None
168
self.last_update = None
248
self.last_updates = deque()
249
self.child_fraction = 0
171
252
def throttle(self):
172
253
"""Return True if the bar was updated too recently"""
174
if self.start_time is None:
175
self.start_time = self.last_update = now
178
interval = now - self.last_update
179
if interval > 0 and interval < self.MIN_PAUSE:
254
# time.time consistently takes 40/4000 ms = 0.01 ms.
255
# but every single update to the pb invokes it.
256
# so we use time.clock which takes 20/4000 ms = 0.005ms
257
# on the downside, time.clock() appears to have approximately
258
# 10ms granularity, so we treat a zero-time change as 'throttled.'
261
interval = now - self.last_update
263
if interval < self.MIN_PAUSE:
266
self.last_updates.append(now - self.last_update)
182
267
self.last_update = now
187
self.update(self.last_msg, self.last_cnt, self.last_total)
191
def update(self, msg, current_cnt=None, total_cnt=None):
272
self.update(self.last_msg, self.last_cnt, self.last_total,
275
def child_update(self, message, current, total):
276
if current is not None and total != 0:
277
child_fraction = float(current) / total
278
if self.last_cnt is None:
280
elif self.last_cnt + child_fraction <= self.last_total:
281
self.child_fraction = child_fraction
283
mutter('not updating child fraction')
284
if self.last_msg is None:
289
def update(self, msg, current_cnt=None, total_cnt=None,
192
291
"""Update and redraw progress bar."""
194
293
if current_cnt < 0:
197
296
if current_cnt > total_cnt:
198
297
total_cnt = current_cnt
299
## # optional corner case optimisation
300
## # currently does not seem to fire so costs more than saved.
301
## # trivial optimal case:
302
## # NB if callers are doing a clear and restore with
303
## # the saved values, this will prevent that:
304
## # in that case add a restore method that calls
305
## # _do_update or some such
306
## if (self.last_msg == msg and
307
## self.last_cnt == current_cnt and
308
## self.last_total == total_cnt and
309
## self.child_fraction == child_fraction):
312
old_msg = self.last_msg
200
313
# save these for the tick() function
201
314
self.last_msg = msg
202
315
self.last_cnt = current_cnt
203
316
self.last_total = total_cnt
208
if self.show_eta and self.start_time and total_cnt:
209
eta = get_eta(self.start_time, current_cnt, total_cnt)
317
self.child_fraction = child_fraction
319
# each function call takes 20ms/4000 = 0.005 ms,
320
# but multiple that by 4000 calls -> starts to cost.
321
# so anything to make this function call faster
322
# will improve base 'diff' time by up to 0.1 seconds.
323
if old_msg == self.last_msg and self.throttle():
326
if self.show_eta and self.start_time and self.last_total:
327
eta = get_eta(self.start_time, self.last_cnt + self.child_fraction,
328
self.last_total, last_updates = self.last_updates)
210
329
eta_str = " " + str_tdelta(eta)
219
338
# always update this; it's also used for the bar
220
339
self.spin_pos += 1
222
if self.show_pct and total_cnt and current_cnt:
223
pct = 100.0 * current_cnt / total_cnt
341
if self.show_pct and self.last_total and self.last_cnt:
342
pct = 100.0 * ((self.last_cnt + self.child_fraction) / self.last_total)
224
343
pct_str = ' (%5.1f%%)' % pct
228
347
if not self.show_count:
230
elif current_cnt is None:
349
elif self.last_cnt is None:
232
elif total_cnt is None:
233
count_str = ' %i' % (current_cnt)
351
elif self.last_total is None:
352
count_str = ' %i' % (self.last_cnt)
235
354
# make both fields the same size
236
t = '%i' % (total_cnt)
237
c = '%*i' % (len(t), current_cnt)
355
t = '%i' % (self.last_total)
356
c = '%*i' % (len(t), self.last_cnt)
238
357
count_str = ' ' + c + '/' + t
240
359
if self.show_bar:
241
360
# progress bar, if present, soaks up all remaining space
242
cols = self.width - 1 - len(msg) - len(spin_str) - len(pct_str) \
361
cols = self.width - 1 - len(self.last_msg) - len(spin_str) - len(pct_str) \
243
362
- len(eta_str) - len(count_str) - 3
246
365
# number of markers highlighted in bar
247
markers = int(round(float(cols) * current_cnt / total_cnt))
366
markers = int(round(float(cols) *
367
(self.last_cnt + self.child_fraction) / self.last_total))
248
368
bar_str = '[' + ('=' * markers).ljust(cols) + '] '
250
370
# don't know total, so can't show completion.
261
m = spin_str + bar_str + msg + count_str + pct_str + eta_str
381
m = spin_str + bar_str + self.last_msg + count_str + pct_str + eta_str
263
383
assert len(m) < self.width
264
384
self.to_file.write('\r' + m.ljust(self.width - 1))
265
385
#self.to_file.flush()
269
388
self.to_file.write('\r%s\r' % (' ' * (self.width - 1)))
270
389
#self.to_file.flush()
392
class ChildProgress(_BaseProgressBar):
393
"""A progress indicator that pushes its data to the parent"""
394
def __init__(self, _stack, **kwargs):
395
_BaseProgressBar.__init__(self, _stack=_stack, **kwargs)
396
self.parent = _stack.top()
399
self.child_fraction = 0
402
def update(self, msg, current_cnt=None, total_cnt=None):
403
self.current = current_cnt
404
self.total = total_cnt
406
self.child_fraction = 0
409
def child_update(self, message, current, total):
410
if current is None or total == 0:
411
self.child_fraction = 0
413
self.child_fraction = float(current) / total
417
if self.current is None:
420
count = self.current+self.child_fraction
421
if count > self.total:
422
mutter('clamping count of %d to %d' % (count, self.total))
424
self.parent.child_update(self.message, count, self.total)
274
430
def str_tdelta(delt):
283
def get_eta(start_time, current, total, enough_samples=3):
439
def get_eta(start_time, current, total, enough_samples=3, last_updates=None, n_recent=10):
284
440
if start_time is None:
303
459
assert total_duration >= elapsed
461
if last_updates and len(last_updates) >= n_recent:
462
while len(last_updates) > n_recent:
463
last_updates.popleft()
464
avg = sum(last_updates) / float(len(last_updates))
465
time_left = avg * (total - current)
467
old_time_left = total_duration - elapsed
469
# We could return the average, or some other value here
470
return (time_left + old_time_left) / 2
305
472
return total_duration - elapsed
475
class ProgressPhase(object):
476
"""Update progress object with the current phase"""
477
def __init__(self, message, total, pb):
478
object.__init__(self)
480
self.message = message
482
self.cur_phase = None
484
def next_phase(self):
485
if self.cur_phase is None:
489
assert self.cur_phase < self.total
490
self.pb.update(self.message, self.cur_phase, self.total)
310
495
result = doctest.testmod()
added
removed
bzrlib/progress.py
