Add green and red functions

Use these functions instead of having to input color_start and
color_stop around strings.

diff --git a/emerge-timer.py b/emerge-timer.py
index a85560c77be7d732065d2764e8696e6136c969d4..586df08971fc9cb77e082a566a5987cea32334bb 100755 (executable)
--- a/emerge-timer.py
+++ b/emerge-timer.py
@@ -16,6 +16,11 @@ QUIET = False
 
 PACKAGES = []
 
+def GREEN(string):
+    return green_start + string + color_stop
+
+def RED(string):
+    return red_start + string + color_stop
 
 
 class package:
@@ -79,8 +84,8 @@ class package:
     def print_current_emerge(self):
         """Function used to print all the current emerge stuff"""
 
-        print("\t" + green_start + self.name + '-' + self.version +
-              color_stop + "\n\t current time: " + give_time(self.emerge_time))
+        print("\t" + GREEN(self.name + '-' + self.version) +
+              "\n\t current time: " + give_time(self.emerge_time))
 
 
         if len(self.versions) == 1:
@@ -92,7 +97,7 @@ class package:
             print(give_time(self.average_time())),
 
         else:
-            print("\t average time: " + green_start + "unknown\n" + color_stop),
+            print("\t average time: " + GREEN("unknown\n")),
             return
 
         print("\n\t " + '-'*45),
@@ -106,9 +111,9 @@ class package:
             if finish_time > 0:
                 print(give_time(finish_time))
             else:
-                print(green_start + "any time now" + color_stop)
+                print(GREEN("any time now"))
         else:
-            print(green_start + "unknown" + color_stop)
+            print(GREEN("unknown"))
         print
 
 
@@ -140,12 +145,10 @@ class package:
                 p_date = give_date(p[2])
 
                 print('-' * dots + "\n" +
-                      green_start + name + (p[0]).ljust(version_length) +
-                      color_stop + "  >>>  " + p_time + " "*pad +
-                      "  >>>  " + p_date)
+                      GREEN(name + (p[0]).ljust(version_length))
+                      + "  >>>  " + p_time + " "*pad + "  >>>  " + p_date)
 
-        print("\n" + "Package " + green_start +
-              self.name + color_stop + " emerged " +
+        print("\n" + "Package " + GREEN(self.name) + " emerged " +
               str(len(self.versions)) + " times.\n")
 
 
@@ -154,7 +157,7 @@ class package:
         """This is used the print all the pretended times"""
 
         if QUIET == False:
-            print("\t" + green_start + self.name + '-' + self.version + color_stop),
+            print("\t" + GREEN(self.name + '-' + self.version)),
 
         if len(self.versions) > 1:
             aver_time = self.average_time()
@@ -181,7 +184,7 @@ class package:
               "\nMin time:\t" + give_time(mini) +
               "\nAverage time:\t" + give_time(average) +
               "\nIn total spent:\t" + give_time(total) +
-              "emerging " + green_start + self.name + color_stop)
+              "emerging " + GREEN(self.name))
 
 
 
@@ -197,7 +200,7 @@ def give_time(time, nocolor=False):
         color_stop = ""
 
     if type(time) == str:
-        return(green_start + "unknown" + color_stop)
+        return(GREEN("unknown"))
 
 
     days = time/(3600.0*24.0)
@@ -216,32 +219,24 @@ def give_time(time, nocolor=False):
     pseconds = str()
 
     if days > 0:
-        pdays = (green_start + str(days) +
-                 color_stop + " day ")
+        pdays = (GREEN(str(days)) + " day ")
         if days != 1:
-            pdays = (green_start + str(days) +
-                         color_stop + " days ")
+            pdays = (GREEN(str(days)) + " days ")
 
     if hours > 0:
-        phours = (green_start + str(hours) +
-                  color_stop + " hour ")
+        phours = (GREEN(str(hours)) + " hour ")
         if hours != 1:
-            phours = (green_start + str(hours) +
-                          color_stop + " hours ")
+            phours = (GREEN(str(hours)) + " hours ")
 
     if minutes > 0:
-        pminutes = (green_start + str(minutes) +
-                    color_stop + " minute ")
+        pminutes = (GREEN(str(minutes)) + " minute ")
         if minutes != 1:
-            pminutes = (green_start + str(minutes) +
-                        color_stop + " minutes ")
+            pminutes = (GREEN(str(minutes)) + " minutes ")
 
     if seconds > 0:
-        pseconds = (green_start + str(seconds) +
-                    color_stop + " second ")
+        pseconds = (GREEN(str(seconds)) + " second ")
         if seconds != 1:
-            pseconds = (green_start + str(seconds) +
-                        color_stop + " seconds ")
+            pseconds = (GREEN(str(seconds)) + " seconds ")
 
     if nocolor == True:
         green_start = "\033[32m"
@@ -326,15 +321,15 @@ def search_log_for_all_packages():
                 if p[0] in line:
                     stop_time = float(line.partition(':')[0])
 
-                    print("\t" + give_date(p[1]) + " >>> " + green_start + p[0] + color_stop)
+                    print("\t" + give_date(p[1]) + " >>> " + GREEN(p[0]))
 
                     total_emerge_time += stop_time - p[1]
                     emerge_number += 1
 
                     all_packages.pop(all_packages.index(p))
 
-    print("\nTotal emerge time of " + green_start + str(emerge_number) +
-          color_stop + " merges: " + give_time(total_emerge_time))
+    print("\nTotal emerge time of " + GREEN(str(emerge_number)) +
+          " merges: " + give_time(total_emerge_time))
 
 
 
@@ -475,8 +470,8 @@ def main(status, user_package=None):
                 pack.print_min_max_ave()
 
             else:
-                print("Package " + green_start + pack.name +
-                      color_stop + " has never been emerged.")
+                print("Package " + GREEN(pack.name)
+                      + " has never been emerged.")
 
             print
 
@@ -506,8 +501,8 @@ def main(status, user_package=None):
 
             print
 
-        print("Total emerge time of " + green_start + str(len(PACKAGES)) +
-              color_stop + " package(s): "+ give_time(total_pretended_time))
+        print("Total emerge time of " + GREEN(str(len(PACKAGES)))
+              + " package(s): "+ give_time(total_pretended_time))
 
 
 def usage():
@@ -573,32 +568,32 @@ if __name__ == "__main__":
 
     if simulation == True:
 
-        print(red_start + "\n" + '*'*25 + "\n" + "THIS IS A SIMULATION RUN\n"
-              + '*'*25 + "\n")
+        print(RED("\n" + '*'*25 + "\n" + "THIS IS A SIMULATION RUN\n"
+              + '*'*25 + "\n"))
 
-        print("Beginning 'package' mode check")
+        print(RED("Beginning 'package' mode check"))
 
-        print("Checking for one emerge\n" + color_stop)
+        print(RED("Checking for one emerge\n"))
 
         LOGFILE = "simulate/fake_emerge.log"
         PORTDIR = "simulate/"
 
         main("package", "first_fake_package")
 
-        print(red_start + "\nChecking for three emerges\n" + color_stop)
+        print(RED("\nChecking for three emerges\n"))
 
         main("package", "second_fake_package")
 
-        print(red_start + "\n'package' mode check complete\n")
+        print(RED("\n'package' mode check complete\n"))
 
-        print(30*'*')
+        print(RED(30*'*'))
 
-        print("\nBeginning 'current' mode check")
-        print("Current emerge with no emerge process\n" + color_stop)
+        print(RED("\nBeginning 'current' mode check"))
+        print(RED("Current emerge with no emerge process\n"))
 
         main("current", None)
 
-        print(red_start + "\nCurrent emerge with emerge processes\n" + color_stop)
+        print(RED("\nCurrent emerge with emerge processes\n"))
 
         PACKAGES.append(package("test-group/second_fake_package", "2.9-r2"))
         PACKAGES[0].emerge_time = 60
@@ -607,16 +602,16 @@ if __name__ == "__main__":
 
         main("current", None)
 
-        print(red_start + "\nCurrent emerge with incomplete emerge log" +
-              "(causes error in some cases)\n" + color_stop)
+        print(RED("\nCurrent emerge with incomplete emerge log " + 
+                  "(causes error in some cases)\n"))
 
         PACKAGES = []
         PACKAGES.append(package("test-group/third_fake_package", "2.9-r2"))
 
         main("current", None)
 
-        print(red_start + "\n" + '*'*20 + "\n" + "SIMULATION FINISHED\n" +
-              '*'*20 + color_stop)
+        print(RED("\n" + '*'*20 + "\n" + "SIMULATION FINISHED\n" +
+              '*'*20))
 
 
     else: