Fix covers

blueprints/risdeveau/__init__.py

@@ -1,21 +1,22 @@
 import os
-import magic
-from pathlib import Path
-from htmlmin import minify
-from time import time
 from datetime import datetime, timedelta
-from musicbrainzngs import get_image_front
+from pathlib import Path
+from time import time
+
 from flask import (
     Blueprint,
-    render_template,
-    send_file,
-    send_from_directory,
-    make_response,
     abort,
+    make_response,
+    render_template,
+    request,
+    send_file,
 )
+import magic
+from htmlmin import minify
+from musicbrainzngs import get_image_front
 
-from .modules.api.lb import listens, listening
+from .modules.api.lb import data as lb_data
-from .modules.api.steam import recent, owned
+from .modules.api.steam import data as steam_data
 
 def tmsmp(sec: int) -> str:
     if sec == 0:
@@ -73,10 +74,8 @@ def mb_cover(mbid):
     return r
 
 args = {
-    "lb":     listens,
+    "lb":     lb_data,
-    "lb_now": listening,
+    "steam":  steam_data,
-    "recent": recent,
-    "owned":  owned,
     "tmsmp":  tmsmp,
     "utmsmp": utmsmp,
     "rtmsmp": rtmsmp
@@ -88,4 +87,22 @@ def index():
 
 @bp.route("/m/<module>")
 def module(module):
+    if modified_since := request.headers.get('if-modified-since'):
+        modified_since = int(modified_since)
+    none_match = request.headers.get('if-none-match')
+
+    if any((modified_since, none_match)):
+        match module:
+            case "listenbrainz":
+                if modified_since >= int(lb_data['last_updated']):
+                    return '', 304
+                if none_match == lb_data['etag']:
+                    return '', 304
+
+            case "steam":
+                if modified_since >= int(steam_data['last_updated']):
+                    return '', 304
+                if none_match == steam_data['etag']:
+                    return '', 304
+
     return render_tmpl(f'{module}.htm', **args)

blueprints/risdeveau/modules/api/lb.py

@@ -1,14 +1,31 @@
-from flask import Flask, jsonify
+import atexit
+import re
+from dataclasses import dataclass
+from hashlib import md5
+from json import dumps
+from time import time
+from urllib.parse import parse_qs, urlparse
+
 from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.triggers.interval import IntervalTrigger
 import requests
-from datetime import datetime
+from flask import Flask, jsonify
-import atexit
-import re
-from urllib.parse import urlparse, parse_qs
 
-listens = {}
+
-listening = {}
+@dataclass
+class Cache:
+    data = {}
+    last_updated = time()
+    status = None
+
+data = {
+    "caches": {
+        "now": Cache(),
+        "listens": Cache()
+    },
+    "last_updated": time(),
+    "etag": ""
+}
 
 def yt_cover(youtube_url):
     parsed_url = urlparse(youtube_url)
@@ -23,20 +40,22 @@ def yt_cover(youtube_url):
     if not video_id:
         return
 
-    return f"http://img.youtube.com/vi/{video_id}/sddefault.jpg"
+    return f"https://img.youtube.com/vi/{video_id}/2.jpg"
 
-def parse_listens(data: dict) -> dict:
+def parse_listens(json: dict) -> dict:
-    new_data = {
+    new_json = {
-        "count": data["count"],
+        "count": json["count"],
         "listens": []
     }
 
-    for track in data["listens"]:
+    for track in json["listens"]:
+        listened_at = track.get("listened_at", 0)
         track = track["track_metadata"]
 
         new_track = {
             "artist_name": track["artist_name"],
-            "track_name": track["track_name"]
+            "track_name": track["track_name"],
+            "listened_at": listened_at
         }
 
         if mb := track.get("mbid_mapping"):
@@ -53,33 +72,38 @@ def parse_listens(data: dict) -> dict:
         if "cover_url" not in new_track.keys() and "id" in new_track.keys():
             new_track["cover_url"] = "/asset/mb/" + new_track["id"]
 
-        new_data["listens"].append(new_track)
+        new_json["listens"].append(new_track)
 
-    return new_data
+    return new_json
 
-def api_request(url: str, cache):
+def api_request(url: str, cache: Cache):
     try:
         response = requests.get(url, timeout=10)
         if response.status_code == 200:
-            cache.update({
+            json = parse_listens(response.json().get("payload"))
-                'data': parse_listens(response.json().get("payload")),
+            cache.status = 'success'
-                'last_updated': datetime.now().isoformat(),
+
-                'status': 'success'
+            if cache.data != json:
-            })
+                cache.data = json
+                cache.last_updated = time()
+                data['last_updated'] = time()
+                data['etag'] = md5(''.join(
+                    ( dumps(data['caches'][x].data) for x in data['caches'] )
+                ).encode()).hexdigest()
         else:
-            cache['status'] = f'error: {response.status_code}'
+            cache.status = f'error: {response.status_code}'
     except Exception as e:
-        cache['status'] = f'error: {str(e)}'
+        cache.status = f'error: {str(e)}'
 
 scheduler = BackgroundScheduler()
 scheduler.add_job(
-    func=lambda: api_request("https://api.listenbrainz.org/1/user/risdeveau/listens?count=5", listens),
+    func=lambda: api_request("https://api.listenbrainz.org/1/user/risdeveau/listens?count=5", data['caches']['listens']),
     trigger=IntervalTrigger(minutes=1),
     id='risdeveau.listenbrainz.listens',
     replace_existing=True
 )
 scheduler.add_job(
-    func=lambda: api_request("https://api.listenbrainz.org/1/user/risdeveau/playing-now", listening),
+    func=lambda: api_request("https://api.listenbrainz.org/1/user/risdeveau/playing-now", data['caches']['now']),
     trigger=IntervalTrigger(seconds=15),
     id='risdeveau.listenbrainz.playing-now',
     replace_existing=True

blueprints/risdeveau/modules/api/steam.py

@@ -1,18 +1,35 @@
+import atexit
+import re
+from dataclasses import dataclass
+from hashlib import md5
+from json import dumps
 from os import environ
-from flask import Flask, jsonify
+from time import time
+from urllib.parse import parse_qs, urlparse
+
 from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.triggers.interval import IntervalTrigger
 import requests
-from time import time
+from flask import Flask
-import atexit
+
-import re
-from urllib.parse import urlparse, parse_qs
 
 TOKEN = environ.get("STEAM_TOKEN")
 MY_ID = 76561198826355942
 
-recent = {}
+@dataclass
-owned = {}
+class Cache:
+    data = {}
+    last_updated = time()
+    status = None
+
+data = {
+    "caches": {
+        "recent": Cache(),
+        "owned": Cache()
+    },
+    "last_updated": time(),
+    "etag": ""
+}
 
 def modify_game_list(json: dict) -> dict:
     if 'games' in json.keys():
@@ -37,34 +54,40 @@ def api_request(cache, *args, **kwargs):
     try:
         response = steam_request(*args, **kwargs)
         if response.status_code == 200:
-            cache.update({
+            json = modify_game_list(response.json().get("response"))
-                'data': modify_game_list(response.json().get("response")),
+            cache.status = 'success'
-                'last_updated': time(),
+
-                'status': 'success'
+            if cache.data != json:
-            })
+                cache.data = json
+                cache.last_updated = time()
+                data['last_updated'] = time()
+                data['etag'] = md5(''.join(
+                    ( dumps(data['caches'][x].data) for x in data['caches'] )
+                ).encode()).hexdigest()
         else:
-            cache['status'] = f'error: {response.status_code}'
+            cache.status = f'error: {response.status_code}'
+            print("x")
     except Exception as e:
-        cache['status'] = f'error: {str(e)}'
+        cache.status = f'error: {str(e)}'
 
 if TOKEN:
     scheduler = BackgroundScheduler()
     scheduler.add_job(
-        func=lambda: api_request(recent, "IPlayerService", "GetRecentlyPlayedGames", steamid=76561198826355942),
+        func=lambda: api_request(data['caches']['recent'], "IPlayerService", "GetRecentlyPlayedGames", steamid=76561198826355942),
         trigger=IntervalTrigger(minutes=15),
         id='risdeveau.steam.recent',
         replace_existing=True
     )
     scheduler.add_job(
-        func=lambda: api_request(owned, "IPlayerService", "GetOwnedGames", steamid=76561198826355942, include_appinfo=1, include_played_free_games=1),
+        func=lambda: api_request(data['caches']['owned'], "IPlayerService", "GetOwnedGames", steamid=76561198826355942, include_appinfo=1, include_played_free_games=1),
         trigger=IntervalTrigger(minutes=60),
         id='risdeveau.steam.owned',
         replace_existing=True
     )
     scheduler.start()
 
-    api_request(recent, "IPlayerService", "GetRecentlyPlayedGames", steamid=76561198826355942)
+    api_request(data['caches']['recent'], "IPlayerService", "GetRecentlyPlayedGames", steamid=76561198826355942)
-    api_request(owned, "IPlayerService", "GetOwnedGames", steamid=76561198826355942, include_appinfo=1, include_played_free_games=1)
+    api_request(data['caches']['owned'], "IPlayerService", "GetOwnedGames", steamid=76561198826355942, include_appinfo=1, include_played_free_games=1)
 
     atexit.register(lambda: scheduler.shutdown())
 else:

blueprints/risdeveau/static/script/rtime.js

@@ -0,0 +1,68 @@
+document.addEventListener('alpine:init', () => {
+  Alpine.data('rtime', (unixTimestamp) => ({
+    targetDate: new Date(unixTimestamp * 1000),
+    timeString: '',
+    timer: null,
+    interval: 1000,
+
+    colorClasses: {
+      green:  't-green',
+      yellow: 't-yellow',
+      orange: 't-orange',
+      red:    't-red'
+    },
+
+    currentColor: 'green',
+
+    get textColorClass() {
+      return this.colorClasses[this.currentColor];
+    },
+
+    init() {
+      this.updateTime();
+      this.timer = setInterval(() => this.updateTime(), this.interval);
+
+      this.$el.addEventListener('alpine:removing', () => {
+        if (this.interval) clearInterval(this.interval);
+      });
+    },
+
+    updateTime() {
+      const now = new Date();
+      const diffInSeconds = Math.floor((now - this.targetDate) / 1000);
+      const diffInMinutes = Math.floor(diffInSeconds / 60);
+      const diffInHours = Math.floor(diffInSeconds / 3600);
+      const diffInDays = Math.floor(diffInSeconds / 86400);
+
+      let newInterval = this.interval;
+
+      if (diffInSeconds < 60) {
+        this.timeString = 'a moment ago';
+      } else if (diffInMinutes < 60) {
+        this.timeString = `${diffInMinutes} m ago`;
+        newInterval = 10000;
+      } else if (diffInHours < 24) {
+        this.timeString = `${diffInHours} h ago`;
+        newInterval = 60000;
+      } else {
+        this.timeString = `${diffInDays} d ago`;
+        clearInterval(this.timer);
+      }
+
+      if (diffInMinutes <= 15) {
+        this.currentColor = 'green';
+      } else if (diffInHours < 1) {
+        this.currentColor = 'yellow';
+      } else if (diffInDays < 1) {
+        this.currentColor = 'orange';
+      } else {
+        this.currentColor = 'red';
+      }
+
+      if (this.interval != newInterval) {
+        clearInterval(this.timer)
+        this.timer = setInterval(() => this.updateTime(), newInterval);
+      }
+    },
+  }));
+});

blueprints/risdeveau/static/style/risdeveau.scss

@@ -44,6 +44,7 @@ h3 {
   img {
     width: 5rem;
     height: 5rem;
+    object-fit: cover;
     border-radius: .5rem;
   }
 }

blueprints/risdeveau/templates/index.html

@@ -3,9 +3,12 @@
 <head>
   <title>Sweet Bread</title>
 
+  <link rel="stylesheet" href="/static/style/tw.css">
   <link rel="stylesheet" href="/static/style/main.css">
   <link rel="stylesheet" href="/static/style/risdeveau.css">
   <link rel="icon" type="image/webp" href="/static/icon/us/risdeveau.webp" />
+
+  <script src="/static/script/rtime.js"></script>
   <script
     src="https://track.lair.moe/api/script.js"
     data-site-id="1"
@@ -16,7 +19,22 @@
     integrity="sha384-/TgkGk7p307TH7EXJDuUlgG3Ce1UVolAOFopFekQkkXihi5u/6OCvVKyz1W+idaz"
     crossorigin="anonymous"
   ></script>
+  <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script>
+
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta
+    name="htmx-config"
+    content='{
+      "responseHandling":[
+        {"code":"204", "swap": false},
+        {"code":"304", "swap": false},
+        {"code":"[23]..", "swap": true},
+        {"code":"422", "swap": true},
+        {"code":"[45]..", "swap": false, "error":true},
+        {"code":"...", "swap": true}
+      ]
+    }'
+  />
 </head>
 <body>
   <header>

blueprints/risdeveau/templates/listenbrainz.htm

@@ -6,6 +6,13 @@
     <div>
       <p><b>{{ track.artist_name }}</b></p>
       <p>{{ track.track_name }}</p>
+      {% if not is_active %}
+        <p
+          x-data="rtime({{ track.listened_at }})"
+          x-text="`Listened ${timeString}`"
+          :class="textColorClass"
+        ></p>
+      {% endif %}
     </div>
   </div>
 {% endmacro %}
@@ -15,13 +22,17 @@
   hx-get="/m/listenbrainz"
   hx-trigger="every 15s"
   hx-swap="outerHTML"
+  hx-headers='{
+    "If-Modified-Since": {{ lb.last_updated | int }},
+    "If-None-Match": "{{ lb.etag }}"
+  }'
 >
   <h2><a href="https://listenbrainz.org/user/risdeveau/">Listenbrainz</a></h2>
-  {% if lb_now.data and lb_now.data.listens.0 %}
+  {% if lb.caches.now.data and lb.caches.now.data.listens.0 %}
-    {{ track_block(lb_now.data.listens.0, is_active=true) }}
+    {{ track_block(lb.caches.now.data.listens.0, is_active=true) }}
   {% endif %}
-  {% if lb.data and lb.data.listens %}
+  {% if lb.caches.listens.data and lb.caches.listens.data.listens %}
-    {% for track in lb.data.listens %}
+    {% for track in lb.caches.listens.data.listens %}
       {{ track_block(track) }}
     {% endfor %}
   {% endif %}

blueprints/risdeveau/templates/steam.htm

@@ -3,12 +3,16 @@
   hx-get="/m/steam"
   hx-trigger="every 1m"
   hx-swap="outerHTML"
+  hx-headers='{
+    "If-Modified-Since": {{ steam.last_updated | int }},
+    "If-None-Match": "{{ steam.etag }}"
+  }'
 >
   <h2><a href="https://steamcommunity.com/id/risdeveau">Steam</a></h2>
 
-  {% if recent.data.games %}
+  {% if steam.caches.recent.data.games %}
     <h3>Recently played:</h3>
-    {% for g in recent.data.games %}
+    {% for g in steam.caches.recent.data.games %}
       <a href="https://store.steampowered.com/app/{{ g.appid }}" class="block">
         <picture>
           <source media="(max-width: 45rem)" srcset="{{ g.v_cover }}">
@@ -27,12 +31,15 @@
         </div>
       </a>
     {% endfor %}
-    <p>Last updated: {{ rtmsmp(recent.last_updated) }} ago</p>
+    <p
+      x-data="rtime({{steam.caches.recent.last_updated}})"
+      x-text="`Last updated: ${timeString}`"
+    ></p>
   {% endif %}
 
-  {% if owned.data.games %}
+  {% if steam.caches.owned.data.games %}
     <h3>Top played games:</h3>
-    {% set owned_games = owned.data.games | sort(attribute="playtime_forever", reverse=true) %}
+    {% set owned_games = steam.caches.owned.data.games | sort(attribute="playtime_forever", reverse=true) %}
     {% for g in owned_games[:5] %}
       <a href="https://store.steampowered.com/app/{{ g.appid }}" class="block">
         <picture>
@@ -54,6 +61,9 @@
         </div>
       </a>
     {% endfor %}
-    <p>Last updated: {{ rtmsmp(owned.last_updated) }} ago</p>
+    <p
+      x-data="rtime({{steam.caches.owned.last_updated}})"
+      x-text="`Last updated: ${timeString}`"
+    ></p>
   {% endif %}
 </div>

blueprints/root/modules/style.py

@@ -3,7 +3,7 @@ from os.path import join
 
 def compile_styles():
     dir = "blueprints/root/static/style"
-    files = ("main",)
+    files = ("main", "tw")
 
     for file in files:
         console(f"sass {join(dir, file+'.scss')} {join(dir, file+'.css')}")

blueprints/root/static/style/_catppuccin.scss

@@ -18,6 +18,7 @@ $subtext0: #a6adc8;
 $subtext1: #bac2de;
 
 $red: #f38ba8;
+$yellow: #f9e2af;
 $green: #a6e3a1;
 $peach: #fab387;
 $blue: #89b4fa;

blueprints/root/static/style/tw.scss

@@ -0,0 +1,8 @@
+@use "catppuccin" as theme;
+
+.t {
+  &-red { color: theme.$red; }
+  &-orange { color: theme.$peach; }
+  &-yellow { color: theme.$yellow; }
+  &-green { color: theme.$green; }
+}