~bzr-pqm/bzr/bzr.dev

649 by Martin Pool
- some cleanups for the progressbar method
1
# Copyright (C) 2005 Aaron Bentley <aaron.bentley@utoronto.ca>
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
2
# Copyright (C) 2005, 2006 Canonical <canonical.com>
648 by Martin Pool
- import aaron's progress-indicator code
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
17
649 by Martin Pool
- some cleanups for the progressbar method
18
889 by Martin Pool
- show progress bar during inventory conversion to weave, and make profiling optional
19
"""Simple text-mode progress indicator.
649 by Martin Pool
- some cleanups for the progressbar method
20
21
To display an indicator, create a ProgressBar object.  Call it,
22
passing Progress objects indicating the current state.  When done,
23
call clear().
24
25
Progress is suppressed when output is not sent to a terminal, so as
26
not to clutter log files.
27
"""
28
652 by Martin Pool
doc
29
# TODO: should be a global option e.g. --silent that disables progress
30
# indicators, preferably without needing to adjust all code that
31
# potentially calls them.
32
962 by Martin Pool
todo
33
# TODO: If not on a tty perhaps just print '......' for the benefit of IDEs, etc
655 by Martin Pool
- better calculation of progress bar position
34
934 by Martin Pool
todo
35
# TODO: Optionally show elapsed time instead/as well as ETA; nicer
36
# when the rate is unpredictable
37
649 by Martin Pool
- some cleanups for the progressbar method
38
648 by Martin Pool
- import aaron's progress-indicator code
39
import sys
660 by Martin Pool
- use plain unix time, not datetime module
40
import time
964 by Martin Pool
- show progress on dumb terminals by printing dots
41
import os
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
42
from collections import deque
648 by Martin Pool
- import aaron's progress-indicator code
43
649 by Martin Pool
- some cleanups for the progressbar method
44
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
45
import bzrlib.errors as errors
1558.7.9 by Aaron Bentley
Bad change. (broke tests). Reverted.
46
from bzrlib.trace import mutter 
1558.8.3 by Aaron Bentley
Use ui_factory.clear_term in pb.note
47
import bzrlib.ui
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
48
49
649 by Martin Pool
- some cleanups for the progressbar method
50
def _supports_progress(f):
695 by Martin Pool
- don't display progress bars on really dumb terminals
51
    if not hasattr(f, 'isatty'):
52
        return False
53
    if not f.isatty():
54
        return False
55
    if os.environ.get('TERM') == 'dumb':
56
        # e.g. emacs compile window
57
        return False
58
    return True
649 by Martin Pool
- some cleanups for the progressbar method
59
60
61
964 by Martin Pool
- show progress on dumb terminals by printing dots
62
def ProgressBar(to_file=sys.stderr, **kwargs):
63
    """Abstract factory"""
64
    if _supports_progress(to_file):
65
        return TTYProgressBar(to_file=to_file, **kwargs)
66
    else:
67
        return DotsProgressBar(to_file=to_file, **kwargs)
68
    
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
69
 
70
class ProgressBarStack(object):
71
    """A stack of progress bars."""
72
73
    def __init__(self,
74
                 to_file=sys.stderr,
75
                 show_pct=False,
1551.2.33 by Aaron Bentley
Hide ETA, show spinner by default
76
                 show_spinner=True,
77
                 show_eta=False,
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
78
                 show_bar=True,
79
                 show_count=True,
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
80
                 to_messages_file=sys.stdout,
81
                 klass=None):
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
82
        """Setup the stack with the parameters the progress bars should have."""
83
        self._to_file = to_file
84
        self._show_pct = show_pct
85
        self._show_spinner = show_spinner
86
        self._show_eta = show_eta
87
        self._show_bar = show_bar
88
        self._show_count = show_count
89
        self._to_messages_file = to_messages_file
90
        self._stack = []
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
91
        self._klass = klass or TTYProgressBar
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
92
1551.2.29 by Aaron Bentley
Got stack handling under test
93
    def top(self):
94
        if len(self._stack) != 0:
95
            return self._stack[-1]
96
        else:
97
            return None
98
1558.8.1 by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning'
99
    def bottom(self):
100
        if len(self._stack) != 0:
101
            return self._stack[0]
102
        else:
103
            return None
104
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
105
    def get_nested(self):
106
        """Return a nested progress bar."""
1551.2.29 by Aaron Bentley
Got stack handling under test
107
        if len(self._stack) == 0:
108
            func = self._klass
109
        else:
110
            func = self.top().child_progress
111
        new_bar = func(to_file=self._to_file,
112
                       show_pct=self._show_pct,
113
                       show_spinner=self._show_spinner,
114
                       show_eta=self._show_eta,
115
                       show_bar=self._show_bar,
116
                       show_count=self._show_count,
117
                       to_messages_file=self._to_messages_file,
118
                       _stack=self)
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
119
        self._stack.append(new_bar)
120
        return new_bar
121
122
    def return_pb(self, bar):
123
        """Return bar after its been used."""
1594.1.4 by Robert Collins
Fix identity test in ProgressBarStack.return_pb
124
        if bar is not self._stack[-1]:
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
125
            raise errors.MissingProgressBarFinish()
126
        self._stack.pop()
127
128
 
964 by Martin Pool
- show progress on dumb terminals by printing dots
129
class _BaseProgressBar(object):
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
130
964 by Martin Pool
- show progress on dumb terminals by printing dots
131
    def __init__(self,
132
                 to_file=sys.stderr,
133
                 show_pct=False,
134
                 show_spinner=False,
135
                 show_eta=True,
136
                 show_bar=True,
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
137
                 show_count=True,
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
138
                 to_messages_file=sys.stdout,
139
                 _stack=None):
964 by Martin Pool
- show progress on dumb terminals by printing dots
140
        object.__init__(self)
141
        self.to_file = to_file
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
142
        self.to_messages_file = to_messages_file
964 by Martin Pool
- show progress on dumb terminals by printing dots
143
        self.last_msg = None
144
        self.last_cnt = None
145
        self.last_total = None
146
        self.show_pct = show_pct
147
        self.show_spinner = show_spinner
148
        self.show_eta = show_eta
149
        self.show_bar = show_bar
150
        self.show_count = show_count
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
151
        self._stack = _stack
1596.2.16 by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
152
        # seed throttler
153
        self.MIN_PAUSE = 0.1 # seconds
154
        now = time.clock()
155
        # starting now
156
        self.start_time = now
157
        # next update should not throttle
158
        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.
159
160
    def finished(self):
161
        """Return this bar to its progress stack."""
162
        self.clear()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
163
        assert self._stack is not None
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
164
        self._stack.return_pb(self)
1104 by Martin Pool
- Add a simple UIFactory
165
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
166
    def note(self, fmt_string, *args, **kwargs):
167
        """Record a note without disrupting the progress bar."""
1558.8.3 by Aaron Bentley
Use ui_factory.clear_term in pb.note
168
        bzrlib.ui.ui_factory.clear_term()
1558.7.9 by Aaron Bentley
Bad change. (broke tests). Reverted.
169
        self.to_messages_file.write(fmt_string % args)
170
        self.to_messages_file.write('\n')
1104 by Martin Pool
- Add a simple UIFactory
171
1551.2.29 by Aaron Bentley
Got stack handling under test
172
    def child_progress(self, **kwargs):
173
        return ChildProgress(**kwargs)
174
1104 by Martin Pool
- Add a simple UIFactory
175
176
class DummyProgress(_BaseProgressBar):
177
    """Progress-bar standin that does nothing.
178
179
    This can be used as the default argument for methods that
180
    take an optional progress indicator."""
181
    def tick(self):
182
        pass
183
184
    def update(self, msg=None, current=None, total=None):
185
        pass
186
1551.2.27 by Aaron Bentley
Got propogation under test
187
    def child_update(self, message, current, total):
188
        pass
189
1104 by Martin Pool
- Add a simple UIFactory
190
    def clear(self):
191
        pass
964 by Martin Pool
- show progress on dumb terminals by printing dots
192
        
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
193
    def note(self, fmt_string, *args, **kwargs):
194
        """See _BaseProgressBar.note()."""
1534.5.9 by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch.
195
1551.2.29 by Aaron Bentley
Got stack handling under test
196
    def child_progress(self, **kwargs):
197
        return DummyProgress(**kwargs)
1534.5.9 by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch.
198
964 by Martin Pool
- show progress on dumb terminals by printing dots
199
class DotsProgressBar(_BaseProgressBar):
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
200
964 by Martin Pool
- show progress on dumb terminals by printing dots
201
    def __init__(self, **kwargs):
202
        _BaseProgressBar.__init__(self, **kwargs)
203
        self.last_msg = None
204
        self.need_nl = False
205
        
206
    def tick(self):
207
        self.update()
208
        
209
    def update(self, msg=None, current_cnt=None, total_cnt=None):
210
        if msg and msg != self.last_msg:
211
            if self.need_nl:
212
                self.to_file.write('\n')
213
            
214
            self.to_file.write(msg + ': ')
215
            self.last_msg = msg
216
        self.need_nl = True
217
        self.to_file.write('.')
218
        
219
    def clear(self):
220
        if self.need_nl:
221
            self.to_file.write('\n')
222
        
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
223
    def child_update(self, message, current, total):
224
        self.tick()
964 by Martin Pool
- show progress on dumb terminals by printing dots
225
    
226
class TTYProgressBar(_BaseProgressBar):
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
227
    """Progress bar display object.
228
229
    Several options are available to control the display.  These can
230
    be passed as parameters to the constructor or assigned at any time:
231
232
    show_pct
233
        Show percentage complete.
234
    show_spinner
235
        Show rotating baton.  This ticks over on every update even
236
        if the values don't change.
237
    show_eta
238
        Show predicted time-to-completion.
239
    show_bar
240
        Show bar graph.
241
    show_count
242
        Show numerical counts.
243
244
    The output file should be in line-buffered or unbuffered mode.
245
    """
246
    SPIN_CHARS = r'/-\|'
661 by Martin Pool
- limit rate at which progress bar is updated
247
964 by Martin Pool
- show progress on dumb terminals by printing dots
248
249
    def __init__(self, **kwargs):
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
250
        from bzrlib.osutils import terminal_width
964 by Martin Pool
- show progress on dumb terminals by printing dots
251
        _BaseProgressBar.__init__(self, **kwargs)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
252
        self.spin_pos = 0
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
253
        self.width = terminal_width()
964 by Martin Pool
- show progress on dumb terminals by printing dots
254
        self.start_time = None
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
255
        self.last_updates = deque()
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
256
        self.child_fraction = 0
964 by Martin Pool
- show progress on dumb terminals by printing dots
257
    
258
259
    def throttle(self):
260
        """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.
261
        # time.time consistently takes 40/4000 ms = 0.01 ms.
262
        # but every single update to the pb invokes it.
263
        # so we use time.clock which takes 20/4000 ms = 0.005ms
264
        # on the downside, time.clock() appears to have approximately
265
        # 10ms granularity, so we treat a zero-time change as 'throttled.'
266
        
267
        now = time.clock()
268
        interval = now - self.last_update
269
        # if interval > 0
270
        if interval < self.MIN_PAUSE:
271
            return True
964 by Martin Pool
- show progress on dumb terminals by printing dots
272
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
273
        self.last_updates.append(now - self.last_update)
964 by Martin Pool
- show progress on dumb terminals by printing dots
274
        self.last_update = now
275
        return False
929 by Martin Pool
- progress bar: avoid repeatedly checking screen width
276
        
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
277
278
    def tick(self):
1551.2.27 by Aaron Bentley
Got propogation under test
279
        self.update(self.last_msg, self.last_cnt, self.last_total, 
280
                    self.child_fraction)
281
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
282
    def child_update(self, message, current, total):
1551.2.35 by Aaron Bentley
Fix division-by-zero
283
        if current is not None and total != 0:
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
284
            child_fraction = float(current) / total
285
            if self.last_cnt is None:
286
                pass
287
            elif self.last_cnt + child_fraction <= self.last_total:
288
                self.child_fraction = child_fraction
289
            else:
290
                mutter('not updating child fraction')
291
        if self.last_msg is None:
292
            self.last_msg = ''
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
293
        self.tick()
294
295
1551.2.27 by Aaron Bentley
Got propogation under test
296
    def update(self, msg, current_cnt=None, total_cnt=None, 
297
               child_fraction=0):
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
298
        """Update and redraw progress bar."""
299
1308 by Martin Pool
- make progress bar more tolerant of out-of-range values
300
        if current_cnt < 0:
301
            current_cnt = 0
302
            
303
        if current_cnt > total_cnt:
304
            total_cnt = current_cnt
1570.1.9 by Robert Collins
Do not throttle updates to progress bars that change the message.
305
        
1596.2.17 by Robert Collins
Notes on further progress tuning.
306
        ## # optional corner case optimisation 
307
        ## # currently does not seem to fire so costs more than saved.
308
        ## # trivial optimal case:
309
        ## # NB if callers are doing a clear and restore with
310
        ## # the saved values, this will prevent that:
311
        ## # in that case add a restore method that calls
312
        ## # _do_update or some such
313
        ## if (self.last_msg == msg and
314
        ##     self.last_cnt == current_cnt and
315
        ##     self.last_total == total_cnt and
316
        ##     self.child_fraction == child_fraction):
317
        ##     return
318
1570.1.9 by Robert Collins
Do not throttle updates to progress bars that change the message.
319
        old_msg = self.last_msg
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
320
        # save these for the tick() function
321
        self.last_msg = msg
322
        self.last_cnt = current_cnt
323
        self.last_total = total_cnt
1596.2.17 by Robert Collins
Notes on further progress tuning.
324
        self.child_fraction = child_fraction
325
326
        # each function call takes 20ms/4000 = 0.005 ms, 
327
        # but multiple that by 4000 calls -> starts to cost.
328
        # so anything to make this function call faster
329
        # will improve base 'diff' time by up to 0.1 seconds.
1570.1.9 by Robert Collins
Do not throttle updates to progress bars that change the message.
330
        if old_msg == self.last_msg and self.throttle():
1596.2.17 by Robert Collins
Notes on further progress tuning.
331
            return
332
333
        if self.show_eta and self.start_time and self.last_total:
334
            eta = get_eta(self.start_time, self.last_cnt + self.child_fraction, 
335
                    self.last_total, last_updates = self.last_updates)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
336
            eta_str = " " + str_tdelta(eta)
337
        else:
338
            eta_str = ""
339
340
        if self.show_spinner:
341
            spin_str = self.SPIN_CHARS[self.spin_pos % 4] + ' '            
342
        else:
343
            spin_str = ''
344
345
        # always update this; it's also used for the bar
346
        self.spin_pos += 1
347
1596.2.17 by Robert Collins
Notes on further progress tuning.
348
        if self.show_pct and self.last_total and self.last_cnt:
349
            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
350
            pct_str = ' (%5.1f%%)' % pct
351
        else:
352
            pct_str = ''
353
354
        if not self.show_count:
355
            count_str = ''
1596.2.17 by Robert Collins
Notes on further progress tuning.
356
        elif self.last_cnt is None:
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
357
            count_str = ''
1596.2.17 by Robert Collins
Notes on further progress tuning.
358
        elif self.last_total is None:
359
            count_str = ' %i' % (self.last_cnt)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
360
        else:
361
            # make both fields the same size
1596.2.17 by Robert Collins
Notes on further progress tuning.
362
            t = '%i' % (self.last_total)
363
            c = '%*i' % (len(t), self.last_cnt)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
364
            count_str = ' ' + c + '/' + t 
365
366
        if self.show_bar:
367
            # progress bar, if present, soaks up all remaining space
1596.2.17 by Robert Collins
Notes on further progress tuning.
368
            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
369
                   - len(eta_str) - len(count_str) - 3
370
1596.2.17 by Robert Collins
Notes on further progress tuning.
371
            if self.last_total:
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
372
                # number of markers highlighted in bar
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
373
                markers = int(round(float(cols) * 
1596.2.17 by Robert Collins
Notes on further progress tuning.
374
                              (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
375
                bar_str = '[' + ('=' * markers).ljust(cols) + '] '
669 by Martin Pool
- don't show progress bar unless completion is known
376
            elif False:
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
377
                # don't know total, so can't show completion.
378
                # so just show an expanded spinning thingy
379
                m = self.spin_pos % cols
668 by Martin Pool
- fix sweeping bar progress indicator
380
                ms = (' ' * m + '*').ljust(cols)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
381
                
382
                bar_str = '[' + ms + '] '
669 by Martin Pool
- don't show progress bar unless completion is known
383
            else:
384
                bar_str = ''
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
385
        else:
386
            bar_str = ''
387
1596.2.17 by Robert Collins
Notes on further progress tuning.
388
        m = spin_str + bar_str + self.last_msg + count_str + pct_str + eta_str
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
389
929 by Martin Pool
- progress bar: avoid repeatedly checking screen width
390
        assert len(m) < self.width
391
        self.to_file.write('\r' + m.ljust(self.width - 1))
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
392
        #self.to_file.flush()
393
            
964 by Martin Pool
- show progress on dumb terminals by printing dots
394
    def clear(self):        
929 by Martin Pool
- progress bar: avoid repeatedly checking screen width
395
        self.to_file.write('\r%s\r' % (' ' * (self.width - 1)))
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
396
        #self.to_file.flush()        
649 by Martin Pool
- some cleanups for the progressbar method
397
1551.2.27 by Aaron Bentley
Got propogation under test
398
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
399
class ChildProgress(_BaseProgressBar):
1551.2.27 by Aaron Bentley
Got propogation under test
400
    """A progress indicator that pushes its data to the parent"""
1551.2.29 by Aaron Bentley
Got stack handling under test
401
    def __init__(self, _stack, **kwargs):
402
        _BaseProgressBar.__init__(self, _stack=_stack, **kwargs)
403
        self.parent = _stack.top()
1551.2.27 by Aaron Bentley
Got propogation under test
404
        self.current = None
405
        self.total = None
406
        self.child_fraction = 0
407
        self.message = None
408
409
    def update(self, msg, current_cnt=None, total_cnt=None):
410
        self.current = current_cnt
411
        self.total = total_cnt
412
        self.message = msg
413
        self.child_fraction = 0
414
        self.tick()
415
416
    def child_update(self, message, current, total):
1551.2.35 by Aaron Bentley
Fix division-by-zero
417
        if current is None or total == 0:
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
418
            self.child_fraction = 0
419
        else:
420
            self.child_fraction = float(current) / total
1551.2.27 by Aaron Bentley
Got propogation under test
421
        self.tick()
422
423
    def tick(self):
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
424
        if self.current is None:
425
            count = None
426
        else:
427
            count = self.current+self.child_fraction
428
            if count > self.total:
1596.2.35 by Robert Collins
Subclass SequenceMatcher to get a slightly faster (in our case) find_longest_match routine.
429
                if __debug__:
430
                    mutter('clamping count of %d to %d' % (count, self.total))
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
431
                count = self.total
1551.2.27 by Aaron Bentley
Got propogation under test
432
        self.parent.child_update(self.message, count, self.total)
433
1551.2.29 by Aaron Bentley
Got stack handling under test
434
    def clear(self):
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
435
        pass
1551.2.29 by Aaron Bentley
Got stack handling under test
436
1551.2.27 by Aaron Bentley
Got propogation under test
437
 
648 by Martin Pool
- import aaron's progress-indicator code
438
def str_tdelta(delt):
439
    if delt is None:
440
        return "-:--:--"
660 by Martin Pool
- use plain unix time, not datetime module
441
    delt = int(round(delt))
442
    return '%d:%02d:%02d' % (delt/3600,
443
                             (delt/60) % 60,
444
                             delt % 60)
445
446
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
447
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
448
    if start_time is None:
449
        return None
450
451
    if not total:
452
        return None
453
454
    if current < enough_samples:
455
        return None
456
457
    if current > total:
458
        return None                     # wtf?
459
1596.2.16 by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
460
    elapsed = time.clock() - start_time
660 by Martin Pool
- use plain unix time, not datetime module
461
462
    if elapsed < 2.0:                   # not enough time to estimate
463
        return None
464
    
465
    total_duration = float(elapsed) * float(total) / float(current)
466
467
    assert total_duration >= elapsed
468
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
469
    if last_updates and len(last_updates) >= n_recent:
470
        while len(last_updates) > n_recent:
471
            last_updates.popleft()
472
        avg = sum(last_updates) / float(len(last_updates))
473
        time_left = avg * (total - current)
474
475
        old_time_left = total_duration - elapsed
476
477
        # We could return the average, or some other value here
478
        return (time_left + old_time_left) / 2
479
660 by Martin Pool
- use plain unix time, not datetime module
480
    return total_duration - elapsed
648 by Martin Pool
- import aaron's progress-indicator code
481
649 by Martin Pool
- some cleanups for the progressbar method
482
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
483
class ProgressPhase(object):
484
    """Update progress object with the current phase"""
485
    def __init__(self, message, total, pb):
486
        object.__init__(self)
487
        self.pb = pb
488
        self.message = message
489
        self.total = total
490
        self.cur_phase = None
491
492
    def next_phase(self):
493
        if self.cur_phase is None:
494
            self.cur_phase = 0
495
        else:
496
            self.cur_phase += 1
497
        assert self.cur_phase < self.total 
498
        self.pb.update(self.message, self.cur_phase, self.total)
499
500
648 by Martin Pool
- import aaron's progress-indicator code
501
def run_tests():
502
    import doctest
503
    result = doctest.testmod()
504
    if result[1] > 0:
505
        if result[0] == 0:
506
            print "All tests passed"
507
    else:
508
        print "No tests to run"
649 by Martin Pool
- some cleanups for the progressbar method
509
510
511
def demo():
964 by Martin Pool
- show progress on dumb terminals by printing dots
512
    sleep = time.sleep
513
    
514
    print 'dumb-terminal test:'
515
    pb = DotsProgressBar()
516
    for i in range(100):
517
        pb.update('Leoparden', i, 99)
518
        sleep(0.1)
519
    sleep(1.5)
520
    pb.clear()
521
    sleep(1.5)
522
    
523
    print 'smart-terminal test:'
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
524
    pb = ProgressBar(show_pct=True, show_bar=True, show_spinner=False)
649 by Martin Pool
- some cleanups for the progressbar method
525
    for i in range(100):
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
526
        pb.update('Elephanten', i, 99)
527
        sleep(0.1)
528
    sleep(2)
529
    pb.clear()
530
    sleep(1)
964 by Martin Pool
- show progress on dumb terminals by printing dots
531
649 by Martin Pool
- some cleanups for the progressbar method
532
    print 'done!'
533
648 by Martin Pool
- import aaron's progress-indicator code
534
if __name__ == "__main__":
649 by Martin Pool
- some cleanups for the progressbar method
535
    demo()