From 946b54185eceead11e1c1434505a872504820b33 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Tue, 19 Apr 2011 09:24:07 +0900
Subject: [PATCH] more humane time display

---
 anki/stats.py | 21 ++++++++++++++-------
 anki/utils.py | 16 ++++++++--------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/anki/stats.py b/anki/stats.py
index 416aef303..829b01773 100644
--- a/anki/stats.py
+++ b/anki/stats.py
@@ -22,20 +22,20 @@ class CardStats(object):
         c = self.card
         fmt = lambda x, **kwargs: fmtTimeSpan(x, short=True, **kwargs)
         self.txt = "<table width=100%%>"
-        self.addLine(_("Added"), self.strTime(c.crt))
+        self.addLine(_("Added"), self.date(c.crt))
         first = self.deck.db.scalar(
             "select min(time) from revlog where cid = ?", c.id)
         last = self.deck.db.scalar(
             "select max(time) from revlog where cid = ?", c.id)
         if first:
-            self.addLine(_("First Review"), self.strTime(first/1000))
-            self.addLine(_("Latest Review"), self.strTime(last/1000))
+            self.addLine(_("First Review"), self.date(first/1000))
+            self.addLine(_("Latest Review"), self.date(last/1000))
         if c.reps:
             if c.queue == 2:
                 next = time.time()+((self.deck.sched.today - c.due)*86400)
             else:
                 next = c.due
-            next = self.strTime(next)
+            next = self.date(next)
             self.addLine(_("Due"), next)
         self.addLine(_("Interval"), fmt(c.ivl * 86400))
         self.addLine(_("Ease"), "%d%%" % (c.factor/10.0))
@@ -45,8 +45,8 @@ class CardStats(object):
         (cnt, total) = self.deck.db.first(
             "select count(), sum(taken)/1000 from revlog where cid = :id", id=c.id)
         if cnt:
-            self.addLine(_("Average Time"), fmt(total / float(cnt), point=2))
-            self.addLine(_("Total Time"), fmt(total, point=2))
+            self.addLine(_("Average Time"), self.time(total / float(cnt)))
+            self.addLine(_("Total Time"), self.time(total))
         self.addLine(_("Model"), c.model().name)
         self.addLine(_("Template"), c.template()['name'])
         self.addLine(_("Current Group"), self.deck.groupName(c.gid))
@@ -58,11 +58,18 @@ class CardStats(object):
         self.txt += "<tr><td align=right style='padding-right: 3px;'>"
         self.txt += "<b>%s</b></td><td>%s</td></tr>" % (k, v)
 
-    def strTime(self, tm):
+    def date(self, tm):
         return time.strftime("%Y-%m-%d", time.localtime(tm))
         s = anki.utils.fmtTimeSpan(time.time() - tm)
         return _("%s ago") % s
 
+    def time(self, tm):
+        str = ""
+        if tm >= 60:
+            str = fmtTimeSpan((tm/60)*60, short=True, point=-1, unit=1)
+        str += fmtTimeSpan(tm%60, short=True)
+        return str
+
 # Deck stats
 ##########################################################################
 
diff --git a/anki/utils.py b/anki/utils.py
index c66c33789..ab064b152 100644
--- a/anki/utils.py
+++ b/anki/utils.py
@@ -53,9 +53,9 @@ shortTimeTable = {
     "seconds": _("%ss"),
     }
 
-def fmtTimeSpan(time, pad=0, point=0, short=False, after=False):
+def fmtTimeSpan(time, pad=0, point=0, short=False, after=False, unit=99):
     "Return a string representing a time span (eg '2 days')."
-    (type, point) = optimalPeriod(time, point)
+    (type, point) = optimalPeriod(time, point, unit)
     time = convertSecondsTo(time, type)
     if not point:
         time = math.floor(time)
@@ -69,17 +69,17 @@ def fmtTimeSpan(time, pad=0, point=0, short=False, after=False):
     timestr = "%(a)d.%(b)df" % {'a': pad, 'b': point}
     return locale.format_string("%" + (fmt % timestr), time)
 
-def optimalPeriod(time, point):
-    if abs(time) < 60:
+def optimalPeriod(time, point, unit):
+    if abs(time) < 60 or unit < 1:
         type = "seconds"
         point -= 1
-    elif abs(time) < 3599:
+    elif abs(time) < 3599 or unit < 2:
         type = "minutes"
-    elif abs(time) < 60 * 60 * 24:
+    elif abs(time) < 60 * 60 * 24 or unit < 3:
         type = "hours"
-    elif abs(time) < 60 * 60 * 24 * 30:
+    elif abs(time) < 60 * 60 * 24 * 30 or unit < 4:
         type = "days"
-    elif abs(time) < 60 * 60 * 24 * 365:
+    elif abs(time) < 60 * 60 * 24 * 365 or unit < 5:
         type = "months"
         point += 1
     else: