Fix correct newline behaviour in python3

[emerge-timer] / emerge-timer.py

diff --git a/emerge-timer.py b/emerge-timer.py
index 758a51a2f4af1d0245c0768d6fe50e74bf1871f9..d782b34996fac6c9b6c791a58a069adace19de77 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"""
@@ -92,26 +97,26 @@ class package:
 
         if len(self.versions) == 1:
             print("\t last time:   "),
-            print(give_time(self.average_time())),
+            print(give_time(self.average_time()), end='')
 
         elif len(self.versions) > 1:
-            print("\t average time:"),
-            print(give_time(self.average_time())),
+            print("\t average time: ", end='')
+            print(give_time(self.average_time()), end='')
 
         else:
             print("\t average time: " + GREEN("unknown\n")),
             return
 
-        print("\n\t " + '-'*45),
+        print("\n\t " + '-'*45, end='')
 
-        print("\n\t time to finish:"),
+        print("\n\t time to finish: ", end='')
 
         if type(self.emerge_time) != str:
 
             finish_time = self.average_time() - self.emerge_time
 
             if finish_time > 0:
-                print(give_time(finish_time))
+                print(give_time(finish_time), "\n")
             else:
                 print(GREEN("any time now"))
         else:
@@ -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 = []
@@ -475,8 +495,8 @@ def list_emerge_processes():
                     timestamp = datetime.datetime.fromtimestamp(time)
                     difference = (now - timestamp).total_seconds()
 
-                    if ((difference < p.emerge_time) or
-                        (p.emerge_time == "infinity")):
+                    if ((p.emerge_time == "infinity") or
+                        (difference < p.emerge_time)):
 
                         p.emerge_time = difference