keryx team mailing list archive

[Jack N <watch.and.learn@xxxxxxxxxxx>]

Jack N has proposed merging lp:~jaseen/keryx/devel into lp:keryx.

Requested reviews:
    Chris Oliver (excid3)

minor feature fix
-- 
https://code.launchpad.net/~jaseen/keryx/devel/+merge/9866
Your team Keryx Development Team is subscribed to branch lp:keryx.

=== modified file 'lib/wxkeryx/download.py' (properties changed: -x to +x)
--- lib/wxkeryx/download.py	2009-07-28 20:34:54 +0000
+++ lib/wxkeryx/download.py	2009-08-08 05:47:47 +0000
@@ -84,6 +84,7 @@
         wx.CallAfter(self.LogMessage, msg)
 
         success = True
+        self.numfile = 0
         for data in self.files:
             if abortEvent(): return [1, self.files]
 
@@ -99,6 +100,7 @@
             #TODO: Change this to file progress (move to self.progress)
 
             self.curfile = end
+            self.numfile += 1
             if (url[-3:] == "deb" and (not os.path.exists(file))) or (url[-3:] != "deb"):   # Download only deb files that don't exist but still all gz files
                 try: # Attempt to download the file
                     msg = _("Downloading: ") + url + "\n"
@@ -158,7 +160,7 @@
         else:                   fraction = float(blocks*size)/float(total)
 
         wx.CallAfter(self.SetGauge, int(round(fraction*100,2)))
-        msg = self.curfile + "\n" + str(int(round(fraction*100,2))) + " % of " + lib.convert_file_size(total) + " Total - " + str(self.numfiles)
+        msg = self.curfile + "\n" + str(int(round(fraction*100,2))) + " % of " + lib.convert_file_size(total) + " - File "+ str(self.numfile) + "/" + str(self.numfiles)
         wx.CallAfter(self.SetFile, msg)
 
     def LogMessage(self, msg):