Cleanup the main_loop code

It's mostly the same stuff, only slightly in a different order to
attempt to optimize the emerge log scanning a bit.

diff --git a/emerge-timer.py b/emerge-timer.py
index dc91c41c0c068ccab21e78fd7e19bfcf2dd5501b..faf4e773a34d70096dbf1d69c8c09d9524c0a9aa 100755 (executable)
--- a/emerge-timer.py
+++ b/emerge-timer.py
@@ -351,42 +351,42 @@ def main_loop(f, package, silent):
 
     # MAIN LOOP
     for line in f:
 
     # MAIN LOOP
     for line in f:

-        if package in line:
-            st = line.split(' ')
+        if ((">>>" in line) and ("emerge" in line)):
+            if package in line:
+                version = line.partition(package)[2].partition(' ')[0]
+
+                if version.strip('-')[0].isdigit():
+                    full_package = package + version
+
+                    time_string = line.partition(">>>")
+                    start_time = float(time_string[0].strip().strip(':'))
+

 
 

-            for string in st:
-                if ((package in string) and (len(string) > len(package)+1)
-                    and (string[len(package)+1].isdigit())):
-                    full_package = st[st.index(string)]
+        elif ((":::" in line) and ("completed emerge" in line)):
+            if package in line:
+                if version.strip('-')[0].isdigit():

 
 

+                    time_string = line.partition(":::")
+                    end_time = float(time_string[0].strip().strip(':'))

 
 

-                    if ((">>>" in line) and ("emerge" in line)):
-                        time_string = line.partition(">>>")
-                        time = float(time_string[0].strip().strip(":"))

 
 

-                    try:
-                        if (":::" in line) and ("completed emerge" in line):
-                            time_string = line.partition(":::")
-                            time2 = float(time_string[0].strip().strip(":"))
+                    emerge_time = end_time - start_time

 
 

+                    date = get_date(start_time)

 
 

-                            emerge_time = time2-time

 
 

-                            date = get_date(time)
+                    if silent == False:
+                        print(str(len(times)+1) + ". " +
+                              green_start + full_package + color_stop +
+                              "  >>>  " + date + "  >>>  "),

 
 

+                        organize_times(emerge_time)

 
 

-                            if silent == False:
-                                print(str(len(times)+1) + "."),
-                                print(green_start + full_package + color_stop + "  >>>  "
-                                      + date + "  >>> "),
+                        print("\n" + '-'*90)

 
 

-                                organize_times(emerge_time)

 
 

-                                print("\n" + '-'*90)
+                    times.append((emerge_time, date))

 
 

-                            times.append((emerge_time, date))
-                    except IndexError:
-                        pass

 
     average_time = print_times(package, times, silent)
     return average_time
 
     average_time = print_times(package, times, silent)
     return average_time