Keryx

Merge lp://staging/~jacseen/keryx/devel into lp://staging/keryx/stable

  1. devel
  2. Merge into stable
Proposed by Jack N
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~jacseen/keryx/devel
Merge into: lp://staging/keryx/stable
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~jacseen/keryx/devel
Reviewer Review Type Date Requested Status
Chris Oliver Pending
Review via email: mp+9866@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Jack N (jacseen) wrote :

minor feature fix

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/wxkeryx/download.py' (properties changed: -x to +x)
2--- lib/wxkeryx/download.py 2009-07-28 20:34:54 +0000
3+++ lib/wxkeryx/download.py 2009-08-08 05:47:47 +0000
4@@ -84,6 +84,7 @@
5 wx.CallAfter(self.LogMessage, msg)
6
7 success = True
8+ self.numfile = 0
9 for data in self.files:
10 if abortEvent(): return [1, self.files]
11
12@@ -99,6 +100,7 @@
13 #TODO: Change this to file progress (move to self.progress)
14
15 self.curfile = end
16+ self.numfile += 1
17 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
18 try: # Attempt to download the file
19 msg = _("Downloading: ") + url + "\n"
20@@ -158,7 +160,7 @@
21 else: fraction = float(blocks*size)/float(total)
22
23 wx.CallAfter(self.SetGauge, int(round(fraction*100,2)))
24- msg = self.curfile + "\n" + str(int(round(fraction*100,2))) + " % of " + lib.convert_file_size(total) + " Total - " + str(self.numfiles)
25+ msg = self.curfile + "\n" + str(int(round(fraction*100,2))) + " % of " + lib.convert_file_size(total) + " - File "+ str(self.numfile) + "/" + str(self.numfiles)
26 wx.CallAfter(self.SetFile, msg)
27
28 def LogMessage(self, msg):

Subscribers

People subscribed via source and target branches

to all changes: