Merge pull request #16 from Deekerman/claude/epg-game-notifications-Ry3Va

Switch game-thumbs to game-thumbs.swvn.io with type/style config

Author: Deekerman

game_thumbs.py

@@ -10,6 +10,8 @@
 
 log = logging.getLogger(__name__)
 
+GAME_THUMBS_BASE = "https://game-thumbs.swvn.io"
+
 # Separators used in sports titles: "vs", "vs.", "v.", "@", "at" (away at home)
 _TEAM_SEP    = re.compile(r'\s+(?:vs?\.?|@|at)\s+', re.IGNORECASE)
 _TRAILING    = re.compile(r'\s*[-–(].*$')   # strip trailing dash/paren noise
@@ -34,15 +36,19 @@ def _to_pascal(name: str) -> str:
     return "".join(w.capitalize() for w in re.split(r"\s+", name.strip()) if w)
 
 
+def _build_url(league_code: str, away: str, home: str, image_type: str, style: str) -> str:
+    logo = "true" if image_type == "logo" else "false"
+    return (
+        f"{GAME_THUMBS_BASE}/{league_code}/{away}/{home}"
+        f"/thumb.png?style={style}&logo={logo}&aspect=16-9"
+    )
+
+
 def build_thumb_url(game: "GroupedMatch", cfg: dict) -> str:
     """Return a Game-Thumbs URL, or '' if teams/league/config unavailable."""
     thumbs_cfg = cfg.get("game_thumbs", {})
     if not thumbs_cfg.get("enabled"):
         return ""
-    base_url = thumbs_cfg.get("base_url", "").rstrip("/")
-    if not base_url:
-        log.warning("game_thumbs enabled but base_url not set in Settings")
-        return ""
     league_code = getattr(game.subscription, "game_thumbs_league", None)
     if not league_code:
         log.debug("build_thumb_url: no game_thumbs_league on subscription '%s'",
@@ -57,6 +63,8 @@ def build_thumb_url(game: "GroupedMatch", cfg: dict) -> str:
         return ""
     away = _to_pascal(teams[0])
     home = _to_pascal(teams[1])
-    url = f"{base_url}/{league_code}/{away}/{home}/thumb.png?style=1&logo=true&aspect=16-9"
+    image_type = thumbs_cfg.get("image_type", "logo")
+    style = str(thumbs_cfg.get("style", "1"))
+    url = _build_url(league_code, away, home, image_type, style)
     log.info("build_thumb_url: %s", url)
     return url

server.py

@@ -683,14 +683,10 @@ async def save_settings(request: Request):
 
     thumbs = cfg.setdefault("game_thumbs", {})
     thumbs["enabled"] = form.get("game_thumbs_enabled") == "on"
-    raw_thumbs_url = form.get("game_thumbs_url", "").strip()
-    if raw_thumbs_url:
-        try:
-            thumbs["base_url"] = _validate_url(raw_thumbs_url)
-        except ValueError as exc:
-            return Response(status_code=400, headers={"X-Toast": str(exc)})
-    elif "base_url" not in thumbs:
-        thumbs["base_url"] = ""
+    thumbs["image_type"] = form.get("game_thumbs_type", "logo").strip() or "logo"
+    raw_style = form.get("game_thumbs_style", "1").strip()
+    thumbs["style"] = raw_style if raw_style.isdigit() else "1"
+    thumbs.pop("base_url", None)
 
     tpl = cfg.setdefault("notification_template", {})
     tpl_title = form.get("notif_title_tpl", "").strip()
@@ -818,16 +814,16 @@ async def preview_send(
 
     thumb_url = ""
     if sub_game_thumbs_league:
-        from game_thumbs import build_thumb_url, _extract_game_teams, _to_pascal
+        from game_thumbs import _extract_game_teams, _to_pascal, _build_url
         thumbs_cfg = cfg.get("game_thumbs", {})
         if thumbs_cfg.get("enabled"):
-            base_url = thumbs_cfg.get("base_url", "").rstrip("/")
-            if base_url:
-                teams = _extract_game_teams(notif_title)
-                if teams:
-                    away = _to_pascal(teams[0])
-                    home = _to_pascal(teams[1])
-                    thumb_url = f"{base_url}/{sub_game_thumbs_league}/{away}/{home}/thumb.png?style=1&logo=true&aspect=16-9"
+            teams = _extract_game_teams(notif_title)
+            if teams:
+                away = _to_pascal(teams[0])
+                home = _to_pascal(teams[1])
+                image_type = thumbs_cfg.get("image_type", "logo")
+                style = str(thumbs_cfg.get("style", "1"))
+                thumb_url = _build_url(sub_game_thumbs_league, away, home, image_type, style)
 
     errors = _send_to_channels(notif_title, notif_body, sub_channels, cfg, thumb_url=thumb_url)
     if errors:

templates/settings.html

@@ -160,11 +160,33 @@ <h2 class="text-sm font-semibold text-white">Notification Message</h2>
 
     <!-- ── Game Thumbnails ───────────────────────────────────────────── -->
     {% set thumbs = cfg.get('game_thumbs', {}) %}
-    <section class="card p-5 space-y-4">
+    <section class="card p-5 space-y-4"
+             x-data="{
+               type: '{{ thumbs.get('image_type', 'logo') }}',
+               logoStyles: [
+                 {v:'1', label:'Style 1 — Diagonal split with dividing line'},
+                 {v:'2', label:'Style 2 — Side by side arrangement'},
+                 {v:'3', label:'Style 3 — Circle badges with team colors (league logo overlay)'},
+                 {v:'4', label:'Style 4 — Square badges with team colors (league logo overlay)'},
+                 {v:'5', label:'Style 5 — Circle badges with league logo on left (white background)'},
+                 {v:'6', label:'Style 6 — Square badges with league logo on left (white background)'},
+               ],
+               coverStyles: [
+                 {v:'1',  label:'Style 1 — Diagonal/horizontal split with team colors'},
+                 {v:'2',  label:'Style 2 — Gradient blend between team colors'},
+                 {v:'3',  label:'Style 3 — Minimalist badge with team circles (light background)'},
+                 {v:'4',  label:'Style 4 — Minimalist badge with team circles (dark background)'},
+                 {v:'5',  label:'Style 5 — Grid background with grey diagonal lines and fade to black'},
+                 {v:'6',  label:'Style 6 — Grid background with team color gradient lines and fade to black'},
+                 {v:'98', label:'Style 98 — 3D embossed with textures, reflections, metallic VS badge, and league logo'},
+                 {v:'99', label:'Style 99 — 3D embossed with textures, reflections, and metallic VS badge (no league logo)'},
+               ],
+               get styles() { return this.type === 'cover' ? this.coverStyles : this.logoStyles; }
+             }">
       <div class="flex items-center justify-between">
         <div>
           <h2 class="text-sm font-semibold text-white">Game Thumbnails</h2>
-          <p class="text-xs text-muted mt-0.5">Attach a team matchup image via a self-hosted <a href="https://game-thumbs-docs.swvn.io/" target="_blank" class="text-indigo-400 hover:underline">Game-Thumbs</a> server. Set <code class="text-indigo-300">game_thumbs_league</code> per subscription.</p>
+          <p class="text-xs text-muted mt-0.5">Attach a team matchup image from <a href="https://game-thumbs.swvn.io" target="_blank" class="text-indigo-400 hover:underline">game-thumbs.swvn.io</a>. Set <code class="text-indigo-300">game_thumbs_league</code> per subscription.</p>
         </div>
         <label class="relative inline-flex items-center cursor-pointer shrink-0 ml-4">
           <input type="checkbox" name="game_thumbs_enabled" value="on" class="sr-only peer"
@@ -175,12 +197,22 @@ <h2 class="text-sm font-semibold text-white">Game Thumbnails</h2>
                       after:transition-all peer-checked:after:translate-x-4"></div>
         </label>
       </div>
-      <div class="border-t border-border pt-4">
-        <label class="form-label">Server URL</label>
-        <input name="game_thumbs_url" class="field"
-               value="{{ thumbs.get('base_url', '') }}"
-               placeholder="e.g. http://192.168.1.40:3050" />
-        <p class="form-hint">Base URL of your Game-Thumbs server — no trailing slash</p>
+      <div class="border-t border-border pt-4 grid grid-cols-2 gap-4">
+        <div>
+          <label class="form-label">Image Type</label>
+          <select name="game_thumbs_type" class="field" x-model="type">
+            <option value="logo">Logo</option>
+            <option value="cover">Cover</option>
+          </select>
+        </div>
+        <div>
+          <label class="form-label">Style</label>
+          <select name="game_thumbs_style" class="field">
+            <template x-for="s in styles" :key="s.v">
+              <option :value="s.v" :selected="s.v === '{{ thumbs.get('style', '1')|string }}'" x-text="s.label"></option>
+            </template>
+          </select>
+        </div>
       </div>
     </section>