44
48
"""Create a TextUIFactory.
46
:param bar_type: The type of progress bar to create. It defaults to
50
:param bar_type: The type of progress bar to create. It defaults to
47
51
letting the bzrlib.progress.ProgressBar factory auto
50
super(TextUIFactory, self).__init__()
51
self._bar_type = bar_type
53
self.stdout = sys.stdout
57
self.stderr = sys.stderr
61
def prompt(self, prompt):
62
"""Emit prompt on the CLI."""
63
self.stdout.write(prompt)
65
def nested_progress_bar(self):
66
"""Return a nested progress bar.
68
The actual bar type returned depends on the progress module which
69
may return a tty or dots bar depending on the terminal.
71
if self._progress_bar_stack is None:
72
self._progress_bar_stack = progress.ProgressBarStack(
74
return self._progress_bar_stack.get_nested()
54
super(TextUIFactory, self).__init__(stdin=stdin,
55
stdout=stdout, stderr=stderr)
57
symbol_versioning.warn(symbol_versioning.deprecated_in((1, 11, 0))
58
% "bar_type parameter")
59
# paints progress, network activity, etc
60
self._progress_view = self._make_progress_view()
76
62
def clear_term(self):
77
63
"""Prepare the terminal for output.
79
65
This will, clear any progress bars, and leave the cursor at the
80
66
leftmost position."""
81
if self._progress_bar_stack is None:
67
# XXX: If this is preparing to write to stdout, but that's for example
68
# directed into a file rather than to the terminal, and the progress
69
# bar _is_ going to the terminal, we shouldn't need
70
# to clear it. We might need to separately check for the case of
71
self._progress_view.clear()
73
def _make_progress_view(self):
74
if os.environ.get('BZR_PROGRESS_BAR') in ('text', None, ''):
75
return TextProgressView(self.stderr)
77
return NullProgressView()
80
"""Write an already-formatted message, clearing the progress bar if necessary."""
82
self.stdout.write(msg + '\n')
84
def report_transport_activity(self, transport, byte_count, direction):
85
"""Called by transports as they do IO.
87
This may update a progress bar, spinner, or similar display.
88
By default it does nothing.
90
self._progress_view.show_transport_activity(transport,
91
direction, byte_count)
93
def _progress_updated(self, task):
94
"""A task has been updated and wants to be displayed.
96
if not self._task_stack:
97
warnings.warn("%r updated but no tasks are active" %
99
elif task != self._task_stack[-1]:
100
warnings.warn("%r is not the top progress task %r" %
101
(task, self._task_stack[-1]))
102
self._progress_view.show_progress(task)
104
def _progress_all_finished(self):
105
self._progress_view.clear()
108
class NullProgressView(object):
109
"""Soak up and ignore progress information."""
114
def show_progress(self, task):
117
def show_transport_activity(self, transport, direction, byte_count):
121
class TextProgressView(object):
122
"""Display of progress bar and other information on a tty.
124
This shows one line of text, including possibly a network indicator, spinner,
125
progress bar, message, etc.
127
One instance of this is created and held by the UI, and fed updates when a
128
task wants to be painted.
130
Transports feed data to this through the ui_factory object.
132
The Progress views can comprise a tree with _parent_task pointers, but
133
this only prints the stack from the nominated current task up to the root.
136
def __init__(self, term_file):
137
self._term_file = term_file
138
# true when there's output on the screen we may need to clear
139
self._have_output = False
140
# XXX: We could listen for SIGWINCH and update the terminal width...
141
self._width = osutils.terminal_width()
142
self._last_transport_msg = ''
144
# time we last repainted the screen
145
self._last_repaint = 0
146
# time we last got information about transport activity
147
self._transport_update_time = 0
148
self._last_task = None
149
self._total_byte_count = 0
150
self._bytes_since_update = 0
152
def _show_line(self, s):
154
self._term_file.write('\r%-*.*s\r' % (n, n, s))
157
if self._have_output:
159
self._have_output = False
161
def _render_bar(self):
162
# return a string for the progress bar itself
163
if (self._last_task is None) or self._last_task.show_bar:
164
# If there's no task object, we show space for the bar anyhow.
165
# That's because most invocations of bzr will end showing progress
166
# at some point, though perhaps only after doing some initial IO.
167
# It looks better to draw the progress bar initially rather than
168
# to have what looks like an incomplete progress bar.
169
spin_str = r'/-\|'[self._spin_pos % 4]
172
if self._last_task is None:
173
completion_fraction = 0
175
completion_fraction = \
176
self._last_task._overall_completion_fraction() or 0
177
markers = int(round(float(cols) * completion_fraction)) - 1
178
bar_str = '[' + ('#' * markers + spin_str).ljust(cols) + '] '
180
elif self._last_task.show_spinner:
181
# The last task wanted just a spinner, no bar
182
spin_str = r'/-\|'[self._spin_pos % 4]
184
return spin_str + ' '
188
def _format_task(self, task):
189
if not task.show_count:
191
elif task.current_cnt is not None and task.total_cnt is not None:
192
s = ' %d/%d' % (task.current_cnt, task.total_cnt)
193
elif task.current_cnt is not None:
194
s = ' %d' % (task.current_cnt)
197
# compose all the parent messages
200
while t._parent_task:
206
def _render_line(self):
207
bar_string = self._render_bar()
209
task_msg = self._format_task(self._last_task)
212
trans = self._last_transport_msg
215
return (bar_string + trans + task_msg)
218
s = self._render_line()
220
self._have_output = True
222
def show_progress(self, task):
223
"""Called by the task object when it has changed.
225
:param task: The top task object; its parents are also included
228
must_update = task is not self._last_task
229
self._last_task = task
231
if (not must_update) and (now < self._last_repaint + 0.1):
83
overall_pb = self._progress_bar_stack.bottom()
84
if overall_pb is not None:
233
if now > self._transport_update_time + 10:
234
# no recent activity; expire it
235
self._last_transport_msg = ''
236
self._last_repaint = now
239
def show_transport_activity(self, transport, direction, byte_count):
240
"""Called by transports via the ui_factory, as they do IO.
242
This may update a progress bar, spinner, or similar display.
243
By default it does nothing.
245
# XXX: Probably there should be a transport activity model, and that
246
# too should be seen by the progress view, rather than being poked in
248
self._total_byte_count += byte_count
249
self._bytes_since_update += byte_count
251
if self._transport_update_time is None:
252
self._transport_update_time = now
253
elif now >= (self._transport_update_time + 0.5):
254
# guard against clock stepping backwards, and don't update too
256
rate = self._bytes_since_update / (now - self._transport_update_time)
257
scheme = getattr(transport, '_scheme', None) or repr(transport)
258
if direction == 'read':
260
elif direction == 'write':
264
msg = ("%.7s %s %6dKB %5dKB/s" %
265
(scheme, dir_char, self._total_byte_count>>10, int(rate)>>10,))
266
self._transport_update_time = now
267
self._last_repaint = now
268
self._bytes_since_update = 0
269
self._last_transport_msg = msg
added
removed
bzrlib/ui/text.py
