Fix correct newline behaviour in python3

[emerge-timer] / emerge-timer.py

diff --git a/emerge-timer.py b/emerge-timer.py
index c224a5103184f0fa9626b4dd29dcdfdfe25cb53e..d782b34996fac6c9b6c791a58a069adace19de77 100755 (executable)
--- a/emerge-timer.py
+++ b/emerge-timer.py
@@ -38,6 +38,19 @@ class package:
         self.versions.append((version, emerge_time, emerge_date))
 
 
+    def seek_versions(self, whatToSeek, Input):
+
+        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"""
         total_time = 0
@@ -84,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:
@@ -185,11 +198,28 @@ class package:
         average = self.average_time()
         total = self.total_time()
 
-        print("Max time:\t" + give_time(maxi) +
-              "\nMin time:\t" + give_time(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 = []
@@ -285,7 +315,7 @@ def open_log():
     try:
         f = open(LOGFILE, 'r')
     except IOError as detail:
-        print detail
+        print(detail)
         sys.exit(1)
 
     return f
@@ -448,7 +478,7 @@ def list_emerge_processes():
 
 
     if len(PACKAGES) == 0:
-        print "No current emerge process found."
+        print("No current emerge process found.")
 
         return 1
 
@@ -465,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
 
@@ -476,10 +506,11 @@ def list_emerge_processes():
 def search_syncs():
     f = open_log()
 
-    print "These emerge syncs found"
-    print "\tDate                    Server"
-    print "\t------------------------------"
+    print("These emerge syncs found")
+    print("\tDate                    Server")
+    print("\t------------------------------")
 
+    a = 0
     for line in f:
         if "=== Sync completed with" in line:
             time = float(line.partition(' ')[0].strip(":"))
@@ -487,7 +518,9 @@ def search_syncs():
 
             print("\t" + GREEN(give_date(time)) +
                   " === " + server),
+            a += 1
 
+    print("\n" + GREEN(str(a)) + " emerge syncs found. ")
 
 
 def main(status, user_package=None):
@@ -534,7 +567,7 @@ def _main(status, user_package=None):
         if list_emerge_processes():
             return
 
-        print "Currently emerging:"
+        print("Currently emerging:")
 
         for p in PACKAGES:
             search_log_for_package(p)
@@ -544,7 +577,7 @@ def _main(status, user_package=None):
     elif status == "pretended":
         list_pretended()
 
-        print "This is how long these packages would take to emerge"
+        print("This is how long these packages would take to emerge")
 
         total_pretended_time = 0
 
@@ -576,7 +609,7 @@ Options:
 \t\t\t (needs matlibplot installed for this to work)"""
 
 
-    print usage
+    print(usage)
 
     sys.exit(0)