]> git.itanic.dy.fi Git - emerge-timer/commitdiff
Change how we pass the package into the log parser
authorEsko Kokkonen <esko.kokkonen@gmail.com>
Thu, 1 Sep 2011 09:33:29 +0000 (12:33 +0300)
committerEsko Kokkonen <esko.kokkonen@gmail.com>
Thu, 1 Sep 2011 09:33:29 +0000 (12:33 +0300)
Don't use a list but only pass the class object into the function.

emerge-timer.py

index 8807ff1e43babc03c093f4651b880e4694e8f44d..c45a0d3bc4358b67348eb1d2c3924cd479ee6ebd 100755 (executable)
@@ -132,14 +132,14 @@ def open_log():
 
 
 
-def search_log_for_package(user_package):
+def search_log_for_package(package_class):
 
     log = open_log()
 
     for line in log:
         if ((">>>" in line) and ("emerge" in line)):
-            if user_package in line:
-                version = line.partition(user_package)[2].partition(' ')[0]
+            if package_class.name in line:
+                version = line.partition(package_class.name)[2].partition(' ')[0]
                 digit = version.strip('-')[0].isdigit()
 
                 if digit:
@@ -147,14 +147,14 @@ def search_log_for_package(user_package):
                     start_time = float(time_string[0].strip().strip(':'))
 
         elif ((":::" in line) and ("completed emerge" in line)):
-            if user_package in line:
+            if package_class.name in line:
                 if digit:
                     time_string = line.partition(":::")
                     stop_time = float(time_string[0].strip().strip(':'))
 
                     emerge_time = stop_time - start_time
 
-                    packages[0].add_version(version, emerge_time, start_time)
+                    package_class.add_version(version, emerge_time, start_time)
 
 
 def get_package(name):
@@ -228,11 +228,11 @@ def main(status, user_package=None):
     if status == "package":
         user_package = get_package(user_package)
 
-        packages.insert(0, package(user_package))
+        pack = package(user_package)
 
-        search_log_for_package(user_package)
-        packages[0].print_versions()
-        packages[0].print_min_max_ave()
+        search_log_for_package(pack)
+        pack.print_versions()
+        pack.print_min_max_ave()
 
 
     elif status == "current":