Optimized image serving + bug fixes

2 files changed, 10 insertions, 8 deletions

diff --git a/dev_status/utils.py b/dev_status/utils.py
index f271e91b..02876dc5 100644
--- a/dev_status/utils.py
+++ b/dev_status/utils.py
@@ -8,17 +8,17 @@ def relative_date(entry):
     now = datetime.now()
     diff = now - committedDate
     if diff.days > 365:
-        entry["commit"]["committedDate"] = str(diff.days // 365) + " years ago"
+        entry["commit"]["committedDate"] = str(diff.days // 365) + " year" + ("s" if diff.days // 365 > 1 else "") + " ago"
     elif diff.days > 30:
-        entry["commit"]["committedDate"] = str(diff.days // 30) + " months ago"
+        entry["commit"]["committedDate"] = str(diff.days // 30) + " month" + ("s" if diff.days // 30 > 1 else "") + " ago"
     elif diff.days > 7:
-        entry["commit"]["committedDate"] = str(diff.days // 7) + " weeks ago"
+        entry["commit"]["committedDate"] = str(diff.days // 7) + " week" + ("s" if diff.days // 7 > 1 else "") + " ago"
     elif diff.days > 0:
-        entry["commit"]["committedDate"] = str(diff.days) + " days ago"
+        entry["commit"]["committedDate"] = str(diff.days) + " day" + ("s" if diff.days > 1 else "") + " ago"
     elif diff.seconds > 3600:
-        entry["commit"]["committedDate"] = str(diff.seconds // 3600) + " hours ago"
+        entry["commit"]["committedDate"] = str(diff.seconds // 3600) + " hour" + ("s" if diff.seconds // 3600 > 1 else "") + " ago"
     elif diff.seconds > 60:
-        entry["commit"]["committedDate"] = str(diff.seconds // 60) + " minutes ago"
+        entry["commit"]["committedDate"] = str(diff.seconds // 60) + " minute" + ("s" if diff.seconds // 60 > 1 else "") + " ago"
     else:
         entry["commit"]["committedDate"] = "just now"
 
diff --git a/dev_status/views.py b/dev_status/views.py
index b6329ee6..678be122 100644
--- a/dev_status/views.py
+++ b/dev_status/views.py
@@ -1,5 +1,6 @@
 import math
 import os
+import re
 
 import requests
 from django.shortcuts import render
@@ -124,7 +125,6 @@ def get_repo(request, r=None, p=None):
     url = "https://api.github.com/graphql"
     headers = {"Authorization": "token " + os.getenv("GH_TOKEN")}
     parent = "/".join(p.split("/")[:-1]) if p and not len(p.split("/")) == 0 else None
-    print(parent, p)
 
     # get the contents of the repository along with the latest commit associated with each file or directory
     query = """
@@ -186,7 +186,9 @@ def get_repo(request, r=None, p=None):
         )
 
         for entry in tree:
-            entry["uniquename"] = entry["path"].replace("/", "").replace(".", "")
+            # make path character only
+            entry["uniquename"] = re.sub(r"[^a-zA-Z]", "", entry["path"])
+
             query += """
             {uniquename}: history(first: 1, path: "{path}") {{
                 nodes {{