Changeset 1793

Timestamp:

11/14/08 10:11:24 (16 months ago)

Author:

JensDiemer

Message:

MD5sum_calc: v0.2.8 more status information | status performance calculated for a short term only

Files:

• CodeSnippets/MD5sum_calc/md5sum_calc.py (modified) (5 diffs)

CodeSnippets/MD5sum_calc/md5sum_calc.py

@@ -20 +20 @@
 __url__     = "http://www.jensdiemer.de"
 
-__version__ = "0.2.7"
+__version__ = "0.2.8"
 
 __history__ = """
+v0.2.8
+    - more status information
+    - status performance calculated for a short term only
 v0.2.7
     - Work-a-round if under Windows only a Driveletter given, see:
@@ -50 +53 @@
 """
 
-import sys, os, md5, ConfigParser, datetime, time
+import sys, os, string, md5, ConfigParser, datetime, time
 
 BUFSIZE = 65536
@@ -117 +120 @@
 print "_" * 79
 print "  %s v%s\n" % (__info__, __version__)
+
+
+def human_time(t):
+    if t>3600:
+        divisor = 3600.0
+        unit = "h"
+    elif t>60:
+        divisor = 60.0
+        unit = "min"
+    else:
+        divisor = 1
+        unit = "sec"
+        
+    return "%.1f%s" % (round(t/divisor, 2), unit)
 
 
@@ -235 +252 @@
                 self.write_md5file(md5sum)
 
-
-    def create_md5sum(self):
+    def create_md5sum(self):       
         file_size = os.stat(self.file_name_path).st_size
-        time_threshold = start_time = int(time.time())
+        time_threshold = start_time = time.time()
         try:
             f = file(self.file_name_path, "rb")
             m = md5.new()
-            bytesreaded = 0
+            bytesreaded = old_readed = 0
             threshold = file_size / 10
             while 1:
@@ -250 +266 @@
                     break
 
-                current_time = int(time.time())
-                if current_time > time_threshold:
+                current_time = time.time()
+                if current_time > (time_threshold + 0.5):
 
                     elapsed = float(current_time-start_time)      # Vergangene Zeit
                     estimated = elapsed / bytesreaded * file_size # Gesch�te Zeit
-                    performance = bytesreaded / elapsed / 1024 / 1024
-
-                    if estimated>60:
-                        time_info = "%.1f/%.1fmin" % (elapsed/60, estimated/60)
-                    else:
-                        time_info = "%.0f/%.1fsec" % (elapsed, estimated)
-
+                    remain = estimated - elapsed
+                    
+                    diff_bytes = bytesreaded-old_readed
+                    diff_time = current_time-time_threshold
+                    performance = diff_bytes / diff_time / 1024.0 / 1024.0
+
+                    percent = round(float(bytesreaded)/file_size*100.0, 2)
+
+                    infoline = (
+                        "   "
+                        "%(percent).1f%%"
+                        " - current: %(elapsed)s"
+                        " - total: %(estimated)s"
+                        " - remain: %(remain)s"
+                        " - %(perf).1fMB/sec"
+                        "   "
+                    ) % {
+                        "percent"  : percent,
+                        "elapsed"  : human_time(elapsed),
+                        "estimated": human_time(estimated),
+                        "remain"   : human_time(remain),
+                        "perf"     : performance,
+                    }
                     sys.stdout.write("\r")
-                    sys.stdout.write(
-                        "%3.i%% %s %.1fMB/sec    " % (
-                            round(float(bytesreaded)/file_size*100),
-                            time_info,
-                            performance
-                        )
-                    )
+                    sys.stdout.write(string.center(infoline, 79))
+                    
                     time_threshold = current_time
+                    old_readed = bytesreaded
+                    
                 m.update(data)
             end_time = time.time()