Split up average_total_time() and max_min_time()

diff --git a/emerge-timer.py b/emerge-timer.py
index 552d42d46606e8a395bbe3ad54160d9463d69247..5c8fd89bcfa49f9aea1134a727960b5d52834a67 100755 (executable)
--- a/emerge-timer.py
+++ b/emerge-timer.py
@@ -24,23 +24,33 @@ class package:
         self.versions.append((version, emerge_time, emerge_date))
 
 
-    def average_total_time(self):
+    def average_time(self):
         total_time = 0
         for i in self.versions:
             total_time += i[1]
 
         average_time = total_time/len(self.versions)
 
-        return (average_time, total_time)
+        return average_time
+
+    def total_time(self):
+        total_time = 0
+        for i in self.versions:
+            total_time += i[1]
+
+        return total_time
 
 
-    def max_min_time(self):
+    def max_time(self):
         self.versions.sort()
 
-        min_time = self.versions[0][1]
-        max_time = self.versions[len(self.versions)-1][1]
+        return self.versions[len(self.versions)-1][1]
 
-        return (max_time, min_time)
+
+    def min_time(self):
+        self.versions.sort()
+
+        return self.versions[0][1]
 
 
     def print_versions(self):
@@ -54,20 +64,20 @@ class package:
         print
 
     def print_pretended_times(self):
-        ave_time = self.average_total_time()[0]
-
-        print(green_start + self.name + '-' + self.version + color_stop +
-              "\naverage time: " + self.time(ave_time))
+        print("\t" + green_start + self.name + '-' + self.version +
+              color_stop + "\n\taverage time: " + self.time(self.average_time()))
 
 
     def print_min_max_ave(self):
-        max_min = self.max_min_time()
-        ave_total = self.average_total_time()
-
-        print("Max time: \t" + self.time(max_min[0]) +
-              "\nMin time: \t" + self.time(max_min[1]) +
-              "\nAverage time: \t" + self.time(ave_total[0]) +
-              "\nIn total spent " + self.time(ave_total[1]) +
+        maxi = self.max_time()
+        mini = self.min_time()
+        average = self.average_time()
+        total = self.total_time()
+
+        print("Max time: \t" + self.time(maxi) +
+              "\nMin time: \t" + self.time(mini) +
+              "\nAverage time: \t" + self.time(average) +
+              "\nIn total spent " + self.time(total) +
               " emerging " + green_start + self.name + color_stop)
 
     def time(self, time):