Create a main() function which to run everytime

As a result get_time() and calculate_emerge_time() functions had to be
removed and merged into the main() function.

diff --git a/emerge-timer.py b/emerge-timer.py
index eb5263eacb81f182f3dc60d7ef2d331b26c7f611..55d49c6ec47b7e8c7f029074fa25ffbc6f32bf7f 100755 (executable)
--- a/emerge-timer.py
+++ b/emerge-timer.py
@@ -21,15 +21,6 @@ def write_times(emerge_times_list):
     g.close()
 
 
-def get_time(string, part):
-    if part == 1:
-        string = string.partition(">>>")
-    elif part == 2:
-        string = line.partition(":::")
-
-    time = float(string[0].strip().strip(":"))
-    return time
-
 def organize_times(time):
     days = time/(3600*24)
     hours = (days - int(days))*24
@@ -165,16 +156,6 @@ 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))
-
-
 def open_log():
     try:
         f = open(LOGFILE, 'r')
@@ -195,34 +176,52 @@ def get_opts():
         return package_name
 
 
-f = open_log()
-package_name = get_opts()
+def main():
+    global emerge_number
+    f = open_log()
+    package_name = get_opts()
 
-get_package(package_name)
+    get_package(package_name)
 
-print('-'*90)
-for line in f:
-    if package in line:
-        st = line.split(' ')
-        for string in st:
-            if (package in string) and string[len(package)+1].isdigit():
-                full_package = st[st.index(string)]
+    print('-'*90)
 
-                if ((">>>" in line) and ("emerge" in line)):
-                    time = get_time(line, 1)
+    # MAIN LOOP
+    for line in f:
+        if package in line:
+            st = line.split(' ')
+            for string in st:
+                if (package in string) and string[len(package)+1].isdigit():
+                    full_package = st[st.index(string)]
 
-                try:
-                    if (":::" in line) and ("completed emerge" in line):
-                        emerge_number += 1
-                        calculate_emerge_time()
-                except IndexError: pass
+                    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):
+                            emerge_number += 1
+
+                            time_string = line.partition(":::")
+                            time2 = float(time_string[0].strip().strip(":"))
+
+                            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")
+        sys.exit(1)
+
+    f.close()
 
-if emerge_number == 0:
-    print("Package '" + package + "' has never been emerged")
-    sys.exit(1)
 
-f.close()
+main()
 
 print_times(times)