modified progressbar

console/application/function.py

@@ -481,7 +481,7 @@ def get_Progress(client, sid, pid, id):
     temp_progress = -1
     last_message = ''
     percent = returnProgr.percent
-    while percent <= 100 and percent >= 0 :
+    while percent <= 100 and percent >= 0:
         if temp_progress != percent:
 #            last_message = print_progress(returnProgr, last_msg = last_message)
             last_message = print_progressbar(returnProgr, pbar,
@@ -491,6 +491,8 @@ def get_Progress(client, sid, pid, id):
                 print
                 return
             temp_progress = percent
+        else:
+            pbar.update(percent)
         time.sleep(1)
         returnProgr = client.service.get_progress(sid, pid, id)
         percent = returnProgr.percent

console/application/progressbar.py

@@ -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()