added proper DEBUG prints, attempts at fixing timezone fails with If-Modified-Since header, conversion methods between old and new scores data format

cli.py

@@ -5,7 +5,6 @@ A simple CLI implementation using the application's API.
 """
 
 import curses
-import time
 from datetime import datetime
 from typing import List
 
@@ -18,7 +17,7 @@ lastAttempt: float = -1
 lastUpdate: float = -1
 
 
-def refreshScores() -> bool:
+def refreshScores() -> None:
     """
     Refreshes scoreboard data safely, handling a unresponsive or downed scoreboard.
     Uses If-Modified-Since headers properly.
@@ -30,21 +29,24 @@ def refreshScores() -> bool:
     global lastUpdate, lastAttempt, scores
 
     # Send with If-Modified-Since header if this is not the first time
-    headers = {'If-Modified-Since': datetime.fromtimestamp(lastAttempt).strftime('%a, %d %b %Y %I:%M:%S')} if lastAttempt > 0 else {}
+    useTime = max(lastAttempt, lastUpdate)
+    headers = {
+        'If-Modified-Since': datetime.fromtimestamp(useTime, pytz.utc).strftime(
+            '%a, %d %b %Y %I:%M:%S %Z')} if useTime > 0 else {}
     # Send request with headers
     try:
         resp = requests.get('http://127.0.0.1:5000/api/scores/', headers=headers)
     except requests.exceptions.ConnectionError:
         resp = None
     finally:
-        lastAttempt = time.time()
+        lastAttempt = datetime.utcnow().timestamp()
 
     if resp is not None and resp.ok:
         if resp.status_code == 304 and len(scores) != 0:
             pass
         else:
             # Changes found, update!
-            lastUpdate = time.time()
+            lastUpdate = datetime.utcnow().timestamp()
             scores = resp.json()
 
             # Calculate totals, preliminary sort by total
@@ -54,25 +56,25 @@ def refreshScores() -> bool:
 
             # Calculate ranks with tie handling logic
             for i, team in enumerate(scores):
+                # Check that previous score is the same, if so add a 'T' for tie
                 if i > 0 and scores[i - 1]['total'] == team['total']:
                     team['rank'] = scores[i - 1]['rank']
 
+                    # Check if we have a T
                     if not team['rank'].startswith('T'):
                         team['rank'] = 'T' + team['rank'].strip()
 
+                    # Check if previous score has a T
                     if not scores[i - 1]['rank'].startswith('T'):
                         scores[i - 1]['rank'] = 'T' + scores[i - 1]['rank'].strip()
-
                 else:
+                    # Otherwise just add a space in front instead
                     team['rank'] = " " + str(i + 1)
 
-            return True
-    return False
-
 
 def main(screen) -> None:
     """
-    Mainloop function
+    Mainloop function.
 
     :param screen: Curses screen
     """
@@ -80,7 +82,7 @@ def main(screen) -> None:
     screen.redrawwin()
     while True:
         # Refresh scores every 10 seconds
-        if time.time() - lastAttempt > 0.5:
+        if datetime.utcnow().timestamp() - lastAttempt > 0.5:
             refreshScores()
 
         # Get current terminal size and clear
@@ -90,6 +92,7 @@ def main(screen) -> None:
         # Build table data
         global scores
         table = [[team['rank'], team['id'], team['name'], team['total'], *team['scores']] for team in scores[:y - 4]]
+        # Round number headers
         scoreSet = map(str, range(1, max(8, len(scores[0]['scores'])) + 1)) if scores else []
         table.insert(0, ['Rank', 'ID', 'Team Name', 'T', *scoreSet])
         table = SingleTable(table, title='EfTA Trivia Night')
@@ -104,7 +107,8 @@ def main(screen) -> None:
         # Terminal Size
         strpos = str((x, y))
         screen.addstr(y - 1, 1, strpos)
-        screen.addstr(y - 1, 1 + len(strpos) + 1, f'({str(round(0.5 - (time.time() - lastAttempt), 3)).zfill(3)})')
+        screen.addstr(y - 1, 1 + len(strpos) + 1,
+                      f'({str(round(0.5 - (datetime.utcnow().timestamp() - lastAttempt), 3)).zfill(3)})')
 
         # Update curses screen
         screen.refresh()