gget r39 - trunk/gget

[johans svn gnome org]

Author: johans
Date: Wed Jul 23 09:46:47 2008
New Revision: 39
URL: http://svn.gnome.org/viewvc/gget?rev=39&view=rev

Log:
Merged new version of metalink.py from SVN.

Modified:
   trunk/gget/metalink.py

Modified: trunk/gget/metalink.py
==============================================================================
--- trunk/gget/metalink.py	(original)
+++ trunk/gget/metalink.py	Wed Jul 23 09:46:47 2008
@@ -623,7 +623,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 # Filename: $URL: https://metalinks.svn.sourceforge.net/svnroot/metalinks/checker/download.py $
-# Last Updated: $Date: 2008-07-16 08:19:38 +0200 (ons, 16 jul 2008) $
+# Last Updated: $Date: 2008-07-23 06:54:20 +0200 (ons, 23 jul 2008) $
 # Author(s): Neil McNab
 #
 # Description:
@@ -1149,6 +1149,7 @@
         self.checksums = checksums
         self.block_size = 1024
         self.counter = 0
+        self.total = 0
         self.temp = urlopen(remote_file)
         headers = self.temp.info()
         
@@ -1180,11 +1181,12 @@
         block = self.temp.read(self.block_size)
         self.data.write(block)
         self.counter += 1
+        self.total += len(block)
 
         self.resume.set_block_size(self.counter * self.block_size)
                         
         if self.status_handler != None:
-            self.status_handler(self.counter, self.block_size, self.size)
+            self.status_handler(self.total, 1, self.size)
 
         if self.bitrate_handler != None:
             self.bitrate_handler(self.get_bitrate(self.counter * self.block_size))
@@ -1878,7 +1880,6 @@
         self.resume.update_block_size(self.chunk_size)
             
         return Manager.run(self, 0.1)
-        
 
     def cycle(self):
         '''
@@ -1918,6 +1919,15 @@
             
 
     def update(self):
+        if self.status_handler != None:
+            #count = int(self.byte_total()/self.chunk_size)
+            #if self.byte_total() % self.chunk_size:
+            #    count += 1
+            #self.status_handler(count, self.chunk_size, self.size)
+            self.status_handler(self.byte_total(), 1, self.size)    
+        if self.bitrate_handler != None:
+            self.bitrate_handler(self.get_bitrate(self.byte_total()))
+        
         next = self.next_url()
         
         if next == None:
@@ -1925,12 +1935,6 @@
         
         index = self.get_chunk_index()
         if index != None:
-            if self.status_handler != None:
-                self.status_handler(int(self.byte_total()/self.chunk_size), self.chunk_size, self.size)
-                
-            if self.bitrate_handler != None:
-                self.bitrate_handler(self.get_bitrate(self.byte_total()))
-            
             start = index * self.chunk_size
             end = start + self.chunk_size
             if end > self.size:
@@ -2091,6 +2095,8 @@
         for host in self.sockets:
             host.close()
 
+        self.update()
+
         #try:
         size = os.stat(self.localfile).st_size
         if size == 0:
@@ -2542,7 +2548,7 @@
             self.error = _("bad file handle")
             self.response = None
             return
-        
+
         self.bytes += size
         #print self.bytes, self.byte_count
         if self.bytes >= self.byte_count:
@@ -3888,8 +3894,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 # Filename: $URL: https://metalinks.svn.sourceforge.net/svnroot/metalinks/checker/console.py $
-# Last Updated: $Date: 2008-07-04 22:01:37 +0200 (fre, 04 jul 2008) $
-# Version: $Rev: 194 $
+# Last Updated: $Date: 2008-07-22 10:30:17 +0200 (tis, 22 jul 2008) $
+# Version: $Rev: 200 $
 # Author(s): Neil McNab
 #
 # Description:
@@ -4082,7 +4088,10 @@
             
         bitinfo = ""
         if self.bitrate != None and self.show_bitrate:
-            bitinfo = " %.0f kbps" % self.bitrate
+            if self.bitrate > 1000:
+                bitinfo = " %.2f Mbps" % (float(self.bitrate) / float(1000))
+            else:
+                bitinfo = " %.0f kbps" % self.bitrate
 
         length = self.length - 2 - len(percenttxt) - len(bytes) - len(bitinfo)