|
|
|
@ -21,9 +21,7 @@ class ETA(object):
|
|
|
|
|
def format_time(self, seconds):
|
|
|
|
|
return time.strftime('%H:%M:%S', time.gmtime(seconds))
|
|
|
|
|
def update(self, pbar):
|
|
|
|
|
if pbar.currval == 0:
|
|
|
|
|
return _('Time').decode('utf-8') + ': --:--:--'
|
|
|
|
|
elif pbar.finished:
|
|
|
|
|
if pbar.finished:
|
|
|
|
|
return _('Time').decode('utf-8') + ': %s' \
|
|
|
|
|
%self.format_time(pbar.seconds_elapsed)
|
|
|
|
|
else:
|
|
|
|
@ -111,14 +109,11 @@ class ProgressBar(object):
|
|
|
|
|
def _format_line(self):
|
|
|
|
|
return ''.join(self._format_widgets()).ljust(self.term_width)
|
|
|
|
|
|
|
|
|
|
def _need_update(self):
|
|
|
|
|
return int(self.percentage()) != int(self.prev_percentage)
|
|
|
|
|
|
|
|
|
|
def update(self, value):
|
|
|
|
|
"Updates the progress bar to a new value."
|
|
|
|
|
assert 0 <= value <= self.maxval
|
|
|
|
|
self.currval = value
|
|
|
|
|
if not self._need_update() or self.finished:
|
|
|
|
|
if self.finished:
|
|
|
|
|
return
|
|
|
|
|
if not self.start_time:
|
|
|
|
|
self.start_time = time.time()
|
|
|
|
|