Improve the main loop

Merge the two if blocks so we can remove one indendation

diff --git a/emerge-timer.py b/emerge-timer.py
index 69d3eccdeefc95288d2dcbc6c154e1cf32ec442b..92e4b0839a1cd2af5cec12313a14bed1b3a53900 100755 (executable)
--- a/emerge-timer.py
+++ b/emerge-timer.py
@@ -97,12 +97,11 @@ def date_printer(package, emerge_start, emerge_time):
     minute = str(date.minute)
     second = str(date.second)
 
-    date = "{:%d/%m/%Y %H:%M:%S}".format(date)
+    date = weekday + "{:%d/%m/%Y %H:%M:%S}".format(date)
 
     print("Started emerging " + green_start + package + color_stop +
           " on " + date)
 
-
     print "merge time",
     organize_times(emerge_time)
     print "\n"
@@ -187,24 +186,23 @@ for line in f:
     if package in line:
         st = line.split(' ')
         for string in st:
-            if package in string:
-                try:
-                    if string[len(package)+1].isdigit():
-                        full_package = st[st.index(string)]
+            try:
+                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)
 
-                        if (":::" in line) and ("completed emerge" in line):
-                            emerge_number += 1
+                    if (":::" in line) and ("completed emerge" in line):
+                        emerge_number += 1
 
-                            time2 = get_time(line, 2)
-                            emerge_time = time2-time
+                        time2 = get_time(line, 2)
+                        emerge_time = time2-time
 
-                            date = date_printer(full_package, time, emerge_time)
+                        date = date_printer(full_package, time, emerge_time)
 
-                            times.append((emerge_time, date))
-                except IndexError: pass
+                        times.append((emerge_time, date))
+            except IndexError: pass
 
 f.close()