From 2dcb46a217e141d949dbce66ee79201658cfb391 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Sun, 24 Jun 2018 15:05:20 +0800 Subject: js: add dynamic age update This patch updates the emitted "ages" dynamically on the client side. After updating on completion of the document load, it sets a timer to update according to the smallest age it found. If there are any ages listed in minutes, then it will update again in 10s. When the most recent age is in hours, it updates every 5m. If days, then every 30m and so on. This keeps the cost of the dynamic updates at worst once per 10s. The updates are done entirely on the client side without contact with the server. To make this work reliably, since parsing datetimes is unreliable in browser js, the unix time is added as an attribute to all age spans. To make that reliable cross-platform, the unix time is treated as a uint64_t when it is formatted for printing. The rules for display conversion of the age is aligned with the existing server-side rules in ui-shared.h. If the client or server-side time are not synchronized by ntpd etc, ages shown on the client will not relate to the original ages computed at the server. The client updates the ages immediately when the DOM has finished loading, so in the case the times at the server and client are not aligned, this patch changes what the user sees on the page to reflect patch age compared to client time. If the server and client clocks are aligned, this patch makes no difference to what is seen on the page. Signed-off-by: Andy Green Signed-off-by: Christian Hesse --- cgit.h | 1 + cgit.js | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ui-shared.c | 2 +- 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/cgit.h b/cgit.h index a0cf5e9..ddd2ccb 100644 --- a/cgit.h +++ b/cgit.h @@ -25,6 +25,7 @@ #include #include #include +#include /* Add isgraph(x) to Git's sane ctype support (see git-compat-util.h) */ #undef isgraph diff --git a/cgit.js b/cgit.js index b35e0bc..df3ad4e 100644 --- a/cgit.js +++ b/cgit.js @@ -5,3 +5,64 @@ * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ + +(function () { + +/* This follows the logic and suffixes used in ui-shared.c */ + +var age_classes = [ "age-mins", "age-hours", "age-days", "age-weeks", "age-months", "age-years" ]; +var age_suffix = [ "min.", "hours", "days", "weeks", "months", "years", "years" ]; +var age_next = [ 60, 3600, 24 * 3600, 7 * 24 * 3600, 30 * 24 * 3600, 365 * 24 * 3600, 365 * 24 * 3600 ]; +var age_limit = [ 7200, 24 * 7200, 7 * 24 * 7200, 30 * 24 * 7200, 365 * 25 * 7200, 365 * 25 * 7200 ]; +var update_next = [ 10, 5 * 60, 1800, 24 * 3600, 24 * 3600, 24 * 3600, 24 * 3600 ]; + +function render_age(e, age) { + var t, n; + + for (n = 0; n < age_classes.length; n++) + if (age < age_limit[n]) + break; + + t = Math.round(age / age_next[n]) + " " + age_suffix[n]; + + if (e.textContent != t) { + e.textContent = t; + if (n == age_classes.length) + n--; + if (e.className != age_classes[n]) + e.className = age_classes[n]; + } +} + +function aging() { + var n, next = 24 * 3600, + now_ut = Math.round((new Date().getTime() / 1000)); + + for (n = 0; n < age_classes.length; n++) { + var m, elems = document.getElementsByClassName(age_classes[n]); + + if (elems.length && update_next[n] < next) + next = update_next[n]; + + for (m = 0; m < elems.length; m++) { + var age = now_ut - elems[m].getAttribute("data-ut"); + + render_age(elems[m], age); + } + } + + /* + * We only need to come back when the age might have changed. + * Eg, if everything is counted in hours already, once per + * 5 minutes is accurate enough. + */ + + window.setTimeout(aging, next * 1000); +} + +document.addEventListener("DOMContentLoaded", function() { + /* we can do the aging on DOM content load since no layout dependency */ + aging(); +}, false); + +})(); diff --git a/ui-shared.c b/ui-shared.c index bc76a6e..959ed8b 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -673,7 +673,7 @@ const struct date_mode *cgit_date_mode(enum date_mode_type type) static void print_rel_date(time_t t, int tz, double value, const char *class, const char *suffix) { - htmlf("%.0f %s", value, suffix); } -- cgit v1.2.3-70-g09d2