Progress bar updates as needed and shows TX and %.

The progress bar now shows the transfer rate and percentage complete
instead of the source and destination.

The updating of the progress bar every loop was killing the CPU performance
and causing the Xorg process to go crazy. By only updating the progress bar
if the percent complete value changes stop this from happening.

lib/mintstick.py

@@ -146,6 +146,7 @@ def raw_write(self, source, target):
       while gtk.events_pending():
         gtk.main_iteration(True) 
       total_size = float(os.path.getsize(source))   
+      old_size = 0.0
       # Add launcher string, only when not root
       launcher = ''
       size=''
@@ -155,7 +156,11 @@ def raw_write(self, source, target):
       else:
 	      output = Popen(['/usr/bin/python', '/usr/lib/mintstick/raw_write.py','-s',source,'-t',target], shell=False, stdout=PIPE)	
       while output.stdout.readline():
-        size = output.stdout.readline().strip()
+        size_and_rate = output.stdout.readline().strip()
+        size_and_rate = size_and_rate.split()
+        size = size_and_rate[0]
+        if len(size_and_rate) > 1:
+			rate = float(size_and_rate[1]) 
         try:
           size = float(size)
           flag = True
@@ -164,7 +169,11 @@ def raw_write(self, source, target):
         while gtk.events_pending():
             gtk.main_iteration(True)
         if flag:
-          progress.set_fraction(size)
+			if round(size*1000) > old_size:
+			  progress.set_fraction(size)
+			  progress.set_text(_("%3.1f%% %s " % (float(size)*100,self.rate_fmt(rate))))
+			  old_size = round(size*1000)
+
       if size == 1.0:
         self.logger(_('Image ')+source.split('/')[-1]+_(' successfully written to')+target)
         self.success()
@@ -173,6 +182,13 @@ def raw_write(self, source, target):
         self.emergency()
         return False
 
+    def rate_fmt(self,num):
+        for x in ['bytes','KB','MB','GB']:
+            if num < 1024.0:
+                return "%3.1f%s/s" % (num, x)
+            num /= 1024.0
+        return "%3.1f%s/s" % (num, 'TB')
+
     def success(self):
         dialog = self.wTree.get_widget("success_dialog")
         self.final_unsensitive()

lib/raw_write.py

@@ -4,6 +4,7 @@
 from subprocess import Popen,PIPE,call,STDOUT
 import os, sys
 import getopt
+import time
 
 def raw_write(source, target):
     bs = 1024
@@ -12,13 +13,15 @@ def raw_write(source, target):
     total_size = float(os.path.getsize(source))
     print total_size
     output = open(target, 'wb')
+    start_time = time.time()
     while True:
 	buffer = input.read(bs)
 	if len(buffer) == 0:
 	  break
 	output.write(buffer)
 	size = size + bs
-	print size/total_size
+	elapsed_time = time.time() - start_time
+	print "%f %f" % (size/total_size,size/elapsed_time)
 
     output.flush()    
     #os.fsync(output.fileno())
@@ -56,4 +59,4 @@ def main():
     raw_write(source, target)
 
 if __name__ == "__main__":
-    main()
+    main()