14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
17
"""Progress indicators.
20
19
The usual way to use this is via bzrlib.ui.ui_factory.nested_progress_bar which
21
20
will manage a conceptual stack of nested activities.
23
from __future__ import absolute_import
37
from bzrlib.trace import mutter
38
from bzrlib.symbol_versioning import (
45
# XXX: deprecated; can be removed when the ProgressBar factory is removed
46
29
def _supports_progress(f):
47
"""Detect if we can use pretty progress bars on the output stream f.
30
"""Detect if we can use pretty progress bars on file F.
49
32
If this returns true we expect that a human may be looking at that
50
33
output, and that we can repaint a line to update it.
35
This doesn't check the policy for whether we *should* use them.
52
37
isatty = getattr(f, 'isatty', None)
42
# The following case also handles Win32 - on that platform $TERM is
43
# typically never set, so the case None is treated as a smart terminal,
44
# not dumb. <https://bugs.launchpad.net/bugs/334808> win32 files do have
45
# isatty methods that return true.
57
46
if os.environ.get('TERM') == 'dumb':
58
47
# e.g. emacs compile window
129
145
own_fraction = 0.0
130
146
return self._parent_task._overall_completion_fraction(own_fraction)
132
def note(self, fmt_string, *args):
133
"""Record a note without disrupting the progress bar."""
134
# XXX: shouldn't be here; put it in mutter or the ui instead
136
self.ui_factory.note(fmt_string % args)
138
self.ui_factory.note(fmt_string)
141
# XXX: shouldn't be here; put it in mutter or the ui instead
142
self.ui_factory.clear_term()
145
@deprecated_function(deprecated_in((1, 16, 0)))
146
def ProgressBar(to_file=None, **kwargs):
147
"""Abstract factory"""
150
requested_bar_type = os.environ.get('BZR_PROGRESS_BAR')
151
# An value of '' or not set reverts to standard processing
152
if requested_bar_type in (None, ''):
153
if _supports_progress(to_file):
154
return TTYProgressBar(to_file=to_file, **kwargs)
149
# TODO: deprecate this method; the model object shouldn't be concerned
150
# with whether it's shown or not. Most callers use this because they
151
# want to write some different non-progress output to the screen, but
152
# they should probably instead use a stream that's synchronized with
153
# the progress output. It may be there is a model-level use for
154
# saying "this task's not active at the moment" but I don't see it. --
156
if self.progress_view:
157
self.progress_view.clear()
156
return DummyProgress(to_file=to_file, **kwargs)
158
# Minor sanitation to prevent spurious errors
159
requested_bar_type = requested_bar_type.lower().strip()
160
# TODO: jam 20060710 Arguably we shouldn't raise an exception
161
# but should instead just disable progress bars if we
162
# don't recognize the type
163
if requested_bar_type not in _progress_bar_types:
164
raise errors.InvalidProgressBarType(requested_bar_type,
165
_progress_bar_types.keys())
166
return _progress_bar_types[requested_bar_type](to_file=to_file, **kwargs)
169
class _BaseProgressBar(object):
178
to_messages_file=None,
180
object.__init__(self)
183
if to_messages_file is None:
184
to_messages_file = sys.stdout
185
self.to_file = to_file
186
self.to_messages_file = to_messages_file
189
self.last_total = None
190
self.show_pct = show_pct
191
self.show_spinner = show_spinner
192
self.show_eta = show_eta
193
self.show_bar = show_bar
194
self.show_count = show_count
197
self.MIN_PAUSE = 0.1 # seconds
200
self.start_time = now
201
# next update should not throttle
202
self.last_update = now - self.MIN_PAUSE - 1
205
"""Return this bar to its progress stack."""
207
self._stack.return_pb(self)
209
def note(self, fmt_string, *args, **kwargs):
210
"""Record a note without disrupting the progress bar."""
212
self.to_messages_file.write(fmt_string % args)
213
self.to_messages_file.write('\n')
215
@deprecated_function(deprecated_in((1, 16, 0)))
216
def child_progress(self, **kwargs):
217
return ChildProgress(**kwargs)
220
class DummyProgress(_BaseProgressBar):
159
self.ui_factory.clear_term()
162
class DummyProgress(object):
221
163
"""Progress-bar standin that does nothing.
223
This can be used as the default argument for methods that
224
take an optional progress indicator."""
165
This was previously often constructed by application code if no progress
166
bar was explicitly passed in. That's no longer recommended: instead, just
167
create a progress task from the ui_factory. This class can be used in
168
test code that needs to fake a progress task for some reason.
238
def note(self, fmt_string, *args, **kwargs):
239
"""See _BaseProgressBar.note()."""
241
183
def child_progress(self, **kwargs):
242
184
return DummyProgress(**kwargs)
245
class DotsProgressBar(_BaseProgressBar):
247
@deprecated_function(deprecated_in((1, 16, 0)))
248
def __init__(self, **kwargs):
249
_BaseProgressBar.__init__(self, **kwargs)
256
def update(self, msg=None, current_cnt=None, total_cnt=None):
257
if msg and msg != self.last_msg:
259
self.to_file.write('\n')
260
self.to_file.write(msg + ': ')
263
self.to_file.write('.')
267
self.to_file.write('\n')
270
def child_update(self, message, current, total):
274
class TTYProgressBar(_BaseProgressBar):
275
"""Progress bar display object.
277
Several options are available to control the display. These can
278
be passed as parameters to the constructor or assigned at any time:
281
Show percentage complete.
283
Show rotating baton. This ticks over on every update even
284
if the values don't change.
286
Show predicted time-to-completion.
290
Show numerical counts.
292
The output file should be in line-buffered or unbuffered mode.
296
@deprecated_function(deprecated_in((1, 16, 0)))
297
def __init__(self, **kwargs):
298
from bzrlib.osutils import terminal_width
299
_BaseProgressBar.__init__(self, **kwargs)
301
self.width = terminal_width()
302
self.last_updates = []
303
self._max_last_updates = 10
304
self.child_fraction = 0
305
self._have_output = False
307
def throttle(self, old_msg):
308
"""Return True if the bar was updated too recently"""
309
# time.time consistently takes 40/4000 ms = 0.01 ms.
310
# time.clock() is faster, but gives us CPU time, not wall-clock time
312
if self.start_time is not None and (now - self.start_time) < 1:
314
if old_msg != self.last_msg:
316
interval = now - self.last_update
318
if interval < self.MIN_PAUSE:
321
self.last_updates.append(now - self.last_update)
322
# Don't let the queue grow without bound
323
self.last_updates = self.last_updates[-self._max_last_updates:]
324
self.last_update = now
328
self.update(self.last_msg, self.last_cnt, self.last_total,
331
def child_update(self, message, current, total):
332
if current is not None and total != 0:
333
child_fraction = float(current) / total
334
if self.last_cnt is None:
336
elif self.last_cnt + child_fraction <= self.last_total:
337
self.child_fraction = child_fraction
338
if self.last_msg is None:
342
def update(self, msg, current_cnt=None, total_cnt=None,
344
"""Update and redraw progress bar.
349
if total_cnt is None:
350
total_cnt = self.last_total
355
if current_cnt > total_cnt:
356
total_cnt = current_cnt
358
## # optional corner case optimisation
359
## # currently does not seem to fire so costs more than saved.
360
## # trivial optimal case:
361
## # NB if callers are doing a clear and restore with
362
## # the saved values, this will prevent that:
363
## # in that case add a restore method that calls
364
## # _do_update or some such
365
## if (self.last_msg == msg and
366
## self.last_cnt == current_cnt and
367
## self.last_total == total_cnt and
368
## self.child_fraction == child_fraction):
374
old_msg = self.last_msg
375
# save these for the tick() function
377
self.last_cnt = current_cnt
378
self.last_total = total_cnt
379
self.child_fraction = child_fraction
381
# each function call takes 20ms/4000 = 0.005 ms,
382
# but multiple that by 4000 calls -> starts to cost.
383
# so anything to make this function call faster
384
# will improve base 'diff' time by up to 0.1 seconds.
385
if self.throttle(old_msg):
388
if self.show_eta and self.start_time and self.last_total:
389
eta = get_eta(self.start_time, self.last_cnt + self.child_fraction,
390
self.last_total, last_updates = self.last_updates)
391
eta_str = " " + str_tdelta(eta)
395
if self.show_spinner:
396
spin_str = self.SPIN_CHARS[self.spin_pos % 4] + ' '
400
# always update this; it's also used for the bar
403
if self.show_pct and self.last_total and self.last_cnt:
404
pct = 100.0 * ((self.last_cnt + self.child_fraction) / self.last_total)
405
pct_str = ' (%5.1f%%)' % pct
409
if not self.show_count:
411
elif self.last_cnt is None:
413
elif self.last_total is None:
414
count_str = ' %i' % (self.last_cnt)
416
# make both fields the same size
417
t = '%i' % (self.last_total)
418
c = '%*i' % (len(t), self.last_cnt)
419
count_str = ' ' + c + '/' + t
422
# progress bar, if present, soaks up all remaining space
423
cols = self.width - 1 - len(self.last_msg) - len(spin_str) - len(pct_str) \
424
- len(eta_str) - len(count_str) - 3
427
# number of markers highlighted in bar
428
markers = int(round(float(cols) *
429
(self.last_cnt + self.child_fraction) / self.last_total))
430
bar_str = '[' + ('=' * markers).ljust(cols) + '] '
432
# don't know total, so can't show completion.
433
# so just show an expanded spinning thingy
434
m = self.spin_pos % cols
435
ms = (' ' * m + '*').ljust(cols)
437
bar_str = '[' + ms + '] '
443
m = spin_str + bar_str + self.last_msg + count_str \
445
self.to_file.write('\r%-*.*s' % (self.width - 1, self.width - 1, m))
446
self._have_output = True
447
#self.to_file.flush()
450
if self._have_output:
451
self.to_file.write('\r%s\r' % (' ' * (self.width - 1)))
452
self._have_output = False
453
#self.to_file.flush()
456
class ChildProgress(_BaseProgressBar):
457
"""A progress indicator that pushes its data to the parent"""
459
@deprecated_function(deprecated_in((1, 16, 0)))
460
def __init__(self, _stack, **kwargs):
461
_BaseProgressBar.__init__(self, _stack=_stack, **kwargs)
462
self.parent = _stack.top()
465
self.child_fraction = 0
468
def update(self, msg, current_cnt=None, total_cnt=None):
469
self.current = current_cnt
470
if total_cnt is not None:
471
self.total = total_cnt
473
self.child_fraction = 0
476
def child_update(self, message, current, total):
477
if current is None or total == 0:
478
self.child_fraction = 0
480
self.child_fraction = float(current) / total
484
if self.current is None:
487
count = self.current+self.child_fraction
488
if count > self.total:
490
mutter('clamping count of %d to %d' % (count, self.total))
492
self.parent.child_update(self.message, count, self.total)
497
def note(self, *args, **kwargs):
498
self.parent.note(*args, **kwargs)
501
187
def str_tdelta(delt):
added
removed
bzrlib/progress.py
