649
by Martin Pool
- some cleanups for the progressbar method |
1 |
# Copyright (C) 2005 Aaron Bentley <aaron.bentley@utoronto.ca>
|
2052.3.1
by John Arbash Meinel
Add tests to cleanup the copyright of all source files |
2 |
# Copyright (C) 2005, 2006 Canonical Ltd
|
3 |
#
|
|
4 |
# This program is free software; you can redistribute it and/or modify
|
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
8 |
#
|
|
9 |
# This program is distributed in the hope that it will be useful,
|
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
13 |
#
|
|
14 |
# You should have received a copy of the GNU General Public License
|
|
15 |
# along with this program; if not, write to the Free Software
|
|
16 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
648
by Martin Pool
- import aaron's progress-indicator code |
17 |
|
649
by Martin Pool
- some cleanups for the progressbar method |
18 |
|
3006.3.3
by Robert Collins
Docstring improvement and remove TODO's from progres.py. |
19 |
"""Progress indicators.
|
20 |
||
21 |
The usual way to use this is via bzrlib.ui.ui_factory.nested_progress_bar which
|
|
22 |
will maintain a ProgressBarStack for you.
|
|
23 |
||
24 |
For direct use, the factory ProgressBar will return an auto-detected progress
|
|
25 |
bar that should match your terminal type. You can manually create a
|
|
26 |
ProgressBarStack too if you need multiple levels of cooperating progress bars.
|
|
27 |
Note that bzrlib's internal functions use the ui module, so if you are using
|
|
28 |
bzrlib it really is best to use bzrlib.ui.ui_factory.
|
|
649
by Martin Pool
- some cleanups for the progressbar method |
29 |
"""
|
30 |
||
934
by Martin Pool
todo |
31 |
# TODO: Optionally show elapsed time instead/as well as ETA; nicer
|
32 |
# when the rate is unpredictable
|
|
33 |
||
648
by Martin Pool
- import aaron's progress-indicator code |
34 |
import sys |
660
by Martin Pool
- use plain unix time, not datetime module |
35 |
import time |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
36 |
import os |
649
by Martin Pool
- some cleanups for the progressbar method |
37 |
|
1996.3.32
by John Arbash Meinel
from bzrlib.ui lazy import progress, and make progress import lazily |
38 |
from bzrlib.lazy_import import lazy_import |
39 |
lazy_import(globals(), """ |
|
40 |
from bzrlib import (
|
|
41 |
errors,
|
|
42 |
)
|
|
43 |
""") |
|
44 |
||
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
45 |
from bzrlib.trace import mutter |
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
46 |
|
47 |
||
649
by Martin Pool
- some cleanups for the progressbar method |
48 |
def _supports_progress(f): |
2599.1.1
by Martin Pool
Don't show dots progress indicatiors in noninteractive mode |
49 |
"""Detect if we can use pretty progress bars on the output stream f.
|
50 |
||
51 |
If this returns true we expect that a human may be looking at that
|
|
52 |
output, and that we can repaint a line to update it.
|
|
53 |
"""
|
|
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
54 |
isatty = getattr(f, 'isatty', None) |
55 |
if isatty is None: |
|
695
by Martin Pool
- don't display progress bars on really dumb terminals |
56 |
return False |
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
57 |
if not isatty(): |
695
by Martin Pool
- don't display progress bars on really dumb terminals |
58 |
return False |
59 |
if os.environ.get('TERM') == 'dumb': |
|
60 |
# e.g. emacs compile window
|
|
61 |
return False |
|
62 |
return True |
|
649
by Martin Pool
- some cleanups for the progressbar method |
63 |
|
64 |
||
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
65 |
_progress_bar_types = {} |
66 |
||
649
by Martin Pool
- some cleanups for the progressbar method |
67 |
|
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
68 |
def ProgressBar(to_file=None, **kwargs): |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
69 |
"""Abstract factory"""
|
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
70 |
if to_file is None: |
71 |
to_file = sys.stderr |
|
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
72 |
requested_bar_type = os.environ.get('BZR_PROGRESS_BAR') |
73 |
# An value of '' or not set reverts to standard processing
|
|
74 |
if requested_bar_type in (None, ''): |
|
75 |
if _supports_progress(to_file): |
|
76 |
return TTYProgressBar(to_file=to_file, **kwargs) |
|
77 |
else: |
|
2599.1.1
by Martin Pool
Don't show dots progress indicatiors in noninteractive mode |
78 |
return DummyProgress(to_file=to_file, **kwargs) |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
79 |
else: |
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
80 |
# Minor sanitation to prevent spurious errors
|
81 |
requested_bar_type = requested_bar_type.lower().strip() |
|
82 |
# TODO: jam 20060710 Arguably we shouldn't raise an exception
|
|
83 |
# but should instead just disable progress bars if we
|
|
84 |
# don't recognize the type
|
|
85 |
if requested_bar_type not in _progress_bar_types: |
|
86 |
raise errors.InvalidProgressBarType(requested_bar_type, |
|
87 |
_progress_bar_types.keys()) |
|
88 |
return _progress_bar_types[requested_bar_type](to_file=to_file, **kwargs) |
|
89 |
||
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
90 |
|
91 |
class ProgressBarStack(object): |
|
92 |
"""A stack of progress bars."""
|
|
93 |
||
94 |
def __init__(self, |
|
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
95 |
to_file=None, |
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
96 |
show_pct=False, |
1551.2.33
by Aaron Bentley
Hide ETA, show spinner by default |
97 |
show_spinner=True, |
98 |
show_eta=False, |
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
99 |
show_bar=True, |
100 |
show_count=True, |
|
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
101 |
to_messages_file=None, |
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
102 |
klass=None): |
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
103 |
"""Setup the stack with the parameters the progress bars should have."""
|
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
104 |
if to_file is None: |
105 |
to_file = sys.stderr |
|
106 |
if to_messages_file is None: |
|
107 |
to_messages_file = sys.stdout |
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
108 |
self._to_file = to_file |
109 |
self._show_pct = show_pct |
|
110 |
self._show_spinner = show_spinner |
|
111 |
self._show_eta = show_eta |
|
112 |
self._show_bar = show_bar |
|
113 |
self._show_count = show_count |
|
114 |
self._to_messages_file = to_messages_file |
|
115 |
self._stack = [] |
|
1843.3.5
by John Arbash Meinel
Add tests to assert we fall back to DotsProgressBar when appropriate. |
116 |
self._klass = klass or ProgressBar |
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
117 |
|
1551.2.29
by Aaron Bentley
Got stack handling under test |
118 |
def top(self): |
119 |
if len(self._stack) != 0: |
|
120 |
return self._stack[-1] |
|
121 |
else: |
|
122 |
return None |
|
123 |
||
1558.8.1
by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning' |
124 |
def bottom(self): |
125 |
if len(self._stack) != 0: |
|
126 |
return self._stack[0] |
|
127 |
else: |
|
128 |
return None |
|
129 |
||
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
130 |
def get_nested(self): |
131 |
"""Return a nested progress bar."""
|
|
1551.2.29
by Aaron Bentley
Got stack handling under test |
132 |
if len(self._stack) == 0: |
133 |
func = self._klass |
|
134 |
else: |
|
135 |
func = self.top().child_progress |
|
136 |
new_bar = func(to_file=self._to_file, |
|
137 |
show_pct=self._show_pct, |
|
138 |
show_spinner=self._show_spinner, |
|
139 |
show_eta=self._show_eta, |
|
140 |
show_bar=self._show_bar, |
|
141 |
show_count=self._show_count, |
|
142 |
to_messages_file=self._to_messages_file, |
|
143 |
_stack=self) |
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
144 |
self._stack.append(new_bar) |
145 |
return new_bar |
|
146 |
||
147 |
def return_pb(self, bar): |
|
148 |
"""Return bar after its been used."""
|
|
1594.1.4
by Robert Collins
Fix identity test in ProgressBarStack.return_pb |
149 |
if bar is not self._stack[-1]: |
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
150 |
raise errors.MissingProgressBarFinish() |
151 |
self._stack.pop() |
|
152 |
||
153 |
||
964
by Martin Pool
- show progress on dumb terminals by printing dots |
154 |
class _BaseProgressBar(object): |
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
155 |
|
964
by Martin Pool
- show progress on dumb terminals by printing dots |
156 |
def __init__(self, |
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
157 |
to_file=None, |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
158 |
show_pct=False, |
159 |
show_spinner=False, |
|
1793.1.1
by Aaron Bentley
Hide TTYProgressBars unless they last more than 1 second |
160 |
show_eta=False, |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
161 |
show_bar=True, |
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
162 |
show_count=True, |
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
163 |
to_messages_file=None, |
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
164 |
_stack=None): |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
165 |
object.__init__(self) |
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
166 |
if to_file is None: |
167 |
to_file = sys.stderr |
|
168 |
if to_messages_file is None: |
|
169 |
to_messages_file = sys.stdout |
|
964
by Martin Pool
- show progress on dumb terminals by printing dots |
170 |
self.to_file = to_file |
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
171 |
self.to_messages_file = to_messages_file |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
172 |
self.last_msg = None |
173 |
self.last_cnt = None |
|
174 |
self.last_total = None |
|
175 |
self.show_pct = show_pct |
|
176 |
self.show_spinner = show_spinner |
|
177 |
self.show_eta = show_eta |
|
178 |
self.show_bar = show_bar |
|
179 |
self.show_count = show_count |
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
180 |
self._stack = _stack |
1596.2.16
by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time. |
181 |
# seed throttler
|
182 |
self.MIN_PAUSE = 0.1 # seconds |
|
2120.1.1
by John Arbash Meinel
Use time.time() because time.clock() is CPU time, not wall time |
183 |
now = time.time() |
1596.2.16
by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time. |
184 |
# starting now
|
2745.6.52
by Andrew Bennetts
Revert bad change to bzrlib/progress.py |
185 |
self.start_time = now |
1596.2.16
by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time. |
186 |
# next update should not throttle
|
187 |
self.last_update = now - self.MIN_PAUSE - 1 |
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
188 |
|
189 |
def finished(self): |
|
190 |
"""Return this bar to its progress stack."""
|
|
191 |
self.clear() |
|
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
192 |
assert self._stack is not None |
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
193 |
self._stack.return_pb(self) |
1104
by Martin Pool
- Add a simple UIFactory |
194 |
|
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
195 |
def note(self, fmt_string, *args, **kwargs): |
196 |
"""Record a note without disrupting the progress bar."""
|
|
1558.8.5
by Aaron Bentley
Pass note up the stack instead of using bzrlib.ui_factory |
197 |
self.clear() |
1558.7.9
by Aaron Bentley
Bad change. (broke tests). Reverted. |
198 |
self.to_messages_file.write(fmt_string % args) |
199 |
self.to_messages_file.write('\n') |
|
1104
by Martin Pool
- Add a simple UIFactory |
200 |
|
1551.2.29
by Aaron Bentley
Got stack handling under test |
201 |
def child_progress(self, **kwargs): |
202 |
return ChildProgress(**kwargs) |
|
203 |
||
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
204 |
|
1104
by Martin Pool
- Add a simple UIFactory |
205 |
class DummyProgress(_BaseProgressBar): |
206 |
"""Progress-bar standin that does nothing.
|
|
207 |
||
208 |
This can be used as the default argument for methods that
|
|
209 |
take an optional progress indicator."""
|
|
210 |
def tick(self): |
|
211 |
pass
|
|
212 |
||
213 |
def update(self, msg=None, current=None, total=None): |
|
214 |
pass
|
|
215 |
||
1551.2.27
by Aaron Bentley
Got propogation under test |
216 |
def child_update(self, message, current, total): |
217 |
pass
|
|
218 |
||
1104
by Martin Pool
- Add a simple UIFactory |
219 |
def clear(self): |
220 |
pass
|
|
964
by Martin Pool
- show progress on dumb terminals by printing dots |
221 |
|
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
222 |
def note(self, fmt_string, *args, **kwargs): |
223 |
"""See _BaseProgressBar.note()."""
|
|
1534.5.9
by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch. |
224 |
|
1551.2.29
by Aaron Bentley
Got stack handling under test |
225 |
def child_progress(self, **kwargs): |
226 |
return DummyProgress(**kwargs) |
|
1534.5.9
by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch. |
227 |
|
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
228 |
|
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
229 |
_progress_bar_types['dummy'] = DummyProgress |
230 |
_progress_bar_types['none'] = DummyProgress |
|
231 |
||
232 |
||
964
by Martin Pool
- show progress on dumb terminals by printing dots |
233 |
class DotsProgressBar(_BaseProgressBar): |
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
234 |
|
964
by Martin Pool
- show progress on dumb terminals by printing dots |
235 |
def __init__(self, **kwargs): |
236 |
_BaseProgressBar.__init__(self, **kwargs) |
|
237 |
self.last_msg = None |
|
238 |
self.need_nl = False |
|
239 |
||
240 |
def tick(self): |
|
241 |
self.update() |
|
242 |
||
243 |
def update(self, msg=None, current_cnt=None, total_cnt=None): |
|
244 |
if msg and msg != self.last_msg: |
|
245 |
if self.need_nl: |
|
246 |
self.to_file.write('\n') |
|
247 |
self.to_file.write(msg + ': ') |
|
248 |
self.last_msg = msg |
|
249 |
self.need_nl = True |
|
250 |
self.to_file.write('.') |
|
251 |
||
252 |
def clear(self): |
|
253 |
if self.need_nl: |
|
254 |
self.to_file.write('\n') |
|
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
255 |
self.need_nl = False |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
256 |
|
1551.2.28
by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents |
257 |
def child_update(self, message, current, total): |
258 |
self.tick() |
|
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
259 |
|
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
260 |
|
261 |
_progress_bar_types['dots'] = DotsProgressBar |
|
262 |
||
964
by Martin Pool
- show progress on dumb terminals by printing dots |
263 |
|
264 |
class TTYProgressBar(_BaseProgressBar): |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
265 |
"""Progress bar display object.
|
266 |
||
267 |
Several options are available to control the display. These can
|
|
268 |
be passed as parameters to the constructor or assigned at any time:
|
|
269 |
||
270 |
show_pct
|
|
271 |
Show percentage complete.
|
|
272 |
show_spinner
|
|
273 |
Show rotating baton. This ticks over on every update even
|
|
274 |
if the values don't change.
|
|
275 |
show_eta
|
|
276 |
Show predicted time-to-completion.
|
|
277 |
show_bar
|
|
278 |
Show bar graph.
|
|
279 |
show_count
|
|
280 |
Show numerical counts.
|
|
281 |
||
282 |
The output file should be in line-buffered or unbuffered mode.
|
|
283 |
"""
|
|
284 |
SPIN_CHARS = r'/-\|' |
|
661
by Martin Pool
- limit rate at which progress bar is updated |
285 |
|
964
by Martin Pool
- show progress on dumb terminals by printing dots |
286 |
|
287 |
def __init__(self, **kwargs): |
|
1185.33.60
by Martin Pool
Use full terminal width for verbose test output. |
288 |
from bzrlib.osutils import terminal_width |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
289 |
_BaseProgressBar.__init__(self, **kwargs) |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
290 |
self.spin_pos = 0 |
1185.33.60
by Martin Pool
Use full terminal width for verbose test output. |
291 |
self.width = terminal_width() |
1843.3.3
by John Arbash Meinel
Don't let the last_updates list grow without bound. |
292 |
self.last_updates = [] |
1843.3.4
by John Arbash Meinel
Remove get_eta's ability to modify last_updates. |
293 |
self._max_last_updates = 10 |
1551.2.28
by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents |
294 |
self.child_fraction = 0 |
1843.3.1
by John Arbash Meinel
Don't clear anything if nothing has been written. |
295 |
self._have_output = False |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
296 |
|
1793.1.1
by Aaron Bentley
Hide TTYProgressBars unless they last more than 1 second |
297 |
def throttle(self, old_msg): |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
298 |
"""Return True if the bar was updated too recently"""
|
1596.2.16
by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time. |
299 |
# time.time consistently takes 40/4000 ms = 0.01 ms.
|
2120.1.1
by John Arbash Meinel
Use time.time() because time.clock() is CPU time, not wall time |
300 |
# time.clock() is faster, but gives us CPU time, not wall-clock time
|
301 |
now = time.time() |
|
1793.1.1
by Aaron Bentley
Hide TTYProgressBars unless they last more than 1 second |
302 |
if self.start_time is not None and (now - self.start_time) < 1: |
303 |
return True |
|
304 |
if old_msg != self.last_msg: |
|
305 |
return False |
|
1596.2.16
by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time. |
306 |
interval = now - self.last_update |
307 |
# if interval > 0
|
|
308 |
if interval < self.MIN_PAUSE: |
|
309 |
return True |
|
964
by Martin Pool
- show progress on dumb terminals by printing dots |
310 |
|
1185.16.75
by Martin Pool
- improved eta estimation for progress bar |
311 |
self.last_updates.append(now - self.last_update) |
1843.3.3
by John Arbash Meinel
Don't let the last_updates list grow without bound. |
312 |
# Don't let the queue grow without bound
|
313 |
self.last_updates = self.last_updates[-self._max_last_updates:] |
|
964
by Martin Pool
- show progress on dumb terminals by printing dots |
314 |
self.last_update = now |
315 |
return False |
|
929
by Martin Pool
- progress bar: avoid repeatedly checking screen width |
316 |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
317 |
def tick(self): |
3006.3.2
by Robert Collins
More formatting corrections. |
318 |
self.update(self.last_msg, self.last_cnt, self.last_total, |
1551.2.27
by Aaron Bentley
Got propogation under test |
319 |
self.child_fraction) |
320 |
||
1551.2.28
by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents |
321 |
def child_update(self, message, current, total): |
1551.2.35
by Aaron Bentley
Fix division-by-zero |
322 |
if current is not None and total != 0: |
1551.2.30
by Aaron Bentley
Bugfixes to progress stuff |
323 |
child_fraction = float(current) / total |
324 |
if self.last_cnt is None: |
|
325 |
pass
|
|
326 |
elif self.last_cnt + child_fraction <= self.last_total: |
|
327 |
self.child_fraction = child_fraction |
|
328 |
else: |
|
329 |
mutter('not updating child fraction') |
|
330 |
if self.last_msg is None: |
|
331 |
self.last_msg = '' |
|
1551.2.28
by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents |
332 |
self.tick() |
333 |
||
3006.3.1
by Robert Collins
Minor PEP8 changes. |
334 |
def update(self, msg, current_cnt=None, total_cnt=None, |
1551.2.27
by Aaron Bentley
Got propogation under test |
335 |
child_fraction=0): |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
336 |
"""Update and redraw progress bar."""
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
337 |
if msg is None: |
338 |
msg = self.last_msg |
|
339 |
||
340 |
if total_cnt is None: |
|
341 |
total_cnt = self.last_total |
|
342 |
||
1308
by Martin Pool
- make progress bar more tolerant of out-of-range values |
343 |
if current_cnt < 0: |
344 |
current_cnt = 0 |
|
345 |
||
346 |
if current_cnt > total_cnt: |
|
347 |
total_cnt = current_cnt |
|
1570.1.9
by Robert Collins
Do not throttle updates to progress bars that change the message. |
348 |
|
1596.2.17
by Robert Collins
Notes on further progress tuning. |
349 |
## # optional corner case optimisation
|
350 |
## # currently does not seem to fire so costs more than saved.
|
|
351 |
## # trivial optimal case:
|
|
352 |
## # NB if callers are doing a clear and restore with
|
|
353 |
## # the saved values, this will prevent that:
|
|
354 |
## # in that case add a restore method that calls
|
|
355 |
## # _do_update or some such
|
|
356 |
## if (self.last_msg == msg and
|
|
357 |
## self.last_cnt == current_cnt and
|
|
358 |
## self.last_total == total_cnt and
|
|
359 |
## self.child_fraction == child_fraction):
|
|
360 |
## return
|
|
361 |
||
1570.1.9
by Robert Collins
Do not throttle updates to progress bars that change the message. |
362 |
old_msg = self.last_msg |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
363 |
# save these for the tick() function
|
364 |
self.last_msg = msg |
|
365 |
self.last_cnt = current_cnt |
|
366 |
self.last_total = total_cnt |
|
1596.2.17
by Robert Collins
Notes on further progress tuning. |
367 |
self.child_fraction = child_fraction |
368 |
||
369 |
# each function call takes 20ms/4000 = 0.005 ms,
|
|
370 |
# but multiple that by 4000 calls -> starts to cost.
|
|
371 |
# so anything to make this function call faster
|
|
372 |
# will improve base 'diff' time by up to 0.1 seconds.
|
|
1793.1.1
by Aaron Bentley
Hide TTYProgressBars unless they last more than 1 second |
373 |
if self.throttle(old_msg): |
1596.2.17
by Robert Collins
Notes on further progress tuning. |
374 |
return
|
375 |
||
376 |
if self.show_eta and self.start_time and self.last_total: |
|
377 |
eta = get_eta(self.start_time, self.last_cnt + self.child_fraction, |
|
378 |
self.last_total, last_updates = self.last_updates) |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
379 |
eta_str = " " + str_tdelta(eta) |
380 |
else: |
|
381 |
eta_str = "" |
|
382 |
||
383 |
if self.show_spinner: |
|
384 |
spin_str = self.SPIN_CHARS[self.spin_pos % 4] + ' ' |
|
385 |
else: |
|
386 |
spin_str = '' |
|
387 |
||
388 |
# always update this; it's also used for the bar
|
|
389 |
self.spin_pos += 1 |
|
390 |
||
1596.2.17
by Robert Collins
Notes on further progress tuning. |
391 |
if self.show_pct and self.last_total and self.last_cnt: |
392 |
pct = 100.0 * ((self.last_cnt + self.child_fraction) / self.last_total) |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
393 |
pct_str = ' (%5.1f%%)' % pct |
394 |
else: |
|
395 |
pct_str = '' |
|
396 |
||
397 |
if not self.show_count: |
|
398 |
count_str = '' |
|
1596.2.17
by Robert Collins
Notes on further progress tuning. |
399 |
elif self.last_cnt is None: |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
400 |
count_str = '' |
1596.2.17
by Robert Collins
Notes on further progress tuning. |
401 |
elif self.last_total is None: |
402 |
count_str = ' %i' % (self.last_cnt) |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
403 |
else: |
404 |
# make both fields the same size
|
|
1596.2.17
by Robert Collins
Notes on further progress tuning. |
405 |
t = '%i' % (self.last_total) |
406 |
c = '%*i' % (len(t), self.last_cnt) |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
407 |
count_str = ' ' + c + '/' + t |
408 |
||
409 |
if self.show_bar: |
|
410 |
# progress bar, if present, soaks up all remaining space
|
|
1596.2.17
by Robert Collins
Notes on further progress tuning. |
411 |
cols = self.width - 1 - len(self.last_msg) - len(spin_str) - len(pct_str) \ |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
412 |
- len(eta_str) - len(count_str) - 3 |
413 |
||
1596.2.17
by Robert Collins
Notes on further progress tuning. |
414 |
if self.last_total: |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
415 |
# number of markers highlighted in bar
|
1551.2.30
by Aaron Bentley
Bugfixes to progress stuff |
416 |
markers = int(round(float(cols) * |
1596.2.17
by Robert Collins
Notes on further progress tuning. |
417 |
(self.last_cnt + self.child_fraction) / self.last_total)) |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
418 |
bar_str = '[' + ('=' * markers).ljust(cols) + '] ' |
669
by Martin Pool
- don't show progress bar unless completion is known |
419 |
elif False: |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
420 |
# don't know total, so can't show completion.
|
421 |
# so just show an expanded spinning thingy
|
|
422 |
m = self.spin_pos % cols |
|
668
by Martin Pool
- fix sweeping bar progress indicator |
423 |
ms = (' ' * m + '*').ljust(cols) |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
424 |
|
425 |
bar_str = '[' + ms + '] ' |
|
669
by Martin Pool
- don't show progress bar unless completion is known |
426 |
else: |
427 |
bar_str = '' |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
428 |
else: |
429 |
bar_str = '' |
|
430 |
||
1596.2.17
by Robert Collins
Notes on further progress tuning. |
431 |
m = spin_str + bar_str + self.last_msg + count_str + pct_str + eta_str |
2095.4.4
by mbp at sourcefrog
Truncate progress bar rather than complaining if it's too long |
432 |
self.to_file.write('\r%-*.*s' % (self.width - 1, self.width - 1, m)) |
1843.3.1
by John Arbash Meinel
Don't clear anything if nothing has been written. |
433 |
self._have_output = True |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
434 |
#self.to_file.flush()
|
435 |
||
3006.3.2
by Robert Collins
More formatting corrections. |
436 |
def clear(self): |
1843.3.1
by John Arbash Meinel
Don't clear anything if nothing has been written. |
437 |
if self._have_output: |
438 |
self.to_file.write('\r%s\r' % (' ' * (self.width - 1))) |
|
439 |
self._have_output = False |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
440 |
#self.to_file.flush()
|
649
by Martin Pool
- some cleanups for the progressbar method |
441 |
|
1551.2.27
by Aaron Bentley
Got propogation under test |
442 |
|
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
443 |
_progress_bar_types['tty'] = TTYProgressBar |
444 |
||
445 |
||
1551.2.28
by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents |
446 |
class ChildProgress(_BaseProgressBar): |
1551.2.27
by Aaron Bentley
Got propogation under test |
447 |
"""A progress indicator that pushes its data to the parent"""
|
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
448 |
|
1551.2.29
by Aaron Bentley
Got stack handling under test |
449 |
def __init__(self, _stack, **kwargs): |
450 |
_BaseProgressBar.__init__(self, _stack=_stack, **kwargs) |
|
451 |
self.parent = _stack.top() |
|
1551.2.27
by Aaron Bentley
Got propogation under test |
452 |
self.current = None |
453 |
self.total = None |
|
454 |
self.child_fraction = 0 |
|
455 |
self.message = None |
|
456 |
||
457 |
def update(self, msg, current_cnt=None, total_cnt=None): |
|
458 |
self.current = current_cnt |
|
2592.6.11
by Robert Collins
* A progress bar has been added for knitpack -> knitpack fetching. |
459 |
if total_cnt is not None: |
460 |
self.total = total_cnt |
|
1551.2.27
by Aaron Bentley
Got propogation under test |
461 |
self.message = msg |
462 |
self.child_fraction = 0 |
|
463 |
self.tick() |
|
464 |
||
465 |
def child_update(self, message, current, total): |
|
1551.2.35
by Aaron Bentley
Fix division-by-zero |
466 |
if current is None or total == 0: |
1551.2.30
by Aaron Bentley
Bugfixes to progress stuff |
467 |
self.child_fraction = 0 |
468 |
else: |
|
469 |
self.child_fraction = float(current) / total |
|
1551.2.27
by Aaron Bentley
Got propogation under test |
470 |
self.tick() |
471 |
||
472 |
def tick(self): |
|
1551.2.30
by Aaron Bentley
Bugfixes to progress stuff |
473 |
if self.current is None: |
474 |
count = None |
|
475 |
else: |
|
476 |
count = self.current+self.child_fraction |
|
477 |
if count > self.total: |
|
1596.2.35
by Robert Collins
Subclass SequenceMatcher to get a slightly faster (in our case) find_longest_match routine. |
478 |
if __debug__: |
479 |
mutter('clamping count of %d to %d' % (count, self.total)) |
|
1551.2.30
by Aaron Bentley
Bugfixes to progress stuff |
480 |
count = self.total |
1551.2.27
by Aaron Bentley
Got propogation under test |
481 |
self.parent.child_update(self.message, count, self.total) |
482 |
||
1551.2.29
by Aaron Bentley
Got stack handling under test |
483 |
def clear(self): |
1551.2.30
by Aaron Bentley
Bugfixes to progress stuff |
484 |
pass
|
1551.2.29
by Aaron Bentley
Got stack handling under test |
485 |
|
1558.8.6
by Aaron Bentley
Fix note implementation |
486 |
def note(self, *args, **kwargs): |
1558.8.5
by Aaron Bentley
Pass note up the stack instead of using bzrlib.ui_factory |
487 |
self.parent.note(*args, **kwargs) |
488 |
||
3146.6.1
by Aaron Bentley
InterDifferingSerializer shows a progress bar |
489 |
|
490 |
class InstrumentedProgress(TTYProgressBar): |
|
491 |
"""TTYProgress variant that tracks outcomes"""
|
|
492 |
||
493 |
def __init__(self, *args, **kwargs): |
|
494 |
self.always_throttled = True |
|
495 |
self.never_throttle = False |
|
496 |
TTYProgressBar.__init__(self, *args, **kwargs) |
|
497 |
||
498 |
def throttle(self, old_message): |
|
499 |
if self.never_throttle: |
|
500 |
result = False |
|
501 |
else: |
|
502 |
result = TTYProgressBar.throttle(self, old_message) |
|
503 |
if result is False: |
|
504 |
self.always_throttled = False |
|
505 |
||
506 |
||
648
by Martin Pool
- import aaron's progress-indicator code |
507 |
def str_tdelta(delt): |
508 |
if delt is None: |
|
509 |
return "-:--:--" |
|
660
by Martin Pool
- use plain unix time, not datetime module |
510 |
delt = int(round(delt)) |
511 |
return '%d:%02d:%02d' % (delt/3600, |
|
512 |
(delt/60) % 60, |
|
513 |
delt % 60) |
|
514 |
||
515 |
||
1185.16.75
by Martin Pool
- improved eta estimation for progress bar |
516 |
def get_eta(start_time, current, total, enough_samples=3, last_updates=None, n_recent=10): |
660
by Martin Pool
- use plain unix time, not datetime module |
517 |
if start_time is None: |
518 |
return None |
|
519 |
||
520 |
if not total: |
|
521 |
return None |
|
522 |
||
523 |
if current < enough_samples: |
|
524 |
return None |
|
525 |
||
526 |
if current > total: |
|
527 |
return None # wtf? |
|
528 |
||
2120.1.1
by John Arbash Meinel
Use time.time() because time.clock() is CPU time, not wall time |
529 |
elapsed = time.time() - start_time |
660
by Martin Pool
- use plain unix time, not datetime module |
530 |
|
531 |
if elapsed < 2.0: # not enough time to estimate |
|
532 |
return None |
|
533 |
||
534 |
total_duration = float(elapsed) * float(total) / float(current) |
|
535 |
||
536 |
assert total_duration >= elapsed |
|
537 |
||
1185.16.75
by Martin Pool
- improved eta estimation for progress bar |
538 |
if last_updates and len(last_updates) >= n_recent: |
539 |
avg = sum(last_updates) / float(len(last_updates)) |
|
540 |
time_left = avg * (total - current) |
|
541 |
||
542 |
old_time_left = total_duration - elapsed |
|
543 |
||
544 |
# We could return the average, or some other value here
|
|
545 |
return (time_left + old_time_left) / 2 |
|
546 |
||
660
by Martin Pool
- use plain unix time, not datetime module |
547 |
return total_duration - elapsed |
648
by Martin Pool
- import aaron's progress-indicator code |
548 |
|
649
by Martin Pool
- some cleanups for the progressbar method |
549 |
|
1551.2.32
by Aaron Bentley
Handle progress phases more nicely in merge |
550 |
class ProgressPhase(object): |
551 |
"""Update progress object with the current phase"""
|
|
552 |
def __init__(self, message, total, pb): |
|
553 |
object.__init__(self) |
|
554 |
self.pb = pb |
|
555 |
self.message = message |
|
556 |
self.total = total |
|
557 |
self.cur_phase = None |
|
558 |
||
559 |
def next_phase(self): |
|
560 |
if self.cur_phase is None: |
|
561 |
self.cur_phase = 0 |
|
562 |
else: |
|
563 |
self.cur_phase += 1 |
|
2592.6.11
by Robert Collins
* A progress bar has been added for knitpack -> knitpack fetching. |
564 |
assert self.cur_phase < self.total |
1551.2.32
by Aaron Bentley
Handle progress phases more nicely in merge |
565 |
self.pb.update(self.message, self.cur_phase, self.total) |