Merged with lp:python-apt.

1 files changed, 22 insertions, 3 deletions

diff --git a/apt/progress/__init__.py b/apt/progress/__init__.py
index 68441cfa..3be197f7 100644
--- a/apt/progress/__init__.py
+++ b/apt/progress/__init__.py
@@ -107,14 +107,20 @@ class FetchProgress(object):
     def stop(self):
         """Called when all files have been fetched."""
 
-    def updateStatus(self, uri, descr, shortDescr, status, fileSize, 
-                     partialSize):
+    def updateStatus(self, uri, descr, shortDescr, status):
         """Called when the status of an item changes.
 
         This happens eg. when the downloads fails or is completed.
         """
+    def update_status_full(self, uri, descr, short_descr, status, file_size, 
+                           partial_size):
+        """Called when the status of an item changes.
+
+        This happens eg. when the downloads fails or is completed. This
+        version include information on current filesize and partial size
+        """
 
-    def pulse(self, items):
+    def pulse(self):
         """Called periodically to update the user interface.
 
         Return True to continue or False to cancel.
@@ -126,6 +132,19 @@ class FetchProgress(object):
                         float(self.currentCPS))
         return True
 
+    def pulse_items(self, items):
+        """Called periodically to update the user interface.
+        This function includes details about the items being fetched
+        Return True to continue or False to cancel.
+
+        """
+        self.percent = (((self.currentBytes + self.currentItems) * 100.0) /
+                        float(self.totalBytes + self.totalItems))
+        if self.currentCPS > 0:
+            self.eta = ((self.totalBytes - self.currentBytes) /
+                        float(self.currentCPS))
+        return True
+
     def mediaChange(self, medium, drive):
         """react to media change events."""