13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
18
"""Text UI, write output to the console.
26
28
from bzrlib.lazy_import import lazy_import
27
29
lazy_import(globals(), """
30
30
from bzrlib import (
38
from bzrlib.ui import CLIUIFactory
41
class TextUIFactory(CLIUIFactory):
40
from bzrlib.ui import (
46
class TextUIFactory(UIFactory):
42
47
"""A UI factory for Text user interefaces."""
49
53
"""Create a TextUIFactory.
51
:param bar_type: The type of progress bar to create. It defaults to
52
letting the bzrlib.progress.ProgressBar factory auto
55
super(TextUIFactory, self).__init__(stdin=stdin,
56
stdout=stdout, stderr=stderr)
58
symbol_versioning.warn(symbol_versioning.deprecated_in((1, 11, 0))
59
% "bar_type parameter")
55
super(TextUIFactory, self).__init__()
56
# TODO: there's no good reason not to pass all three streams, maybe we
57
# should deprecate the default values...
60
61
# paints progress, network activity, etc
61
self._progress_view = TextProgressView(self.stderr)
63
def prompt(self, prompt):
64
"""Emit prompt on the CLI."""
65
self.stdout.write(prompt)
62
self._progress_view = self.make_progress_view()
67
64
def clear_term(self):
68
65
"""Prepare the terminal for output.
72
69
# XXX: If this is preparing to write to stdout, but that's for example
73
70
# directed into a file rather than to the terminal, and the progress
74
71
# bar _is_ going to the terminal, we shouldn't need
75
# to clear it. We might need to separately check for the case of
72
# to clear it. We might need to separately check for the case of
76
73
self._progress_view.clear()
75
def get_boolean(self, prompt):
77
self.prompt(prompt + "? [y/n]: ")
78
line = self.stdin.readline().lower()
79
if line in ('y\n', 'yes\n'):
81
elif line in ('n\n', 'no\n'):
83
elif line in ('', None):
84
# end-of-file; possibly should raise an error here instead
87
def get_integer(self, prompt):
90
line = self.stdin.readline()
96
def get_non_echoed_password(self):
97
isatty = getattr(self.stdin, 'isatty', None)
98
if isatty is not None and isatty():
99
# getpass() ensure the password is not echoed and other
100
# cross-platform niceties
101
password = getpass.getpass('')
103
# echo doesn't make sense without a terminal
104
password = self.stdin.readline()
107
elif password[-1] == '\n':
108
password = password[:-1]
111
def get_password(self, prompt='', **kwargs):
112
"""Prompt the user for a password.
114
:param prompt: The prompt to present the user
115
:param kwargs: Arguments which will be expanded into the prompt.
116
This lets front ends display different things if
118
:return: The password string, return None if the user
119
canceled the request.
122
self.prompt(prompt, **kwargs)
123
# There's currently no way to say 'i decline to enter a password'
124
# as opposed to 'my password is empty' -- does it matter?
125
return self.get_non_echoed_password()
127
def get_username(self, prompt, **kwargs):
128
"""Prompt the user for a username.
130
:param prompt: The prompt to present the user
131
:param kwargs: Arguments which will be expanded into the prompt.
132
This lets front ends display different things if
134
:return: The username string, return None if the user
135
canceled the request.
138
self.prompt(prompt, **kwargs)
139
username = self.stdin.readline()
142
elif username[-1] == '\n':
143
username = username[:-1]
146
def make_progress_view(self):
147
"""Construct and return a new ProgressView subclass for this UI.
149
# if the user specifically requests either text or no progress bars,
150
# always do that. otherwise, guess based on $TERM and tty presence.
151
if os.environ.get('BZR_PROGRESS_BAR') == 'text':
152
return TextProgressView(self.stderr)
153
elif os.environ.get('BZR_PROGRESS_BAR') == 'none':
154
return NullProgressView()
155
elif progress._supports_progress(self.stderr):
156
return TextProgressView(self.stderr)
158
return NullProgressView()
160
def _make_output_stream_explicit(self, encoding, encoding_type):
161
if encoding_type == 'exact':
162
# force sys.stdout to be binary stream on win32;
163
# NB: this leaves the file set in that mode; may cause problems if
164
# one process tries to do binary and then text output
165
if sys.platform == 'win32':
166
fileno = getattr(self.stdout, 'fileno', None)
169
msvcrt.setmode(fileno(), os.O_BINARY)
170
return TextUIOutputStream(self, self.stdout)
172
encoded_stdout = codecs.getwriter(encoding)(self.stdout,
173
errors=encoding_type)
174
# For whatever reason codecs.getwriter() does not advertise its encoding
175
# it just returns the encoding of the wrapped file, which is completely
176
# bogus. So set the attribute, so we can find the correct encoding later.
177
encoded_stdout.encoding = encoding
178
return TextUIOutputStream(self, encoded_stdout)
78
180
def note(self, msg):
79
181
"""Write an already-formatted message, clearing the progress bar if necessary."""
81
183
self.stdout.write(msg + '\n')
185
def prompt(self, prompt, **kwargs):
186
"""Emit prompt on the CLI.
188
:param kwargs: Dictionary of arguments to insert into the prompt,
189
to allow UIs to reformat the prompt.
192
# See <https://launchpad.net/bugs/365891>
193
prompt = prompt % kwargs
194
prompt = prompt.encode(osutils.get_terminal_encoding(), 'replace')
196
self.stderr.write(prompt)
83
198
def report_transport_activity(self, transport, byte_count, direction):
84
199
"""Called by transports as they do IO.
86
201
This may update a progress bar, spinner, or similar display.
87
202
By default it does nothing.
89
self._progress_view.show_transport_activity(byte_count)
204
self._progress_view.show_transport_activity(transport,
205
direction, byte_count)
207
def log_transport_activity(self, display=False):
208
"""See UIFactory.log_transport_activity()"""
209
log = getattr(self._progress_view, 'log_transport_activity', None)
213
def show_error(self, msg):
215
self.stderr.write("bzr: error: %s\n" % msg)
217
def show_message(self, msg):
220
def show_warning(self, msg):
222
self.stderr.write("bzr: warning: %s\n" % msg)
91
224
def _progress_updated(self, task):
92
225
"""A task has been updated and wants to be displayed.
94
if task != self._task_stack[-1]:
227
if not self._task_stack:
228
warnings.warn("%r updated but no tasks are active" %
230
elif task != self._task_stack[-1]:
95
231
warnings.warn("%r is not the top progress task %r" %
96
232
(task, self._task_stack[-1]))
97
233
self._progress_view.show_progress(task)
119
255
self._term_file = term_file
120
256
# true when there's output on the screen we may need to clear
121
257
self._have_output = False
122
# XXX: We could listen for SIGWINCH and update the terminal width...
123
self._width = osutils.terminal_width()
124
258
self._last_transport_msg = ''
125
259
self._spin_pos = 0
126
260
# time we last repainted the screen
127
261
self._last_repaint = 0
128
262
# time we last got information about transport activity
129
263
self._transport_update_time = 0
130
self._task_fraction = None
131
264
self._last_task = None
132
265
self._total_byte_count = 0
133
266
self._bytes_since_update = 0
267
self._bytes_by_direction = {'unknown': 0, 'read': 0, 'write': 0}
268
self._first_byte_time = None
270
# force the progress bar to be off, as at the moment it doesn't
271
# correspond reliably to overall command progress
272
self.enable_bar = False
135
274
def _show_line(self, s):
137
self._term_file.write('\r%-*.*s\r' % (n, n, s))
275
# sys.stderr.write("progress %r\n" % s)
276
width = osutils.terminal_width()
277
if width is not None:
278
# we need one extra space for terminals that wrap on last char
280
s = '%-*.*s' % (width, width, s)
281
self._term_file.write('\r' + s + '\r')
140
284
if self._have_output:
144
288
def _render_bar(self):
145
289
# return a string for the progress bar itself
146
if (self._last_task is not None) and self._last_task.show_bar:
290
if self.enable_bar and (
291
(self._last_task is None) or self._last_task.show_bar):
292
# If there's no task object, we show space for the bar anyhow.
293
# That's because most invocations of bzr will end showing progress
294
# at some point, though perhaps only after doing some initial IO.
295
# It looks better to draw the progress bar initially rather than
296
# to have what looks like an incomplete progress bar.
147
297
spin_str = r'/-\|'[self._spin_pos % 4]
148
298
self._spin_pos += 1
149
f = self._task_fraction or 0
151
# number of markers highlighted in bar
152
markers = int(round(float(cols) * f)) - 1
300
if self._last_task is None:
301
completion_fraction = 0
304
completion_fraction = \
305
self._last_task._overall_completion_fraction() or 0
306
if (completion_fraction < self._fraction and 'progress' in
308
import pdb;pdb.set_trace()
309
self._fraction = completion_fraction
310
markers = int(round(float(cols) * completion_fraction)) - 1
153
311
bar_str = '[' + ('#' * markers + spin_str).ljust(cols) + '] '
155
313
elif (self._last_task is None) or self._last_task.show_spinner:
314
# The last task wanted just a spinner, no bar
156
315
spin_str = r'/-\|'[self._spin_pos % 4]
157
316
self._spin_pos += 1
158
317
return spin_str + ' '
178
336
m = t.msg + ':' + m
339
def _render_line(self):
182
340
bar_string = self._render_bar()
183
341
if self._last_task:
184
342
task_msg = self._format_task(self._last_task)
187
trans = self._last_transport_msg
188
if trans and task_msg:
345
if self._last_task and not self._last_task.show_transport_activity:
348
trans = self._last_transport_msg
351
return (bar_string + trans + task_msg)
354
s = self._render_line()
194
355
self._show_line(s)
195
356
self._have_output = True
197
358
def show_progress(self, task):
359
"""Called by the task object when it has changed.
361
:param task: The top task object; its parents are also included
364
must_update = task is not self._last_task
198
365
self._last_task = task
199
366
now = time.time()
200
if now < self._last_repaint + 0.1:
367
if (not must_update) and (now < self._last_repaint + task.update_latency):
202
if now > self._transport_update_time + 5:
369
if now > self._transport_update_time + 10:
203
370
# no recent activity; expire it
204
371
self._last_transport_msg = ''
205
372
self._last_repaint = now
208
def show_transport_activity(self, byte_count):
209
"""Called by transports as they do IO.
375
def show_transport_activity(self, transport, direction, byte_count):
376
"""Called by transports via the ui_factory, as they do IO.
211
378
This may update a progress bar, spinner, or similar display.
212
379
By default it does nothing.
214
# XXX: Probably there should be a transport activity model, and that
215
# too should be seen by the progress view, rather than being poked in
381
# XXX: there should be a transport activity model, and that too should
382
# be seen by the progress view, rather than being poked in here.
217
383
self._total_byte_count += byte_count
218
384
self._bytes_since_update += byte_count
385
if self._first_byte_time is None:
386
# Note that this isn't great, as technically it should be the time
387
# when the bytes started transferring, not when they completed.
388
# However, we usually start with a small request anyway.
389
self._first_byte_time = time.time()
390
if direction in self._bytes_by_direction:
391
self._bytes_by_direction[direction] += byte_count
393
self._bytes_by_direction['unknown'] += byte_count
394
if 'no_activity' in debug.debug_flags:
395
# Can be used as a workaround if
396
# <https://launchpad.net/bugs/321935> reappears and transport
397
# activity is cluttering other output. However, thanks to
398
# TextUIOutputStream this shouldn't be a problem any more.
219
400
now = time.time()
401
if self._total_byte_count < 2000:
402
# a little resistance at first, so it doesn't stay stuck at 0
403
# while connecting...
220
405
if self._transport_update_time is None:
221
406
self._transport_update_time = now
222
elif now >= (self._transport_update_time + 0.2):
407
elif now >= (self._transport_update_time + 0.5):
223
408
# guard against clock stepping backwards, and don't update too
225
410
rate = self._bytes_since_update / (now - self._transport_update_time)
226
msg = ("%6dkB @ %4dkB/s" %
227
(self._total_byte_count>>10, int(rate)>>10,))
411
msg = ("%6dKB %5dKB/s" %
412
(self._total_byte_count>>10, int(rate)>>10,))
228
413
self._transport_update_time = now
229
414
self._last_repaint = now
230
415
self._bytes_since_update = 0
231
416
self._last_transport_msg = msg
419
def _format_bytes_by_direction(self):
420
if self._first_byte_time is None:
423
transfer_time = time.time() - self._first_byte_time
424
if transfer_time < 0.001:
425
transfer_time = 0.001
426
bps = self._total_byte_count / transfer_time
428
msg = ('Transferred: %.0fKiB'
429
' (%.1fK/s r:%.0fK w:%.0fK'
430
% (self._total_byte_count / 1024.,
432
self._bytes_by_direction['read'] / 1024.,
433
self._bytes_by_direction['write'] / 1024.,
435
if self._bytes_by_direction['unknown'] > 0:
436
msg += ' u:%.0fK)' % (
437
self._bytes_by_direction['unknown'] / 1024.
443
def log_transport_activity(self, display=False):
444
msg = self._format_bytes_by_direction()
446
if display and self._total_byte_count > 0:
448
self._term_file.write(msg + '\n')
451
class TextUIOutputStream(object):
452
"""Decorates an output stream so that the terminal is cleared before writing.
454
This is supposed to ensure that the progress bar does not conflict with bulk
457
# XXX: this does not handle the case of writing part of a line, then doing
458
# progress bar output: the progress bar will probably write over it.
459
# one option is just to buffer that text until we have a full line;
460
# another is to save and restore it
462
# XXX: might need to wrap more methods
464
def __init__(self, ui_factory, wrapped_stream):
465
self.ui_factory = ui_factory
466
self.wrapped_stream = wrapped_stream
467
# this does no transcoding, but it must expose the underlying encoding
468
# because some callers need to know what can be written - see for
469
# example unescape_for_display.
470
self.encoding = getattr(wrapped_stream, 'encoding', None)
473
self.ui_factory.clear_term()
474
self.wrapped_stream.flush()
476
def write(self, to_write):
477
self.ui_factory.clear_term()
478
self.wrapped_stream.write(to_write)
480
def writelines(self, lines):
481
self.ui_factory.clear_term()
482
self.wrapped_stream.writelines(lines)
added
removed
bzrlib/ui/text.py
