]> git.itanic.dy.fi Git - emerge-timer/commitdiff
Create some new functions to clean up code
authorEsko Kokkonen <esko.kokkonen@gmail.com>
Sat, 21 May 2011 11:23:48 +0000 (14:23 +0300)
committerEsko Kokkonen <esko.kokkonen@gmail.com>
Sat, 21 May 2011 11:23:48 +0000 (14:23 +0300)
emerge-timer.py

index 2eca6f597f26e435af2b739f4843a514c8123f1a..a415229408cbae2a6f2660fa19f87e9f6a6554d0 100755 (executable)
@@ -15,31 +15,43 @@ times = []
 
 lista = []
 
+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 date_printer(package, time1, time2):
+    global emerge_time
+
+    print "Started emerging", package, "at",
+
+    date = datetime.date.fromtimestamp(time1)
+    emerge_time = time2-time1
+    date = (str(date.day) + "/" + str(date.month)
+            + "/" + str(date.year))
+    print date
+
+    print "Emerge time:", int(emerge_time), "seconds"
+    print
+
+    return date
+
 for line in f:
     if package_name in line:
         if (">>>" in line) and ("emerge" in line):
 
-            string = line.partition(">>>")
-            
-            time = float(string[0].strip().strip(":"))
+            time = get_time(line, 1)
 
         if (":::" in line) and ("completed emerge" in line):
             emerge_number += 1
 
-            string = line.partition(":::")
-
-            time2 = float(string[0].strip().strip(":"))
-
-            print "Started emerging", package_name, "at",
-
-            date = datetime.date.fromtimestamp(time)
-            emerge_time = time2-time
-            date = (str(date.day) + "/" + str(date.month)
-                   + "/" + str(date.year))
-            print date
+            time2 = get_time(line, 2)
 
-            print "Emerge time:", int(emerge_time), "seconds"
-            print
+            date = date_printer(package_name, time, time2)
 
             times.append((emerge_time, date))
             lista.append([date, int(emerge_time)])