]> git.itanic.dy.fi Git - emerge-timer/commitdiff
Don't print time to finish if there is no average time
authorEsko Kokkonen <esko.kokkonen@gmail.com>
Sat, 20 Aug 2011 11:36:40 +0000 (14:36 +0300)
committerEsko Kokkonen <esko.kokkonen@gmail.com>
Sat, 20 Aug 2011 11:36:40 +0000 (14:36 +0300)
Drop the whole finish time section out if there is no average
time. Also don't print negative finish times. Change the newline
commands a bit.

emerge-timer.py

index 9b2de66ff0a02e2e1b4997d8219667ea2eaea80b..64016e915e1791f3a1384cea11d6e9756b3e66dd 100755 (executable)
@@ -188,13 +188,13 @@ def print_times(package, times, silent):
     # This should be True if we're in current emerge stage
     if silent == True:
         if len(times) == 0:
-            print("\t  no previous emerges found for this package\n")
+            print("\t  no previous emerges found for this package"),
             return 0
 
         elif len(times) == 1:
             print("\t  previous emerge time"),
             organize_times(times[0][0])
-            print("(only one emerge previously)\n")
+            print("(only one emerge previously)"),
             return times[0][0]
 
         else:
@@ -309,9 +309,13 @@ def print_current_emerges(f, packages):
             if i in p[0]:
                 average_time = main_loop(f, i, True)
 
-        print("\n\t  " + '-'*45 + "\n\t  time to finish: \t"),
-        organize_times(abs(average_time - p[1]))
-        print "\n"
+        if average_time != 0:
+            print("\n\t  " + '-'*45 + "\n\t  time to finish: \t"),
+            if (average_time - p[1]) < 0:
+                print(green_start + "Any time now" + color_stop),
+            else:
+                organize_times(average_time - p[1])
+            print "\n"
 
 
 
@@ -345,7 +349,7 @@ def list_pretended(f):
 
 
     if all_time != 0:
-        print("\nTotal emerge time of " + green_start + str(len(packages)) +
+        print("Total emerge time of " + green_start + str(len(packages)) +
               color_stop + " packages:"),
         organize_times(all_time)