1
# Copyright (C) 2005-2011 Canonical Ltd
1
# Copyright (C) 2005, 2008, 2009 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
60
59
self.stderr = stderr
61
60
# paints progress, network activity, etc
62
61
self._progress_view = self.make_progress_view()
64
def be_quiet(self, state):
65
if state and not self._quiet:
67
UIFactory.be_quiet(self, state)
68
self._progress_view = self.make_progress_view()
70
63
def clear_term(self):
71
64
"""Prepare the terminal for output.
114
107
password = password[:-1]
117
def get_password(self, prompt=u'', **kwargs):
110
def get_password(self, prompt='', **kwargs):
118
111
"""Prompt the user for a password.
120
113
:param prompt: The prompt to present the user
152
145
def make_progress_view(self):
153
146
"""Construct and return a new ProgressView subclass for this UI.
155
# with --quiet, never any progress view
156
# <https://bugs.launchpad.net/bzr/+bug/320035>. Otherwise if the
157
# user specifically requests either text or no progress bars, always
158
# do that. otherwise, guess based on $TERM and tty presence.
160
return NullProgressView()
161
elif os.environ.get('BZR_PROGRESS_BAR') == 'text':
148
# if the user specifically requests either text or no progress bars,
149
# always do that. otherwise, guess based on $TERM and tty presence.
150
if os.environ.get('BZR_PROGRESS_BAR') == 'text':
162
151
return TextProgressView(self.stderr)
163
152
elif os.environ.get('BZR_PROGRESS_BAR') == 'none':
164
153
return NullProgressView()
198
187
:param kwargs: Dictionary of arguments to insert into the prompt,
199
188
to allow UIs to reformat the prompt.
201
if type(prompt) != unicode:
202
raise ValueError("prompt %r not a unicode string" % prompt)
204
191
# See <https://launchpad.net/bugs/365891>
205
192
prompt = prompt % kwargs
216
203
self._progress_view.show_transport_activity(transport,
217
204
direction, byte_count)
219
def log_transport_activity(self, display=False):
220
"""See UIFactory.log_transport_activity()"""
221
log = getattr(self._progress_view, 'log_transport_activity', None)
225
206
def show_error(self, msg):
226
207
self.clear_term()
227
208
self.stderr.write("bzr: error: %s\n" % msg)
232
213
def show_warning(self, msg):
233
214
self.clear_term()
234
if isinstance(msg, unicode):
235
te = osutils.get_terminal_encoding()
236
msg = msg.encode(te, 'replace')
237
215
self.stderr.write("bzr: warning: %s\n" % msg)
239
217
def _progress_updated(self, task):
243
221
warnings.warn("%r updated but no tasks are active" %
245
223
elif task != self._task_stack[-1]:
246
# We used to check it was the top task, but it's hard to always
247
# get this right and it's not necessarily useful: any actual
248
# problems will be evident in use
249
#warnings.warn("%r is not the top progress task %r" %
250
# (task, self._task_stack[-1]))
224
warnings.warn("%r is not the top progress task %r" %
225
(task, self._task_stack[-1]))
252
226
self._progress_view.show_progress(task)
254
228
def _progress_all_finished(self):
255
229
self._progress_view.clear()
257
def show_user_warning(self, warning_id, **message_args):
258
"""Show a text message to the user.
260
Explicitly not for warnings about bzr apis, deprecations or internals.
262
# eventually trace.warning should migrate here, to avoid logging and
263
# be easier to test; that has a lot of test fallout so for now just
264
# new code can call this
265
if warning_id not in self.suppressed_warnings:
266
self.stderr.write(self.format_user_warning(warning_id, message_args) +
270
232
class TextProgressView(object):
271
233
"""Display of progress bar and other information on a tty.
295
257
self._last_task = None
296
258
self._total_byte_count = 0
297
259
self._bytes_since_update = 0
298
self._bytes_by_direction = {'unknown': 0, 'read': 0, 'write': 0}
299
self._first_byte_time = None
300
260
self._fraction = 0
301
261
# force the progress bar to be off, as at the moment it doesn't
302
262
# correspond reliably to overall command progress
303
263
self.enable_bar = False
305
def _avail_width(self):
306
# we need one extra space for terminals that wrap on last char
307
w = osutils.terminal_width()
313
265
def _show_line(self, s):
314
266
# sys.stderr.write("progress %r\n" % s)
315
width = self._avail_width()
267
width = osutils.terminal_width()
316
268
if width is not None:
269
# we need one extra space for terminals that wrap on last char
317
271
s = '%-*.*s' % (width, width, s)
318
272
self._term_file.write('\r' + s + '\r')
358
312
def _format_task(self, task):
359
"""Format task-specific parts of progress bar.
361
:returns: (text_part, counter_part) both unicode strings.
363
313
if not task.show_count:
365
315
elif task.current_cnt is not None and task.total_cnt is not None:
375
325
t = t._parent_task
377
327
m = t.msg + ':' + m
380
330
def _render_line(self):
381
331
bar_string = self._render_bar()
382
332
if self._last_task:
383
task_part, counter_part = self._format_task(self._last_task)
333
task_msg = self._format_task(self._last_task)
385
task_part = counter_part = ''
386
336
if self._last_task and not self._last_task.show_transport_activity:
389
339
trans = self._last_transport_msg
390
# the bar separates the transport activity from the message, so even
391
# if there's no bar or spinner, we must show something if both those
393
if (task_part or trans) and not bar_string:
395
# preferentially truncate the task message if we don't have enough
397
avail_width = self._avail_width()
398
if avail_width is not None:
399
# if terminal avail_width is unknown, don't truncate
400
current_len = len(bar_string) + len(trans) + len(task_part) + len(counter_part)
401
gap = current_len - avail_width
403
task_part = task_part[:-gap-2] + '..'
404
s = trans + bar_string + task_part + counter_part
405
if avail_width is not None:
406
if len(s) < avail_width:
407
s = s.ljust(avail_width)
408
elif len(s) > avail_width:
342
return (bar_string + trans + task_msg)
412
344
def _repaint(self):
413
345
s = self._render_line()
437
369
This may update a progress bar, spinner, or similar display.
438
370
By default it does nothing.
440
# XXX: there should be a transport activity model, and that too should
441
# be seen by the progress view, rather than being poked in here.
442
self._total_byte_count += byte_count
443
self._bytes_since_update += byte_count
444
if self._first_byte_time is None:
445
# Note that this isn't great, as technically it should be the time
446
# when the bytes started transferring, not when they completed.
447
# However, we usually start with a small request anyway.
448
self._first_byte_time = time.time()
449
if direction in self._bytes_by_direction:
450
self._bytes_by_direction[direction] += byte_count
452
self._bytes_by_direction['unknown'] += byte_count
372
# XXX: Probably there should be a transport activity model, and that
373
# too should be seen by the progress view, rather than being poked in
453
375
if 'no_activity' in debug.debug_flags:
454
376
# Can be used as a workaround if
455
377
# <https://launchpad.net/bugs/321935> reappears and transport
456
378
# activity is cluttering other output. However, thanks to
457
379
# TextUIOutputStream this shouldn't be a problem any more.
381
self._total_byte_count += byte_count
382
self._bytes_since_update += byte_count
459
383
now = time.time()
460
384
if self._total_byte_count < 2000:
461
385
# a little resistance at first, so it doesn't stay stuck at 0
466
390
elif now >= (self._transport_update_time + 0.5):
467
391
# guard against clock stepping backwards, and don't update too
469
rate = (self._bytes_since_update
470
/ (now - self._transport_update_time))
471
# using base-10 units (see HACKING.txt).
472
msg = ("%6dkB %5dkB/s " %
473
(self._total_byte_count / 1000, int(rate) / 1000,))
393
rate = self._bytes_since_update / (now - self._transport_update_time)
394
msg = ("%6dKB %5dKB/s" %
395
(self._total_byte_count>>10, int(rate)>>10,))
474
396
self._transport_update_time = now
475
397
self._last_repaint = now
476
398
self._bytes_since_update = 0
477
399
self._last_transport_msg = msg
480
def _format_bytes_by_direction(self):
481
if self._first_byte_time is None:
484
transfer_time = time.time() - self._first_byte_time
485
if transfer_time < 0.001:
486
transfer_time = 0.001
487
bps = self._total_byte_count / transfer_time
489
# using base-10 units (see HACKING.txt).
490
msg = ('Transferred: %.0fkB'
491
' (%.1fkB/s r:%.0fkB w:%.0fkB'
492
% (self._total_byte_count / 1000.,
494
self._bytes_by_direction['read'] / 1000.,
495
self._bytes_by_direction['write'] / 1000.,
497
if self._bytes_by_direction['unknown'] > 0:
498
msg += ' u:%.0fkB)' % (
499
self._bytes_by_direction['unknown'] / 1000.
505
def log_transport_activity(self, display=False):
506
msg = self._format_bytes_by_direction()
508
if display and self._total_byte_count > 0:
510
self._term_file.write(msg + '\n')
513
403
class TextUIOutputStream(object):
514
404
"""Decorates an output stream so that the terminal is cleared before writing.
added
removed
bzrlib/ui/text.py
