]> git.itanic.dy.fi Git - emerge-timer/commitdiff
Add a separate function that does the emerge time calculation
authorEsko Kokkonen <esko.kokkonen@gmail.com>
Sat, 2 Jul 2011 20:38:57 +0000 (23:38 +0300)
committerEsko Kokkonen <esko.kokkonen@gmail.com>
Sat, 2 Jul 2011 20:38:57 +0000 (23:38 +0300)
emerge-timer.py

index 47aef31b827659a9c4766473e6230da0a69242f5..7ab982e63bb44cded66f2cf0bc615b712cfa76fa 100755 (executable)
@@ -177,6 +177,16 @@ def print_times(times):
               package + color_stop)
 
 
+def calculate_emerge_time():
+    time2 = get_time(line, 2)
+    emerge_time = time2-time
+
+    print(str(len(times)+1) + "."),
+    date = date_printer(full_package, time, emerge_time)
+
+    times.append((emerge_time, date))
+
+
 get_package(package_name)
 
 print('-'*90)
@@ -184,24 +194,18 @@ for line in f:
     if package in line:
         st = line.split(' ')
         for string in st:
-            try:
-                if (package in string) and string[len(package)+1].isdigit():
-                    full_package = st[st.index(string)]
+            if (package in string) and string[len(package)+1].isdigit():
+                full_package = st[st.index(string)]
 
-                    if ((">>>" in line) and ("emerge" in line)):
-                        time = get_time(line, 1)
+                if ((">>>" in line) and ("emerge" in line)):
+                    time = get_time(line, 1)
 
+                try:
                     if (":::" in line) and ("completed emerge" in line):
                         emerge_number += 1
+                        calculate_emerge_time()
+                except IndexError: pass
 
-                        time2 = get_time(line, 2)
-                        emerge_time = time2-time
-
-                        print(str(len(times)+1) + "."),
-                        date = date_printer(full_package, time, emerge_time)
-
-                        times.append((emerge_time, date))
-            except IndexError: pass
 
 if emerge_number == 0:
     print("Package '" + package + "' has never been emerged")