~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
19
"""Text UI, write output to the console.
20
"""
21
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
22
import sys
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
23
import time
3948.2.2 by Martin Pool
Corrections to finishing progress bars
24
import warnings
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
25
26
from bzrlib.lazy_import import lazy_import
27
lazy_import(globals(), """
1185.49.22 by John Arbash Meinel
Added get_password to the UIFactory, using it inside of sftp.py
28
import getpass
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
29
30
from bzrlib import (
31
    progress,
2294.4.1 by Vincent Ladeuil
Add a UIFactory.get_login method, fix tests.
32
    osutils,
3882.8.8 by Martin Pool
Progress and UI test cleanups
33
    symbol_versioning,
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
34
    )
3882.8.8 by Martin Pool
Progress and UI test cleanups
35
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
36
""")
37
1687.1.4 by Robert Collins
Add bzrlib.ui.ui_factory.get_boolean().
38
from bzrlib.ui import CLIUIFactory
39
40
41
class TextUIFactory(CLIUIFactory):
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
42
    """A UI factory for Text user interefaces."""
43
1692.3.3 by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory.
44
    def __init__(self,
45
                 bar_type=None,
3882.8.11 by Martin Pool
Choose the UIFactory class depending on the terminal capabilities
46
                 stdin=None,
1692.3.3 by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory.
47
                 stdout=None,
48
                 stderr=None):
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
49
        """Create a TextUIFactory.
50
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
51
        :param bar_type: The type of progress bar to create. It defaults to
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
52
                         letting the bzrlib.progress.ProgressBar factory auto
3882.8.3 by Martin Pool
Move display of transport throughput into TextProgressView
53
                         select.   Deprecated.
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
54
        """
3882.8.11 by Martin Pool
Choose the UIFactory class depending on the terminal capabilities
55
        super(TextUIFactory, self).__init__(stdin=stdin,
56
                stdout=stdout, stderr=stderr)
3882.8.6 by Martin Pool
TextUIFactory ignores and deprecates the bar_type parameter
57
        if bar_type:
58
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 11, 0))
59
                % "bar_type parameter")
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
60
        # paints progress, network activity, etc
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
61
        self._progress_view = TextProgressView(self.stderr)
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
62
1558.8.1 by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning'
63
    def clear_term(self):
64
        """Prepare the terminal for output.
65
66
        This will, clear any progress bars, and leave the cursor at the
67
        leftmost position."""
3882.7.6 by Martin Pool
Preliminary support for drawing network io into the progress bar
68
        # XXX: If this is preparing to write to stdout, but that's for example
69
        # directed into a file rather than to the terminal, and the progress
70
        # bar _is_ going to the terminal, we shouldn't need
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
71
        # 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
72
        self._progress_view.clear()
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
73
3882.8.4 by Martin Pool
All UI factories should support note()
74
    def note(self, msg):
75
        """Write an already-formatted message, clearing the progress bar if necessary."""
76
        self.clear_term()
77
        self.stdout.write(msg + '\n')
78
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
79
    def report_transport_activity(self, transport, byte_count, direction):
80
        """Called by transports as they do IO.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
81
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
82
        This may update a progress bar, spinner, or similar display.
83
        By default it does nothing.
84
        """
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
85
        self._progress_view._show_transport_activity(transport,
86
            direction, byte_count)
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
87
3948.2.3 by Martin Pool
Make the interface from ProgressTask to ui more private
88
    def _progress_updated(self, task):
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
89
        """A task has been updated and wants to be displayed.
90
        """
4070.1.1 by Martin Pool
Be more robust about pb updates when none are active
91
        if not self._task_stack:
92
            warnings.warn("%r updated but no tasks are active" %
93
                (task,))
94
        elif task != self._task_stack[-1]:
3948.2.2 by Martin Pool
Corrections to finishing progress bars
95
            warnings.warn("%r is not the top progress task %r" %
96
                (task, self._task_stack[-1]))
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
97
        self._progress_view.show_progress(task)
98
3948.2.5 by Martin Pool
rename to _progress_all_finished
99
    def _progress_all_finished(self):
3948.2.3 by Martin Pool
Make the interface from ProgressTask to ui more private
100
        self._progress_view.clear()
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
101
102
103
class TextProgressView(object):
104
    """Display of progress bar and other information on a tty.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
105
106
    This shows one line of text, including possibly a network indicator, spinner,
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
107
    progress bar, message, etc.
108
109
    One instance of this is created and held by the UI, and fed updates when a
110
    task wants to be painted.
111
112
    Transports feed data to this through the ui_factory object.
3948.2.2 by Martin Pool
Corrections to finishing progress bars
113
114
    The Progress views can comprise a tree with _parent_task pointers, but
115
    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
116
    """
117
118
    def __init__(self, term_file):
119
        self._term_file = term_file
120
        # true when there's output on the screen we may need to clear
121
        self._have_output = False
122
        # XXX: We could listen for SIGWINCH and update the terminal width...
123
        self._width = osutils.terminal_width()
124
        self._last_transport_msg = ''
125
        self._spin_pos = 0
126
        # time we last repainted the screen
127
        self._last_repaint = 0
128
        # time we last got information about transport activity
129
        self._transport_update_time = 0
130
        self._last_task = None
131
        self._total_byte_count = 0
132
        self._bytes_since_update = 0
133
134
    def _show_line(self, s):
135
        n = self._width - 1
136
        self._term_file.write('\r%-*.*s\r' % (n, n, s))
137
138
    def clear(self):
139
        if self._have_output:
140
            self._show_line('')
141
        self._have_output = False
142
143
    def _render_bar(self):
144
        # return a string for the progress bar itself
4103.3.3 by Martin Pool
Show the progress bar part when showing activity by default
145
        if (self._last_task is None) or self._last_task.show_bar:
146
            # If there's no task object, we show space for the bar anyhow.
147
            # That's because most invocations of bzr will end showing progress
148
            # at some point, though perhaps only after doing some initial IO.
149
            # It looks better to draw the progress bar initially rather than
150
            # to have what looks like an incomplete progress bar.
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
151
            spin_str =  r'/-\|'[self._spin_pos % 4]
152
            self._spin_pos += 1
153
            cols = 20
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
154
            if self._last_task is None:
155
                completion_fraction = 0
156
            else:
157
                completion_fraction = \
158
                    self._last_task._overall_completion_fraction() or 0
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
159
            markers = int(round(float(cols) * completion_fraction)) - 1
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
160
            bar_str = '[' + ('#' * markers + spin_str).ljust(cols) + '] '
161
            return bar_str
4103.3.3 by Martin Pool
Show the progress bar part when showing activity by default
162
        elif self._last_task.show_spinner:
163
            # The last task wanted just a spinner, no bar
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
164
            spin_str =  r'/-\|'[self._spin_pos % 4]
165
            self._spin_pos += 1
166
            return spin_str + ' '
167
        else:
168
            return ''
169
170
    def _format_task(self, task):
171
        if not task.show_count:
172
            s = ''
4017.1.1 by John Arbash Meinel
Get a pb.tick() to work after calling pb.update()
173
        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
174
            s = ' %d/%d' % (task.current_cnt, task.total_cnt)
175
        elif task.current_cnt is not None:
176
            s = ' %d' % (task.current_cnt)
177
        else:
178
            s = ''
179
        # compose all the parent messages
180
        t = task
181
        m = task.msg
182
        while t._parent_task:
183
            t = t._parent_task
184
            if t.msg:
185
                m = t.msg + ':' + m
186
        return m + s
187
4110.2.16 by Martin Pool
Refactor TextProgressView a bit and add another test
188
    def _render_line(self):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
189
        bar_string = self._render_bar()
190
        if self._last_task:
191
            task_msg = self._format_task(self._last_task)
192
        else:
193
            task_msg = ''
194
        trans = self._last_transport_msg
4110.2.16 by Martin Pool
Refactor TextProgressView a bit and add another test
195
        if trans:
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
196
            trans += ' | '
4110.2.16 by Martin Pool
Refactor TextProgressView a bit and add another test
197
        return (bar_string + trans + task_msg)
198
199
    def _repaint(self):
200
        s = self._render_line()
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
201
        self._show_line(s)
202
        self._have_output = True
203
204
    def show_progress(self, task):
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
205
        """Called by the task object when it has changed.
206
        
207
        :param task: The top task object; its parents are also included 
208
            by following links.
209
        """
4110.2.18 by Martin Pool
Progress bars always repaint when task structure is changed
210
        must_update = task is not self._last_task
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
211
        self._last_task = task
212
        now = time.time()
4110.2.18 by Martin Pool
Progress bars always repaint when task structure is changed
213
        if (not must_update) and (now < self._last_repaint + 0.1):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
214
            return
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
215
        if now > self._transport_update_time + 10:
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
216
            # no recent activity; expire it
217
            self._last_transport_msg = ''
218
        self._last_repaint = now
219
        self._repaint()
220
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
221
    def _show_transport_activity(self, transport, direction, byte_count):
222
        """Called by transports via the ui_factory, as they do IO.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
223
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
224
        This may update a progress bar, spinner, or similar display.
225
        By default it does nothing.
226
        """
227
        # XXX: Probably there should be a transport activity model, and that
228
        # too should be seen by the progress view, rather than being poked in
229
        # here.
230
        self._total_byte_count += byte_count
231
        self._bytes_since_update += byte_count
232
        now = time.time()
233
        if self._transport_update_time is None:
234
            self._transport_update_time = now
4043.1.1 by John Arbash Meinel
Increase the debounce time for 'transport activity' to 0.5s
235
        elif now >= (self._transport_update_time + 0.5):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
236
            # guard against clock stepping backwards, and don't update too
237
            # often
238
            rate = self._bytes_since_update / (now - self._transport_update_time)
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
239
            scheme = getattr(transport, '_scheme', None) or repr(transport)
240
            if direction == 'read':
4258.2.2 by Jelmer Vernooij
keep the width of the progress bar the same.
241
                dir_char = '>'
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
242
            elif direction == 'write':
4258.2.2 by Jelmer Vernooij
keep the width of the progress bar the same.
243
                dir_char = '<'
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
244
            else:
4258.2.2 by Jelmer Vernooij
keep the width of the progress bar the same.
245
                dir_char = ' '
246
            msg = ("%.7s %s %6dKB %5dKB/s" %
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
247
                    (scheme, dir_char, self._total_byte_count>>10, int(rate)>>10,))
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
248
            self._transport_update_time = now
249
            self._last_repaint = now
250
            self._bytes_since_update = 0
251
            self._last_transport_msg = msg
252
            self._repaint()
253
254