review sefun/time

Author: michaelprograms

lib/secure/sefun/time.c

@@ -2,10 +2,10 @@
 
 /**
  * Converts a timestamp to time ago format.
- * Example: # years # months # weeks # days ago
+ * Example: # years # months # weeks # days # hours # minutes ago
  *
  * @param timestamp the epoch time() to convert
- * @param granularity how many details to display
+ * @param granularity how many details to display (defaults to 2)
  * @returns time in human readable format
  */
 varargs string time_ago (int timestamp, int granularity) {
@@ -26,6 +26,9 @@ varargs string time_ago (int timestamp, int granularity) {
     diff = diff - (Weeks * WEEK_IN_SECS);
     Days = diff / DAY_IN_SECS;
     diff = diff - (Days * DAY_IN_SECS);
+    Hours = diff / HOUR_IN_SECS;
+    diff = diff - (Hours * HOUR_IN_SECS);
+    Minutes = diff / MINUTE_IN_SECS;
 
     if (Years > 0) {
         msg += Years + " year" + (Years > 1 ? "s" : "");
@@ -35,41 +38,39 @@ varargs string time_ago (int timestamp, int granularity) {
         return msg + " ago";
     }
     if (Months > 0) {
-        msg += (sizeof(msg)>0?" ":"") + Months + " month" + (Months > 1 ? "s" : "");
+        msg += (sizeof(msg) > 0 ? " " : "") + Months + " month" + (Months > 1 ? "s" : "");
         matches ++;
     }
     if (granularity > 0 && matches >= granularity) {
         return msg + " ago";
     }
     if (Weeks > 0) {
-        msg += (sizeof(msg)>0?" ":"") + Weeks + " week" + (Weeks > 1 ? "s" : "");
+        msg += (sizeof(msg) > 0 ? " " : "") + Weeks + " week" + (Weeks > 1 ? "s" : "");
         matches ++;
     }
     if (granularity > 0 && matches >= granularity) {
         return msg + " ago";
     }
     if (Days > 0) {
-        msg +=  (sizeof(msg)>0?" ":"") + Days + " day" + (Days > 1 ? "s" : "");
+        msg += (sizeof(msg) > 0 ? " " : "") + Days + " day" + (Days > 1 ? "s" : "");
         matches ++;
     }
     if (granularity > 0 && matches >= granularity) {
         return msg + " ago";
     }
-
-    if (sizeof(msg) > 0) {
-        return msg + " ago";
-    }
-
-    Hours = diff / HOUR_IN_SECS;
-    diff = diff - (Hours * HOUR_IN_SECS);
     if (Hours > 0) {
-        return Hours + " hour" + (Hours > 1 ? "s" : "") + " ago";
+        msg += (sizeof(msg) > 0 ? " " : "") + Hours + " hour" + (Hours > 1 ? "s" : "");
+        matches ++;
+    }
+    if (granularity > 0 && matches >= granularity) {
+        return msg + " ago";
     }
-
-    Minutes = diff / MINUTE_IN_SECS;
-    diff = diff - (Minutes * MINUTE_IN_SECS);
     if (Minutes > 0) {
-        return Minutes + " minute" + (Minutes > 1 ? "s" : "") + " ago";
+        msg += (sizeof(msg) > 0 ? " " : "") + Minutes + " minute" + (Minutes > 1 ? "s" : "");
+        matches ++;
+    }
+    if (sizeof(msg) > 0) {
+        return msg + " ago";
     }
 
     return "very recently";

lib/secure/sefun/time.test.c

@@ -50,8 +50,14 @@ void test_time_ago () {
 
         // default granularity:
         assert_equal(testOb->time_ago($(now) - (1 * YEAR_IN_SECS) - (7 * MONTH_IN_SECS) - (2 * WEEK_IN_SECS) - (4 * DAY_IN_SECS) - (15 * HOUR_IN_SECS) - (42 * MINUTE_IN_SECS) - 29), "1 year 7 months ago"),
-        // disable granularity:
-        assert_equal(testOb->time_ago($(now) - (1 * YEAR_IN_SECS) - (7 * MONTH_IN_SECS) - (2 * WEEK_IN_SECS) - (4 * DAY_IN_SECS) - (15 * HOUR_IN_SECS) - (42 * MINUTE_IN_SECS) - 29, 0), "1 year 7 months 2 weeks 4 days ago"),
+        // granularity=5 includes hours:
+        assert_equal(testOb->time_ago($(now) - (1 * YEAR_IN_SECS) - (7 * MONTH_IN_SECS) - (2 * WEEK_IN_SECS) - (4 * DAY_IN_SECS) - (15 * HOUR_IN_SECS) - (42 * MINUTE_IN_SECS) - 29, 5), "1 year 7 months 2 weeks 4 days 15 hours ago"),
+        // granularity=6 includes hours and minutes:
+        assert_equal(testOb->time_ago($(now) - (1 * YEAR_IN_SECS) - (7 * MONTH_IN_SECS) - (2 * WEEK_IN_SECS) - (4 * DAY_IN_SECS) - (15 * HOUR_IN_SECS) - (42 * MINUTE_IN_SECS) - 29, 6), "1 year 7 months 2 weeks 4 days 15 hours 42 minutes ago"),
+        // disable granularity - shows all units including hours and minutes:
+        assert_equal(testOb->time_ago($(now) - (1 * YEAR_IN_SECS) - (7 * MONTH_IN_SECS) - (2 * WEEK_IN_SECS) - (4 * DAY_IN_SECS) - (15 * HOUR_IN_SECS) - (42 * MINUTE_IN_SECS) - 29, 0), "1 year 7 months 2 weeks 4 days 15 hours 42 minutes ago"),
+        // day-level + hours with default granularity=2:
+        assert_equal(testOb->time_ago($(now) - DAY_IN_SECS - HOUR_IN_SECS), "1 day 1 hour ago"),
     }) :));
 }