~bzr-pqm/bzr/bzr.dev

3948.2.2 by Martin Pool
Corrections to finishing progress bars
1
# Copyright (C) 2005, 2008, 2009 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1185.49.21 by John Arbash Meinel
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms.
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1185.49.21 by John Arbash Meinel
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1185.49.21 by John Arbash Meinel
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1185.49.21 by John Arbash Meinel
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms.
16
17
18
"""Text UI, write output to the console.
19
"""
20
4792.8.2 by Martin Pool
New method ui_factory.make_output_stream
21
import codecs
4566.1.1 by John Arbash Meinel
Fix a fairly critical bug where TextUIFactory.get_non_echoed_password was failing.
22
import getpass
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
23
import os
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
24
import sys
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
25
import time
3948.2.2 by Martin Pool
Corrections to finishing progress bars
26
import warnings
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
27
28
from bzrlib.lazy_import import lazy_import
29
lazy_import(globals(), """
30
from bzrlib import (
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
31
    debug,
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
32
    progress,
2294.4.1 by Vincent Ladeuil
Add a UIFactory.get_login method, fix tests.
33
    osutils,
3882.8.8 by Martin Pool
Progress and UI test cleanups
34
    symbol_versioning,
4906.1.1 by John Arbash Meinel
Basic implementation of logging bytes transferred when bzr exits.
35
    trace,
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
36
    )
3882.8.8 by Martin Pool
Progress and UI test cleanups
37
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
38
""")
39
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
40
from bzrlib.ui import (
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
41
    UIFactory,
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
42
    NullProgressView,
43
    )
1687.1.4 by Robert Collins
Add bzrlib.ui.ui_factory.get_boolean().
44
45
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
46
class TextUIFactory(UIFactory):
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
47
    """A UI factory for Text user interefaces."""
48
1692.3.3 by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory.
49
    def __init__(self,
3882.8.11 by Martin Pool
Choose the UIFactory class depending on the terminal capabilities
50
                 stdin=None,
1692.3.3 by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory.
51
                 stdout=None,
52
                 stderr=None):
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
53
        """Create a TextUIFactory.
54
        """
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
55
        super(TextUIFactory, self).__init__()
4449.3.28 by Martin Pool
todo
56
        # TODO: there's no good reason not to pass all three streams, maybe we
57
        # should deprecate the default values...
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
58
        self.stdin = stdin
59
        self.stdout = stdout
60
        self.stderr = stderr
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
61
        # paints progress, network activity, etc
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
62
        self._progress_view = self.make_progress_view()
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
63
        
1558.8.1 by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning'
64
    def clear_term(self):
65
        """Prepare the terminal for output.
66
67
        This will, clear any progress bars, and leave the cursor at the
68
        leftmost position."""
3882.7.6 by Martin Pool
Preliminary support for drawing network io into the progress bar
69
        # XXX: If this is preparing to write to stdout, but that's for example
70
        # directed into a file rather than to the terminal, and the progress
71
        # bar _is_ going to the terminal, we shouldn't need
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
72
        # to clear it.  We might need to separately check for the case of
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
73
        self._progress_view.clear()
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
74
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
75
    def get_boolean(self, prompt):
76
        while True:
77
            self.prompt(prompt + "? [y/n]: ")
4449.3.37 by Martin Pool
TextUIFactory should cope with EOF when in get_boolean
78
            line = self.stdin.readline().lower()
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
79
            if line in ('y\n', 'yes\n'):
80
                return True
4449.3.37 by Martin Pool
TextUIFactory should cope with EOF when in get_boolean
81
            elif line in ('n\n', 'no\n'):
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
82
                return False
4449.3.37 by Martin Pool
TextUIFactory should cope with EOF when in get_boolean
83
            elif line in ('', None):
84
                # end-of-file; possibly should raise an error here instead
85
                return None
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
86
4886.1.1 by Vincent Ladeuil
Allows ui factories to query users for an integer.
87
    def get_integer(self, prompt):
88
        while True:
89
            self.prompt(prompt)
90
            line = self.stdin.readline()
91
            try:
92
                return int(line)
93
            except ValueError:
94
                pass
95
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
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('')
102
        else:
103
            # echo doesn't make sense without a terminal
104
            password = self.stdin.readline()
105
            if not password:
106
                password = None
107
            elif password[-1] == '\n':
108
                password = password[:-1]
109
        return password
110
111
    def get_password(self, prompt='', **kwargs):
112
        """Prompt the user for a password.
113
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
117
                       they so choose.
118
        :return: The password string, return None if the user
119
                 canceled the request.
120
        """
121
        prompt += ': '
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()
126
127
    def get_username(self, prompt, **kwargs):
128
        """Prompt the user for a username.
129
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
133
                       they so choose.
134
        :return: The username string, return None if the user
135
                 canceled the request.
136
        """
137
        prompt += ': '
138
        self.prompt(prompt, **kwargs)
139
        username = self.stdin.readline()
140
        if not username:
141
            username = None
142
        elif username[-1] == '\n':
143
            username = username[:-1]
144
        return username
145
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
146
    def make_progress_view(self):
147
        """Construct and return a new ProgressView subclass for this UI.
148
        """
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):
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
156
            return TextProgressView(self.stderr)
157
        else:
158
            return NullProgressView()
159
4792.8.5 by Martin Pool
Support encoding_type=exact for make_output_stream
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)
167
                if fileno:
168
                    import msvcrt
169
                    msvcrt.setmode(fileno(), os.O_BINARY)
170
            return TextUIOutputStream(self, self.stdout)
171
        else:
172
            encoded_stdout = codecs.getwriter(encoding)(self.stdout,
173
                errors=encoding_type)
4792.8.10 by Martin Pool
Put tweaks to codecs.getwriter encoding into the place it's created
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
4792.8.5 by Martin Pool
Support encoding_type=exact for make_output_stream
178
            return TextUIOutputStream(self, encoded_stdout)
4792.8.2 by Martin Pool
New method ui_factory.make_output_stream
179
3882.8.4 by Martin Pool
All UI factories should support note()
180
    def note(self, msg):
181
        """Write an already-formatted message, clearing the progress bar if necessary."""
182
        self.clear_term()
183
        self.stdout.write(msg + '\n')
184
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
185
    def prompt(self, prompt, **kwargs):
186
        """Emit prompt on the CLI.
187
        
188
        :param kwargs: Dictionary of arguments to insert into the prompt,
189
            to allow UIs to reformat the prompt.
190
        """
191
        if kwargs:
192
            # See <https://launchpad.net/bugs/365891>
193
            prompt = prompt % kwargs
194
        prompt = prompt.encode(osutils.get_terminal_encoding(), 'replace')
195
        self.clear_term()
196
        self.stderr.write(prompt)
197
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
198
    def report_transport_activity(self, transport, byte_count, direction):
199
        """Called by transports as they do IO.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
200
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
201
        This may update a progress bar, spinner, or similar display.
202
        By default it does nothing.
203
        """
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
204
        self._progress_view.show_transport_activity(transport,
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
205
            direction, byte_count)
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
206
4906.1.1 by John Arbash Meinel
Basic implementation of logging bytes transferred when bzr exits.
207
    def log_transport_activity(self, display=False):
208
        """See UIFactory.log_transport_activity()"""
209
        log = getattr(self._progress_view, 'log_transport_activity', None)
210
        if log is not None:
211
            log(display=display)
212
4711.1.7 by Martin Pool
Add UIFactory.show_error, show_warning, show_message
213
    def show_error(self, msg):
214
        self.clear_term()
215
        self.stderr.write("bzr: error: %s\n" % msg)
216
4711.1.8 by Martin Pool
Add show_warning and show_message tests and implementations
217
    def show_message(self, msg):
218
        self.note(msg)
219
220
    def show_warning(self, msg):
221
        self.clear_term()
222
        self.stderr.write("bzr: warning: %s\n" % msg)
223
3948.2.3 by Martin Pool
Make the interface from ProgressTask to ui more private
224
    def _progress_updated(self, task):
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
225
        """A task has been updated and wants to be displayed.
226
        """
4070.1.1 by Martin Pool
Be more robust about pb updates when none are active
227
        if not self._task_stack:
228
            warnings.warn("%r updated but no tasks are active" %
229
                (task,))
230
        elif task != self._task_stack[-1]:
3948.2.2 by Martin Pool
Corrections to finishing progress bars
231
            warnings.warn("%r is not the top progress task %r" %
232
                (task, self._task_stack[-1]))
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
233
        self._progress_view.show_progress(task)
234
3948.2.5 by Martin Pool
rename to _progress_all_finished
235
    def _progress_all_finished(self):
3948.2.3 by Martin Pool
Make the interface from ProgressTask to ui more private
236
        self._progress_view.clear()
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
237
238
239
class TextProgressView(object):
240
    """Display of progress bar and other information on a tty.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
241
242
    This shows one line of text, including possibly a network indicator, spinner,
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
243
    progress bar, message, etc.
244
245
    One instance of this is created and held by the UI, and fed updates when a
246
    task wants to be painted.
247
248
    Transports feed data to this through the ui_factory object.
3948.2.2 by Martin Pool
Corrections to finishing progress bars
249
250
    The Progress views can comprise a tree with _parent_task pointers, but
251
    this only prints the stack from the nominated current task up to the root.
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
252
    """
253
254
    def __init__(self, term_file):
255
        self._term_file = term_file
256
        # true when there's output on the screen we may need to clear
257
        self._have_output = False
258
        self._last_transport_msg = ''
259
        self._spin_pos = 0
260
        # time we last repainted the screen
261
        self._last_repaint = 0
262
        # time we last got information about transport activity
263
        self._transport_update_time = 0
264
        self._last_task = None
265
        self._total_byte_count = 0
266
        self._bytes_since_update = 0
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
267
        self._bytes_by_direction = {'unknown': 0, 'read': 0, 'write': 0}
4906.1.5 by John Arbash Meinel
Include the KiB/s for the transfer.
268
        self._first_byte_time = None
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
269
        self._fraction = 0
4880.2.1 by Martin Pool
Text progress view is now only a spinner not a bar.
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
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
273
274
    def _show_line(self, s):
4580.3.1 by Martin Pool
ProgressTasks can specify an update latency
275
        # sys.stderr.write("progress %r\n" % s)
4747.5.2 by Vincent Ladeuil
Cleanup and NEWS entry.
276
        width = osutils.terminal_width()
277
        if width is not None:
278
            # we need one extra space for terminals that wrap on last char
279
            width = width - 1
280
            s = '%-*.*s' % (width, width, s)
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
281
        self._term_file.write('\r' + s + '\r')
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
282
283
    def clear(self):
284
        if self._have_output:
285
            self._show_line('')
286
        self._have_output = False
287
288
    def _render_bar(self):
289
        # return a string for the progress bar itself
4880.2.1 by Martin Pool
Text progress view is now only a spinner not a bar.
290
        if self.enable_bar and (
291
            (self._last_task is None) or self._last_task.show_bar):
4103.3.3 by Martin Pool
Show the progress bar part when showing activity by default
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.
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
297
            spin_str =  r'/-\|'[self._spin_pos % 4]
298
            self._spin_pos += 1
299
            cols = 20
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
300
            if self._last_task is None:
301
                completion_fraction = 0
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
302
                self._fraction = 0
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
303
            else:
304
                completion_fraction = \
305
                    self._last_task._overall_completion_fraction() or 0
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
306
            if (completion_fraction < self._fraction and 'progress' in
307
                debug.debug_flags):
308
                import pdb;pdb.set_trace()
309
            self._fraction = completion_fraction
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
310
            markers = int(round(float(cols) * completion_fraction)) - 1
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
311
            bar_str = '[' + ('#' * markers + spin_str).ljust(cols) + '] '
312
            return bar_str
4912.1.1 by Martin Pool
Transport activity indicator is now shown even if there's no pb
313
        elif (self._last_task is None) or self._last_task.show_spinner:
4103.3.3 by Martin Pool
Show the progress bar part when showing activity by default
314
            # The last task wanted just a spinner, no bar
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
315
            spin_str =  r'/-\|'[self._spin_pos % 4]
316
            self._spin_pos += 1
317
            return spin_str + ' '
318
        else:
319
            return ''
320
321
    def _format_task(self, task):
322
        if not task.show_count:
323
            s = ''
4017.1.1 by John Arbash Meinel
Get a pb.tick() to work after calling pb.update()
324
        elif task.current_cnt is not None and task.total_cnt is not None:
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
325
            s = ' %d/%d' % (task.current_cnt, task.total_cnt)
326
        elif task.current_cnt is not None:
327
            s = ' %d' % (task.current_cnt)
328
        else:
329
            s = ''
330
        # compose all the parent messages
331
        t = task
332
        m = task.msg
333
        while t._parent_task:
334
            t = t._parent_task
335
            if t.msg:
336
                m = t.msg + ':' + m
337
        return m + s
338
4110.2.16 by Martin Pool
Refactor TextProgressView a bit and add another test
339
    def _render_line(self):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
340
        bar_string = self._render_bar()
341
        if self._last_task:
342
            task_msg = self._format_task(self._last_task)
343
        else:
344
            task_msg = ''
4580.3.5 by Martin Pool
selftest sets ProgressTask.show_transport_activity off
345
        if self._last_task and not self._last_task.show_transport_activity:
346
            trans = ''
347
        else:
348
            trans = self._last_transport_msg
349
            if trans:
350
                trans += ' | '
4110.2.16 by Martin Pool
Refactor TextProgressView a bit and add another test
351
        return (bar_string + trans + task_msg)
352
353
    def _repaint(self):
354
        s = self._render_line()
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
355
        self._show_line(s)
356
        self._have_output = True
357
358
    def show_progress(self, task):
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
359
        """Called by the task object when it has changed.
360
        
361
        :param task: The top task object; its parents are also included 
362
            by following links.
363
        """
4110.2.18 by Martin Pool
Progress bars always repaint when task structure is changed
364
        must_update = task is not self._last_task
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
365
        self._last_task = task
366
        now = time.time()
4580.3.1 by Martin Pool
ProgressTasks can specify an update latency
367
        if (not must_update) and (now < self._last_repaint + task.update_latency):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
368
            return
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
369
        if now > self._transport_update_time + 10:
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
370
            # no recent activity; expire it
371
            self._last_transport_msg = ''
372
        self._last_repaint = now
373
        self._repaint()
374
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
375
    def show_transport_activity(self, transport, direction, byte_count):
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
376
        """Called by transports via the ui_factory, as they do IO.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
377
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
378
        This may update a progress bar, spinner, or similar display.
379
        By default it does nothing.
380
        """
4906.1.8 by John Arbash Meinel
Merge bzr.dev, resolve conflicts.
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.
4906.1.2 by John Arbash Meinel
Get the basic interface tested.
383
        self._total_byte_count += byte_count
384
        self._bytes_since_update += byte_count
4906.1.5 by John Arbash Meinel
Include the KiB/s for the transfer.
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()
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
390
        if direction in self._bytes_by_direction:
391
            self._bytes_by_direction[direction] += byte_count
392
        else:
393
            self._bytes_by_direction['unknown'] += byte_count
4912.1.4 by Martin Pool
Rename to -Dno_activity; incidentally fixes ReST syntax error
394
        if 'no_activity' in debug.debug_flags:
4912.1.1 by Martin Pool
Transport activity indicator is now shown even if there's no pb
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.
4480.1.1 by Martin Pool
(mbp) only show transport activity when progress is already visible
399
            return
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
400
        now = time.time()
4912.1.3 by Martin Pool
Revert: don't show transport activity til some data has been sent.
401
        if self._total_byte_count < 2000:
402
            # a little resistance at first, so it doesn't stay stuck at 0
403
            # while connecting...
404
            return
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
405
        if self._transport_update_time is None:
406
            self._transport_update_time = now
4043.1.1 by John Arbash Meinel
Increase the debounce time for 'transport activity' to 0.5s
407
        elif now >= (self._transport_update_time + 0.5):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
408
            # guard against clock stepping backwards, and don't update too
409
            # often
410
            rate = self._bytes_since_update / (now - self._transport_update_time)
4470.3.1 by Martin Pool
Progress bars no longer show transport scheme or direction
411
            msg = ("%6dKB %5dKB/s" %
412
                    (self._total_byte_count>>10, int(rate)>>10,))
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
413
            self._transport_update_time = now
414
            self._last_repaint = now
415
            self._bytes_since_update = 0
416
            self._last_transport_msg = msg
417
            self._repaint()
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
418
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
419
    def _format_bytes_by_direction(self):
4906.1.5 by John Arbash Meinel
Include the KiB/s for the transfer.
420
        if self._first_byte_time is None:
421
            bps = 0.0
422
        else:
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
427
4906.1.7 by John Arbash Meinel
Switch to KiB/K for each value. Don't display if there are no bytes.
428
        msg = ('Transferred: %.0fKiB'
429
               ' (%.1fK/s r:%.0fK w:%.0fK'
430
               % (self._total_byte_count / 1024.,
4906.1.5 by John Arbash Meinel
Include the KiB/s for the transfer.
431
                  bps / 1024.,
4906.1.7 by John Arbash Meinel
Switch to KiB/K for each value. Don't display if there are no bytes.
432
                  self._bytes_by_direction['read'] / 1024.,
433
                  self._bytes_by_direction['write'] / 1024.,
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
434
                 ))
435
        if self._bytes_by_direction['unknown'] > 0:
4906.1.7 by John Arbash Meinel
Switch to KiB/K for each value. Don't display if there are no bytes.
436
            msg += ' u:%.0fK)' % (
437
                self._bytes_by_direction['unknown'] / 1024.
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
438
                )
439
        else:
440
            msg += ')'
441
        return msg
442
4906.1.1 by John Arbash Meinel
Basic implementation of logging bytes transferred when bzr exits.
443
    def log_transport_activity(self, display=False):
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
444
        msg = self._format_bytes_by_direction()
445
        trace.mutter(msg)
4906.1.7 by John Arbash Meinel
Switch to KiB/K for each value. Don't display if there are no bytes.
446
        if display and self._total_byte_count > 0:
4906.1.3 by John Arbash Meinel
Use clear() so that we clear a progress bar, but don't introduce a newline.
447
            self.clear()
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
448
            self._term_file.write(msg + '\n')
4906.1.1 by John Arbash Meinel
Basic implementation of logging bytes transferred when bzr exits.
449
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
450
451
class TextUIOutputStream(object):
452
    """Decorates an output stream so that the terminal is cleared before writing.
453
454
    This is supposed to ensure that the progress bar does not conflict with bulk
455
    text output.
456
    """
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
461
462
    # XXX: might need to wrap more methods
463
464
    def __init__(self, ui_factory, wrapped_stream):
465
        self.ui_factory = ui_factory
466
        self.wrapped_stream = wrapped_stream
4792.8.13 by Martin Pool
TextUIOutputStream must have an .encoding
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.
4792.8.15 by Martin Pool
TextUIOutputStream can cope if the wrapped stream doesn't have a .encoding
470
        self.encoding = getattr(wrapped_stream, 'encoding', None)
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
471
4792.8.7 by Martin Pool
Add TextUIOutputStream.flush
472
    def flush(self):
473
        self.ui_factory.clear_term()
474
        self.wrapped_stream.flush()
475
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
476
    def write(self, to_write):
477
        self.ui_factory.clear_term()
478
        self.wrapped_stream.write(to_write)
4792.8.3 by Martin Pool
Add TextUIOutputStream.writelines
479
480
    def writelines(self, lines):
481
        self.ui_factory.clear_term()
482
        self.wrapped_stream.writelines(lines)