Merge branch 'master' of /home/git/emerge-timer

diff --git a/emerge-timer.py b/emerge-timer.py
index 758a51a2f4af1d0245c0768d6fe50e74bf1871f9..3bfc86141f938e23b008a1215f4025982d45ae0f 100755 (executable)
--- a/emerge-timer.py
+++ b/emerge-timer.py
@@ -40,11 +40,16 @@ class package:
 
     def seek_versions(self, whatToSeek, Input):
 
-        if whatToSeek == "version":
+        if whatToSeek == "date":
             for i in self.versions:
                 if i[1] == Input:
                     return i[2]
 
+        if whatToSeek == "version":
+            for i in self.versions:
+                if i[1] == Input:
+                    return i[0]
+
 
     def average_time(self):
         """Return average time from class version list"""
@@ -193,13 +198,28 @@ class package:
         average = self.average_time()
         total = self.total_time()
 
-        print("Max time:\t" + give_time(maxi) + "on " +
-              give_date(self.seek_versions("version", maxi)) +
-              "\nMin time:\t" + give_time(mini) + "on " +
-              give_date(self.seek_versions("version", mini)) +
-              "\nAverage time:\t" + give_time(average) +
-              "\n\nIn total spent:\t" + give_time(total) +
-              "emerging " + GREEN(self.name))
+        print("-"*20 +
+              "\nMaximum emerge time:\n" +
+              give_time(maxi) + "for version " +
+              GREEN(self.seek_versions("version", maxi).lstrip("-"))
+              + " on " +
+              give_date(self.seek_versions("date", maxi)))
+
+        print("-"*20 +
+              "\nMinimum emerge time:\n" +
+              give_time(mini) + "for version " +
+              GREEN(self.seek_versions("version", mini).lstrip("-"))
+              + " on " +
+              give_date(self.seek_versions("date", mini)))
+
+        print("-"*20 +
+              "\nAverage emerge time:\n" +
+              give_time(average))
+
+        print("-"*20 +
+              "\nIn total spent:\n" +
+              give_time(total))
+
 
     def plotToScreen(self):
         dates = []