From: Esko Kokkonen <esko.kokkonen@gmail.com>
Date: Thu, 23 Aug 2012 13:20:46 +0000 (+0300)
Subject: Merge max_time() and min_time() functions
X-Git-Url: http://git.itanic.dy.fi/?p=emerge-timer;a=commitdiff_plain;h=758ea134aa5cc509828e0e5d0a7bf08657e1f6ca

Merge max_time() and min_time() functions

These two did basically the exact same things and only returned
different values, so merge them in order to streamline the code a bit.
---

diff --git a/emerge-timer.py b/emerge-timer.py
index 0c5761e..c224a51 100755
--- a/emerge-timer.py
+++ b/emerge-timer.py
@@ -58,8 +58,8 @@ class package:
         return total_time
 
 
-    def max_time(self):
-        """Return maximum time from class version list"""
+    def min_max_time(self, setting):
+        """Return maximum or minimum time from class version list"""
 
         emerge_times = []
         for i in self.versions:
@@ -67,20 +67,12 @@ class package:
 
         emerge_times.sort()
 
-        return emerge_times[-1]
+        if setting == "max":
+            return emerge_times[-1]
+        elif setting == "min":
+            return emerge_times[0]
 
 
-    def min_time(self):
-        """Return minimum time from class version list"""
-
-        emerge_times = []
-        for i in self.versions:
-            emerge_times.append(i[1])
-
-        emerge_times.sort()
-
-        return emerge_times[0]
-
 
 
     def print_current_emerge(self):
@@ -188,8 +180,8 @@ class package:
         if len(self.versions) == 1:
             return
 
-        maxi = self.max_time()
-        mini = self.min_time()
+        maxi = self.min_max_time("max")
+        mini = self.min_max_time("min")
         average = self.average_time()
         total = self.total_time()