tmp

Dockerfile

@@ -14,7 +14,6 @@ FROM python:3.11-slim
 RUN apt-get update && \
     apt-get install --no-install-recommends -y \
     libmagic1 \
-    git \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app

blueprints/risdeveau/__init__.py

@@ -15,8 +15,8 @@ import magic
 from htmlmin import minify
 from musicbrainzngs import get_image_front
 
-from .modules.api.lb import data as lb_data, refresh_cache as lb_refresh
+from .modules.api.lb import data as lb_data
-from .modules.api.steam import data as steam_data, refresh_cache as steam_refresh
+from .modules.api.steam import data as steam_data
 
 def tmsmp(sec: int) -> str:
     if sec == 0:
@@ -83,16 +83,10 @@ args = {
 
 @bp.route("/")
 def index():
-    lb_refresh()
-    steam_refresh()
     return render_tmpl('index.pug', **args)
 
 @bp.route("/m/<module>")
 def module(module):
-    if module == "listenbrainz":
-        lb_refresh()
-    elif module == "steam":
-        steam_refresh()
     if none_match := request.headers.get('if-none-match'):
         match module:
             case "listenbrainz":

blueprints/risdeveau/modules/api/lb.py

@@ -11,9 +11,6 @@ from apscheduler.triggers.interval import IntervalTrigger
 import requests
 from flask import Flask, jsonify
 
-from .scheduler_guard import should_start_scheduler
-from .shared_cache import atomic_write_json, cache_file, load_json_if_newer
-
 
 @dataclass
 class Cache:
@@ -21,7 +18,6 @@ class Cache:
     last_updated = time()
     status = None
 
-
 data = {
     "caches": {
         "now": Cache(),
@@ -31,55 +27,6 @@ data = {
     "etag": ""
 }
 
-_IS_WRITER = should_start_scheduler()
-_CACHE_PATH = cache_file("listenbrainz")
-_CACHE_MTIME = 0.0
-
-
-def refresh_cache() -> None:
-    """Refresh in-memory cache from the shared JSON file (for non-writer workers)."""
-    global _CACHE_MTIME
-    if _IS_WRITER:
-        return
-
-    payload, mtime = load_json_if_newer(_CACHE_PATH, _CACHE_MTIME)
-    if payload is None:
-        return
-
-    try:
-        data["etag"] = payload.get("etag", data.get("etag", ""))
-        data["last_updated"] = payload.get("last_updated", data.get("last_updated", time()))
-        caches = payload.get("caches", {})
-        for key, cache in data.get("caches", {}).items():
-            if isinstance(caches, dict) and key in caches and isinstance(caches[key], dict):
-                c = caches[key]
-                cache.data = c.get("data", cache.data)
-                cache.last_updated = c.get("last_updated", cache.last_updated)
-                cache.status = c.get("status", cache.status)
-    finally:
-        _CACHE_MTIME = mtime
-
-
-def _persist_cache() -> None:
-    """Persist current cache state to the shared JSON file (writer worker only)."""
-    if not _IS_WRITER:
-        return
-
-    payload = {
-        "etag": data.get("etag", ""),
-        "last_updated": data.get("last_updated", time()),
-        "caches": {
-            k: {
-                "data": v.data,
-                "last_updated": v.last_updated,
-                "status": v.status,
-            }
-            for k, v in data.get("caches", {}).items()
-        },
-    }
-    atomic_write_json(_CACHE_PATH, payload)
-
-
 def yt_cover(youtube_url):
     parsed_url = urlparse(youtube_url)
 
@@ -95,7 +42,6 @@ def yt_cover(youtube_url):
 
     return f"https://img.youtube.com/vi/{video_id}/2.jpg"
 
-
 def parse_listens(json: dict) -> dict:
     cover_replacing = {
         "1e699948-c7c8-4bb2-9f8b-62e14b882a5d": "ca464c1d-5848-45bb-b92d-b1e4b00f9d65",
@@ -140,11 +86,7 @@ def parse_listens(json: dict) -> dict:
 
     return new_json
 
-
 def api_request(url: str, cache: Cache):
-    changed = False
-    prev_status = cache.status
-
     try:
         response = requests.get(url, timeout=10)
         if response.status_code == 200:
@@ -158,36 +100,24 @@ def api_request(url: str, cache: Cache):
                 data['etag'] = md5(''.join(
                     ( dumps(data['caches'][x].data) for x in data['caches'] )
                 ).encode()).hexdigest()
-                changed = True
         else:
             cache.status = f'error: {response.status_code}'
     except Exception as e:
         cache.status = f'error: {str(e)}'
 
-    if prev_status != cache.status:
-        changed = True
-
-    if changed:
-        _persist_cache()
-
-
 scheduler = BackgroundScheduler()
+scheduler.add_job(
+    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", data['caches']['now']),
+    trigger=IntervalTrigger(seconds=15),
+    id='risdeveau.listenbrainz.playing-now',
+    replace_existing=True
+)
+scheduler.start()
 
-if _IS_WRITER:
+atexit.register(lambda: scheduler.shutdown())
-    scheduler.add_job(
-        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", data['caches']['now']),
-        trigger=IntervalTrigger(seconds=15),
-        id='risdeveau.listenbrainz.playing-now',
-        replace_existing=True
-    )
-    _persist_cache()
-    scheduler.start()
-    atexit.register(lambda: scheduler.shutdown())
-else:
-    refresh_cache()

blueprints/risdeveau/modules/api/scheduler_guard.py

@@ -1,35 +0,0 @@
-from __future__ import annotations
-
-import os
-import fcntl
-from typing import Optional
-
-_LOCK_FD: Optional[int] = None  # keep fd open for process lifetime
-
-
-def should_start_scheduler() -> bool:
-    """Return True in exactly one process (the scheduler owner).
-
-    Under gunicorn --workers N, code is imported in N processes. If APScheduler
-    starts at import time, you get N schedulers => N× API calls.
-
-    We prevent that by taking a non-blocking exclusive lock on a lockfile.
-    """
-    global _LOCK_FD
-    if _LOCK_FD is not None:
-        return True
-
-    lock_path = os.environ.get("LAIR_SCHED_LOCK", "/tmp/lair-scheduler.lock")
-    fd = os.open(lock_path, os.O_CREAT | os.O_RDWR, 0o644)
-    try:
-        fcntl.flock(fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
-        _LOCK_FD = fd
-        return True
-    except BlockingIOError:
-        os.close(fd)
-        return False
-    except Exception:
-        try:
-            os.close(fd)
-        finally:
-            return False

blueprints/risdeveau/modules/api/shared_cache.py

@@ -1,53 +0,0 @@
-from __future__ import annotations
-
-import json
-import os
-import tempfile
-from typing import Any, Optional, Tuple
-
-
-def cache_dir() -> str:
-    """Directory where the scheduler owner writes shared cache JSON files."""
-    d = os.environ.get("LAIR_CACHE_DIR", "/tmp/lair-cache")
-    os.makedirs(d, exist_ok=True)
-    return d
-
-
-def cache_file(name: str) -> str:
-    return os.path.join(cache_dir(), f"{name}.json")
-
-
-def atomic_write_json(path: str, payload: dict) -> None:
-    """Write JSON atomically so readers never observe partial content."""
-    parent = os.path.dirname(path) or "."
-    fd, tmp = tempfile.mkstemp(prefix=".tmp-", dir=parent)
-    try:
-        with os.fdopen(fd, "w", encoding="utf-8") as f:
-            json.dump(payload, f, ensure_ascii=False, separators=(",", ":"))
-        os.replace(tmp, path)
-    finally:
-        try:
-            if os.path.exists(tmp):
-                os.unlink(tmp)
-        except Exception:
-            pass
-
-
-def load_json_if_newer(path: str, last_mtime: float) -> Tuple[Optional[dict], float]:
-    """Load JSON only if the file exists and has mtime newer than last_mtime."""
-    try:
-        st = os.stat(path)
-    except FileNotFoundError:
-        return None, last_mtime
-    except Exception:
-        return None, last_mtime
-
-    mtime = float(st.st_mtime)
-    if mtime <= float(last_mtime):
-        return None, last_mtime
-
-    try:
-        with open(path, "r", encoding="utf-8") as f:
-            return json.load(f), mtime
-    except Exception:
-        return None, last_mtime

blueprints/risdeveau/modules/api/steam.py

@@ -12,21 +12,16 @@ from apscheduler.triggers.interval import IntervalTrigger
 import requests
 from flask import Flask
 
-from .scheduler_guard import should_start_scheduler
-from .shared_cache import atomic_write_json, cache_file, load_json_if_newer
-
 
 TOKEN = environ.get("STEAM_TOKEN")
 MY_ID = 76561198826355942
 
-
 @dataclass
 class Cache:
     data = {}
     last_updated = time()
     status = None
 
-
 data = {
     "caches": {
         "recent": Cache(),
@@ -36,55 +31,6 @@ data = {
     "etag": ""
 }
 
-_IS_WRITER = should_start_scheduler()
-_CACHE_PATH = cache_file("steam")
-_CACHE_MTIME = 0.0
-
-
-def refresh_cache() -> None:
-    """Refresh in-memory cache from the shared JSON file (for non-writer workers)."""
-    global _CACHE_MTIME
-    if _IS_WRITER:
-        return
-
-    payload, mtime = load_json_if_newer(_CACHE_PATH, _CACHE_MTIME)
-    if payload is None:
-        return
-
-    try:
-        data["etag"] = payload.get("etag", data.get("etag", ""))
-        data["last_updated"] = payload.get("last_updated", data.get("last_updated", time()))
-        caches = payload.get("caches", {})
-        for key, cache in data.get("caches", {}).items():
-            if isinstance(caches, dict) and key in caches and isinstance(caches[key], dict):
-                c = caches[key]
-                cache.data = c.get("data", cache.data)
-                cache.last_updated = c.get("last_updated", cache.last_updated)
-                cache.status = c.get("status", cache.status)
-    finally:
-        _CACHE_MTIME = mtime
-
-
-def _persist_cache() -> None:
-    """Persist current cache state to the shared JSON file (writer worker only)."""
-    if not _IS_WRITER:
-        return
-
-    payload = {
-        "etag": data.get("etag", ""),
-        "last_updated": data.get("last_updated", time()),
-        "caches": {
-            k: {
-                "data": v.data,
-                "last_updated": v.last_updated,
-                "status": v.status,
-            }
-            for k, v in data.get("caches", {}).items()
-        },
-    }
-    atomic_write_json(_CACHE_PATH, payload)
-
-
 def modify_game_list(json: dict) -> dict:
     if 'games' in json.keys():
         apps = (3301060, 404790, 1281930, 1920960, 1325960, 431960)
@@ -97,7 +43,6 @@ def modify_game_list(json: dict) -> dict:
         json['games'] = new_games
     return json
 
-
 def steam_request(interface: str, method: str, v: int = 1, **kwargs) -> requests.Response:
     return requests.get(
         f"https://api.steampowered.com/{interface}/{method}/v{v:04}/",
@@ -105,11 +50,7 @@ def steam_request(interface: str, method: str, v: int = 1, **kwargs) -> requests
         timeout=10
     )
 
-
 def api_request(cache, *args, **kwargs):
-    changed = False
-    prev_status = cache.status
-
     try:
         response = steam_request(*args, **kwargs)
         if response.status_code == 200:
@@ -123,51 +64,31 @@ def api_request(cache, *args, **kwargs):
                 data['etag'] = md5(''.join(
                     ( dumps(data['caches'][x].data) for x in data['caches'] )
                 ).encode()).hexdigest()
-                changed = True
         else:
             cache.status = f'error: {response.status_code}'
+            print("x")
     except Exception as e:
         cache.status = f'error: {str(e)}'
 
-    if prev_status != cache.status:
-        changed = True
-
-    if changed:
-        _persist_cache()
-
-
 if TOKEN:
     scheduler = BackgroundScheduler()
+    scheduler.add_job(
+        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(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()
 
-    if _IS_WRITER:
+    api_request(data['caches']['recent'], "IPlayerService", "GetRecentlyPlayedGames", steamid=76561198826355942)
-        scheduler.add_job(
+    api_request(data['caches']['owned'], "IPlayerService", "GetOwnedGames", steamid=76561198826355942, include_appinfo=1, include_played_free_games=1)
-            func=lambda: api_request(data['caches']['recent'], "IPlayerService", "GetRecentlyPlayedGames", steamid=MY_ID),
-            trigger=IntervalTrigger(minutes=15),
-            id='risdeveau.steam.recent',
-            replace_existing=True
-        )
-        scheduler.add_job(
-            func=lambda: api_request(data['caches']['owned'], "IPlayerService", "GetOwnedGames", steamid=MY_ID, include_appinfo=1, include_played_free_games=1),
-            trigger=IntervalTrigger(minutes=60),
-            id='risdeveau.steam.owned',
-            replace_existing=True
-        )
 
-        _persist_cache()
+    atexit.register(lambda: scheduler.shutdown())
-        scheduler.start()
-
-        api_request(data['caches']['recent'], "IPlayerService", "GetRecentlyPlayedGames", steamid=MY_ID)
-        api_request(data['caches']['owned'], "IPlayerService", "GetOwnedGames", steamid=MY_ID, include_appinfo=1, include_played_free_games=1)
-
-        atexit.register(lambda: scheduler.shutdown())
-    else:
-        refresh_cache()
 else:
-    msg = "STEAM_TOKEN is not defined"
+    print("STEAM_TOKEN is not defined")
-    print(msg)
-    for c in data["caches"].values():
-        c.status = msg
-    if _IS_WRITER:
-        _persist_cache()
-    else:
-        refresh_cache()

blueprints/risdeveau/templates/88x31.pug

@@ -3,9 +3,6 @@ div
     a.disabled(href="https://chest.lair.moe")
       img(src="/static/img/88x31/gf.png")
 
-    a(href="//lair.moe")
-      img(src="/static/img/88x31/lair.gif")
-
     a#pie(href="https://preview.about.akarpov.ru")
       img(src="/static/img/88x31/withpie.gif")
 

blueprints/risdeveau/templates/contacts.pug

@@ -2,29 +2,29 @@
   h3 Development
   .blocks.badges
     a.block(href="//g.lair.moe/Sweetbread")
-      img.img(src="/static/img/service/gitea.webp")
+      img.icon(src="/static/icon/service/gitea.webp")
       |  Gitea
 
     a.block(href="https://github.com/VerySweetBread")
-      img.img(src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png")
+      img.icon(src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png")
       |  GitHub
 
     a.block(href="https://git.kolibrios.org/Sweetbread")
-      img.img(src="https://git.kolibrios.org/assets/img/logo.svg")
+      img.icon(src="https://git.kolibrios.org/assets/img/logo.svg")
       |  KolibriOS Git
 
   h3 Contacts
   .blocks.badges
     a.block(href="https://matrix.to/#/@risdeveau:lair.moe")
-      img.img(src="https://matrix.org/assets/favimg.ico")
+      img.icon(src="https://matrix.org/assets/favicon.ico")
       |  Matrix
 
     a.block(href="//b.lair.moe/@risdeveau")
-      img.img(src="/static/img/service/sharkey.webp")
+      img.icon(src="/static/icon/service/sharkey.webp")
       |  Fediverse
 
     a.block(href="https://discord.com/users/459823895256498186")
-      img.img(src="https://cdn.prod.website-files.com/6257adef93867e50d84d30e2/66e3d80db9971f10a9757c99_Symbol.svg")
+      img.icon(src="https://cdn.prod.website-files.com/6257adef93867e50d84d30e2/66e3d80db9971f10a9757c99_Symbol.svg")
       |  Discord
 
     a.block(href="mailto:risdeveau@lair.moe") Mail
@@ -32,9 +32,9 @@
   h3 Game accounts
   .blocks.badges
     a.block(href="https://steamcommunity.com/id/risdeveau")
-      img.img(src="https://store.steampowered.com/favimg.ico")
+      img.icon(src="https://store.steampowered.com/favicon.ico")
       |  Steam
 
     a.block(href="https://gamebanana.com/members/3899828")
-      img.img(src="https://images.gamebanana.com/static/img/favimg/favimg.ico")
+      img.icon(src="https://images.gamebanana.com/static/img/favicon/favicon.ico")
       |  GameBanana

blueprints/risdeveau/templates/index.pug

@@ -7,7 +7,7 @@ html(lang="en")
     each f in ('tw', 'main', 'risdeveau')
       link(rel="stylesheet", href="/static/style/#{f}.css")
 
-    link(rel="img" type="image/webp" href="/static/img/us/risdeveau.webp")
+    link(rel="icon" type="image/webp" href="/static/icon/us/risdeveau.webp")
 
     script(src="/static/script/rtime.js")
     script(

blueprints/root/static/style/main.scss

@@ -138,7 +138,7 @@ footer {
     align-items: center;
     font-size: x-large;
 
-    .img {
+    .icon {
       margin-right: .5ch;
     }
   }
@@ -174,7 +174,7 @@ footer {
   }
 }
 
-.img {
+.icon {
   width: 1.5em;
   vertical-align: middle;
   border-radius: .2em;

blueprints/root/templates/base.pug

@@ -4,7 +4,7 @@ html(lang=g.locale)
     title Lair
 
     link(rel="stylesheet" href="/static/style/main.css")
-    link(rel="img" type="image/webp" href="/static/img/lair.webp")
+    link(rel="icon" type="image/webp" href="/static/icon/lair.webp")
 
     script(src="/static/script/copy-mono.js")
     script(
@@ -18,7 +18,7 @@ html(lang=g.locale)
     meta(property="og:type" value="website")
     meta(property="og:url" value="https://lair.moe")
     meta(property="og:title" value="Lair.moe")
-    meta(property="og:image" value="https://lair.moe/static/img/lair.webp")
+    meta(property="og:image" value="https://lair.moe/static/icon/lair.webp")
     meta(property="og:description" value=_("description"))
 
   body

blueprints/root/templates/index.pug

@@ -1,19 +1,19 @@
 extends root/templates/base.pug
 
 block title
-  img.img(src="/static/img/lair.webp")
+  img.icon(src="/static/icon/lair.webp")
   |  Lair
 
 block content
   a.block(href="https://b.lair.moe" target="_blank")
     .header
-      img.img(src="/static/img/service/sharkey.webp")
+      img.icon(src="/static/icon/service/sharkey.webp")
       strong Sharkey
     p= _('index.descr:sharkey')
 
   a.block(href="https://g.lair.moe" target="_blank")
     .header
-      img.img(src="/static/img/service/gitea.webp")
+      img.icon(src="/static/icon/service/gitea.webp")
       strong Gitea
     p= _('index.descr:gitea')
 

blueprints/root/templates/us.pug

@@ -6,12 +6,12 @@ block title
 block content
   a.block.green(href=url_for('risdeveau.index'))
     .header
-      img.img(src="/static/img/us/risdeveau.webp")
+      img.icon(src="/static/icon/us/risdeveau.webp")
       | Sweetbread
     | Главный админ, занимается почти всеми сервисами. Создал этот сайт
 
   .block.orange.disabled
     .header
-      img.img(src="/static/img/us/chest.webp")
+      img.icon(src="/static/icon/us/chest.webp")
       | Chest
     | Должна была помогать делать этот сайт