]> git.itanic.dy.fi Git - emerge-timer/commitdiff
Add current emerge info
authorEsko Kokkonen <esko.kokkonen@gmail.com>
Mon, 11 Jul 2011 18:30:35 +0000 (21:30 +0300)
committerEsko Kokkonen <esko.kokkonen@gmail.com>
Mon, 11 Jul 2011 18:30:35 +0000 (21:30 +0300)
Now displays info about the current emerge including the current time
and the average emerge time the package has.

emerge-timer.py

index 077e9c0adc963980f29fab065d1587cb12f9df55..511357182d7bdd0e9fac087fb2915647c978ec35 100755 (executable)
@@ -118,10 +118,27 @@ def get_package(name):
     sys.exit(1)
 
 
-def print_times(package, times):
+def print_times(package, times, silent):
     times.sort()
     times.reverse()
 
+    if silent == True:
+        if emerge_number == 1:
+            print("\t  previous emerge time"),
+            organize_times(times[0][0])
+            print("(only one emerge previously)")
+        else:
+            print("\t  average emerge time: "),
+            all_times = 0
+            for i in times:
+                all_times += i[0]
+
+            organize_times(all_times/len(times))
+
+        print('\n')
+        return
+
+
     if emerge_number == 1:
         print(green_start + package + color_stop + " emerged once")
 
@@ -194,13 +211,19 @@ def current_emerges(f):
                 print("Currently emerging: ")
                 a = 0
             print("\t" + green_start + p[0] + color_stop),
-            print('\n\tcurrent emerge time: '),
+            print('\n\t  current emerge time: '),
             organize_times(difference.total_seconds())
-            print '\n'
+            print
+
+            name = (p[0].partition('-')[0] + '-' +
+                    p[0].partition('-')[2].partition('-')[0])
+            main_loop(f, name, True)
 
 
 def main_loop(f, package, silent):
     global emerge_number
+    emerge_number = 0
+    f.seek(0)
 
     # MAIN LOOP
     for line in f:
@@ -238,7 +261,7 @@ def main_loop(f, package, silent):
 
                     except IndexError: pass
 
-    print_times(package, times)
+    print_times(package, times, silent)
 
 
 def main(status):
@@ -247,7 +270,7 @@ def main(status):
     f = open_log()
 
     if status == 'current':
-        current_emerges(f)
+        current_packages = current_emerges(f)
         return
     else:
         pass