Add cgit_print_age() function

This function can be used to print relative dates, just as in gitweb. Next
step will be to actually use the new function.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

5 files changed, 94 insertions, 8 deletions

diff --git a/cgit.css b/cgit.css
index 95c3e40..327eaba 100644
--- a/cgit.css
+++ b/cgit.css
@@ -379,12 +379,37 @@ a.primary {
 
 a.secondary {
 	font-size: 90%;
 }
 
 td.toplevel-repo {
 
 }
 
 table.list td.sublevel-repo {
 	padding-left: 1.5em;
 }
+
+span.age-mins {
+	font-weight: bold;
+	color: #080;
+}
+
+span.age-hours {
+	color: #080;
+}
+
+span.age-days {
+	color: #040;
+}
+
+span.age-weeks {
+	color: #444;
+}
+
+span.age-months {
+	color: #888;
+}
+
+span.age-years {
+	color: #bbb;
+}
diff --git a/cgit.h b/cgit.h
index 8927236..4da2d3d 100644
--- a/cgit.h
+++ b/cgit.h
@@ -20,24 +20,43 @@
 
 /*
  * The valid cgit repo-commands
  */
 #define CMD_LOG      1
 #define CMD_COMMIT   2
 #define CMD_DIFF     3
 #define CMD_TREE     4
 #define CMD_VIEW     5
 #define CMD_BLOB     6
 #define CMD_SNAPSHOT 7
 
+
+/*
+ * Dateformats used on misc. pages
+ */
+#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S"
+#define FMT_SHORTDATE "%Y-%m-%d"
+
+
+/*
+ * Limits used for relative dates
+ */
+#define TM_MIN    60
+#define TM_HOUR  (TM_MIN * 60)
+#define TM_DAY   (TM_HOUR * 24)
+#define TM_WEEK  (TM_DAY * 7)
+#define TM_YEAR  (TM_DAY * 365)
+#define TM_MONTH (TM_YEAR / 12.0)
+
+
 typedef void (*configfn)(const char *name, const char *value);
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 
 struct cacheitem {
 	char *name;
 	struct stat st;
 	int ttl;
 	int fd;
 };
 
 struct repoinfo {
@@ -172,25 +191,26 @@ extern void cgit_parse_url(const char *url);
 extern char *cache_safe_filename(const char *unsafe);
 extern int cache_lock(struct cacheitem *item);
 extern int cache_unlock(struct cacheitem *item);
 extern int cache_cancel_lock(struct cacheitem *item);
 extern int cache_exist(struct cacheitem *item);
 extern int cache_expired(struct cacheitem *item);
 
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_pageurl(const char *reponame, const char *pagename,
 			  const char *query);
 
 extern void cgit_print_error(char *msg);
-extern void cgit_print_date(unsigned long secs);
+extern void cgit_print_date(time_t secs, char *format);
+extern void cgit_print_age(time_t t, time_t max_relative, char *format);
 extern void cgit_print_docstart(char *title, struct cacheitem *item);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(char *title, int show_search);
 extern void cgit_print_snapshot_start(const char *mimetype,
 				      const char *filename,
 				      struct cacheitem *item);
 
 extern void cgit_print_repolist(struct cacheitem *item);
 extern void cgit_print_summary();
 extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path);
 extern void cgit_print_view(const char *hex, char *path);
 extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
diff --git a/ui-commit.c b/ui-commit.c
index ff1fad3..59eeb1d 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -163,32 +163,32 @@ void cgit_print_commit(const char *hex)
 	if (!commit) {
 		cgit_print_error(fmt("Bad commit reference: %s", hex));
 		return;
 	}
 	info = cgit_parse_commit(commit);
 
 	html("<table class='commit-info'>\n");
 	html("<tr><th>author</th><td>");
 	html_txt(info->author);
 	html(" ");
 	html_txt(info->author_email);
 	html("</td><td class='right'>");
-	cgit_print_date(info->author_date);
+	cgit_print_date(info->author_date, FMT_LONGDATE);
 	html("</td></tr>\n");
 	html("<tr><th>committer</th><td>");
 	html_txt(info->committer);
 	html(" ");
 	html_txt(info->committer_email);
 	html("</td><td class='right'>");
-	cgit_print_date(info->committer_date);
+	cgit_print_date(info->committer_date, FMT_LONGDATE);
 	html("</td></tr>\n");
 	html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
 	query = fmt("h=%s&id=%s", sha1_to_hex(commit->object.sha1),
 		    sha1_to_hex(commit->tree->object.sha1));
 	html_attr(cgit_pageurl(cgit_query_repo, "tree", query));
 	htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1));
       	for (p = commit->parents; p ; p = p->next) {
 		parent = lookup_commit_reference(p->item->object.sha1);
 		if (!parent) {
 			html("<tr><td colspan='3'>");
 			cgit_print_error("Error reading parent commit");
 			html("</td></tr>");
diff --git a/ui-shared.c b/ui-shared.c
index c7fbc5e..acc771b 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -79,34 +79,75 @@ char *cgit_currurl()
 {
 	if (!cgit_virtual_root)
 		return cgit_script_name;
 	else if (cgit_query_page)
 		return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
 	else if (cgit_query_repo)
 		return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
 	else
 		return fmt("%s/", cgit_virtual_root);
 }
 
 
-void cgit_print_date(unsigned long secs)
+void cgit_print_date(time_t secs, char *format)
 {
-	char buf[32];
+	char buf[64];
 	struct tm *time;
 
 	time = gmtime(&secs);
-	strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
+	strftime(buf, sizeof(buf)-1, format, time);
 	html_txt(buf);
 }
 
+void cgit_print_age(time_t t, time_t max_relative, char *format)
+{
+	time_t now, secs;
+
+	time(&now);
+	secs = now - t;
+
+	if (secs > max_relative && max_relative >= 0) {
+		cgit_print_date(t, format);
+		return;
+	}
+
+	if (secs < TM_HOUR * 2) {
+		htmlf("<span class='age-mins'>%.0f min.</span>",
+		      secs * 1.0 / TM_MIN);
+		return;
+	}
+	if (secs < TM_DAY * 2) {
+		htmlf("<span class='age-hours'>%.0f hours</span>",
+		      secs * 1.0 / TM_HOUR);
+		return;
+	}
+	if (secs < TM_WEEK * 2) {
+		htmlf("<span class='age-days'>%.0f days</span>",
+		      secs * 1.0 / TM_DAY);
+		return;
+	}
+	if (secs < TM_MONTH * 2) {
+		htmlf("<span class='age-weeks'>%.0f weeks</span>",
+		      secs * 1.0 / TM_WEEK);
+		return;
+	}
+	if (secs < TM_YEAR * 2) {
+		htmlf("<span class='age-months'>%.0f months</span>",
+		      secs * 1.0 / TM_MONTH);
+		return;
+	}
+	htmlf("<span class='age-years'>%.0f years</span>",
+	      secs * 1.0 / TM_YEAR);
+}
+
 void cgit_print_docstart(char *title, struct cacheitem *item)
 {
 	html("Content-Type: text/html; charset=utf-8\n");
 	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
 	htmlf("Expires: %s\n", http_date(item->st.st_mtime +
 					 ttl_seconds(item->ttl)));
 	html("\n");
 	html(cgit_doctype);
 	html("<html>\n");
 	html("<head>\n");
 	html("<title>");
 	html_txt(title);
diff --git a/ui-summary.c b/ui-summary.c
index e7158cc..20394de 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -19,25 +19,25 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
 
 	strncpy(buf, refname, sizeof(buf));
 	commit = lookup_commit(sha1);
 	if (commit && !parse_commit(commit)){
 		info = cgit_parse_commit(commit);
 		html("<tr><td>");
 		url = cgit_pageurl(cgit_query_repo, "log",
 				   fmt("h=%s", refname));
 		html_link_open(url, NULL, NULL);
 		html_txt(buf);
 		html_link_close();
 		html("</td><td>");
-		cgit_print_date(commit->date);
+		cgit_print_date(commit->date, FMT_LONGDATE);
 		html("</td><td>");
 		html_txt(info->author);
 		html("</td><td>");
 		url = cgit_pageurl(cgit_query_repo, "commit",
 				   fmt("h=%s", sha1_to_hex(sha1)));
 		html_link_open(url, NULL, NULL);
 		html_ntxt(cgit_max_msg_len, info->subject);
 		html_link_close();
 		html("</td></tr>\n");
 		cgit_free_commitinfo(info);
 	} else {
 		html("<tr><td>");
@@ -99,25 +99,25 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
 		if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
 			return 2;
 		if (!header)
 			print_tag_header();
 		html("<tr><td>");
 		url = cgit_pageurl(cgit_query_repo, "view",
 				   fmt("id=%s", sha1_to_hex(sha1)));
 		html_link_open(url, NULL, NULL);
 		html_txt(buf);
 		html_link_close();
 		html("</td><td>");
 		if (info->tagger_date > 0)
-			cgit_print_date(info->tagger_date);
+			cgit_print_date(info->tagger_date, FMT_LONGDATE);
 		html("</td><td>");
 		if (info->tagger)
 			html(info->tagger);
 		html("</td><td>");
 		cgit_print_object_ref(tag->tagged);
 		html("</td></tr>\n");
 	} else {
 		if (!header)
 			print_tag_header();
 		html("<tr><td>");
 		html_txt(buf);
 		html("</td><td colspan='2'/><td>");