Change where the emerge_time is calculated

Instead of it being inside the date function, get it at the main loop

diff --git a/emerge-timer.py b/emerge-timer.py
index a2f98b095b4413b6c3c2dee4060fcd4a51b7da32..bfb281567536dc0df874735b7aec9dcc904d0224 100755 (executable)
--- a/emerge-timer.py
+++ b/emerge-timer.py
@@ -68,10 +68,8 @@ def organize_times(time):
     print printable_sec,
 
 
-def date_printer(package, time1, time2):
-    global emerge_time
-
-    date = datetime.datetime.fromtimestamp(time1)
+def date_printer(package, emerge_start, emerge_time):
+    date = datetime.datetime.fromtimestamp(emerge_start)
 
     year = str(date.year)
     month = str(date.month)
@@ -96,7 +94,7 @@ def date_printer(package, time1, time2):
     print("Started emerging " + green_start + package + color_stop +
           " on " + date)
 
-    emerge_time = time2-time1
+
     print "merge time",
     organize_times(emerge_time)
     print "\n"
@@ -192,8 +190,9 @@ for line in f:
                         emerge_number += 1
 
                         time2 = get_time(line, 2)
+                        emerge_time = time2-time
 
-                        date = date_printer(full_package, time, time2)
+                        date = date_printer(full_package, time, emerge_time)
 
                         times.append((emerge_time, date))
                         lista.append([date, int(emerge_time)])