From 74420f8f34f76196a4257305a6cb3e01922b2ded Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ml=C3=A1dek?= <t@mldk.cz>
Date: Mon, 17 Jan 2022 16:39:22 +0100
Subject: [PATCH] add naturalized datetimes

---
 generate.py          | 26 +++++++++++++++++++++++---
 templates/index.html | 24 ++++++++++++++++++------
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/generate.py b/generate.py
index 4c35e96..f6447aa 100644
--- a/generate.py
+++ b/generate.py
@@ -229,15 +229,19 @@ def run_forever(
                         writer.writerow((lease.ip, lease.mac, lease.hostname or "???"))
             elif output_file.endswith(".html"):
                 last_change = None
+                last_change_natural = None
                 for ts, leases in groupby(
                     _fetch_leases(db, now - timedelta(days=7)), key=attrgetter("ts")
                 ):
                     humans_present = [lease for lease in leases if lease.is_human]
                     if (len(humans_present) > 0) != (status.level > 0):
                         last_change = {"ts": ts, "leases": humans_present}
+                        last_change_natural = humanize.naturaltime(datetime.now() - ts)
                         break
 
-                log_entry = namedtuple("log_entry", ("ts", "state", "lease"))
+                log_entry = namedtuple(
+                    "log_entry", ("ts", "ts_natural", "state", "lease")
+                )
                 log = []
                 last_seen = []
                 for ts, leases in groupby(
@@ -247,10 +251,24 @@ def run_forever(
                     leases = list(leases)
                     for lease in leases:
                         if lease.mac not in (l.mac for l in last_seen):
-                            log.append(log_entry(ts, True, lease))
+                            log.append(
+                                log_entry(
+                                    ts,
+                                    humanize.naturaltime(datetime.now() - ts),
+                                    True,
+                                    lease,
+                                )
+                            )
                     for lease in last_seen:
                         if lease.mac not in (l.mac for l in leases):
-                            log.append(log_entry(ts, False, lease))
+                            log.append(
+                                log_entry(
+                                    ts,
+                                    humanize.naturaltime(datetime.now() - ts),
+                                    False,
+                                    lease,
+                                )
+                            )
                     last_seen = leases
 
                 collapse_thresh = timedelta(minutes=10)
@@ -301,6 +319,7 @@ def run_forever(
                         leases=registered_leases,
                         status=status,
                         last_change=last_change,
+                        last_change_natural=last_change_natural,
                         log=log,
                         leaderboard=leaderboard,
                         internal=False,
@@ -314,6 +333,7 @@ def run_forever(
                     leases=registered_leases,
                     status=status,
                     last_change=last_change,
+                    last_change_natural=last_change_natural,
                     log=log,
                     leaderboard=leaderboard,
                     internal=True,
diff --git a/templates/index.html b/templates/index.html
index 819f59e..111f9ab 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -58,7 +58,7 @@
       }
 
       .nonhuman {
-        opacity: .66;
+        opacity: 0.66;
       }
 
       .log {
@@ -73,6 +73,10 @@
         color: green;
       }
 
+      .ago {
+        opacity: 0.66;
+      }
+
       .datetime {
         font-weight: 600;
         margin: 1em 0;
@@ -103,10 +107,15 @@
       <div class="status-explanation">{{status.text}}</div>
       <div class="level">{{status.level}}</div>
       <div>
-        <strong>Since:</strong> {% if last_change %}
-        {{last_change['ts'].strftime("%c")}} {% if status.level == 0
-        %}({{last_change.leases | map(attribute='display') | join(', ')}}){%
-        endif %} {% else %} as far as I can tell? {% endif %}
+        <strong>Since:</strong>
+        {% if last_change %}
+          {{ last_change['ts'].strftime("%c") }} - {{ last_change_natural}}
+          {% if status.level == 0 %}
+            ({{last_change.leases | map(attribute='display') | join(', ')}})
+          {% endif %}
+        {% else %}
+          as far as I can tell?
+        {% endif %}
       </div>
     </div>
     <h2>Current clients</h2>
@@ -130,7 +139,10 @@
     <table class="log">
       {% for entry in log %}
       <tr>
-        <td>{{entry.ts.strftime("%c")}}</td>
+        <td>
+          {{entry.ts.strftime("%c")}}
+          <span class="ago">({{entry.ts_natural}})</span>
+        </td>
         <td>
           {% if entry.state %}
           <span class="log-in">IN</span>