Replace auto-download with an interactive HTML game setup UI

No games are fetched at container start anymore. scripts/setup_server.py is a small stdlib-only Python HTTP server, started alongside Xvnc/fluxbox/ websockify, serving an HTML page on ${SETUP_PORT} (70${DISPLAY_NUM}, published as 7099 by run.sh) that lists every *.zip found live on the SMB share with an Installed/Install status per game. Clicking Install downloads and extracts just that game into ${GAMES_HOME} on demand. Replaces the old fetch_games.sh, which unconditionally pulled every game on first start. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NiNnj78HGx1KWyCCo39HSz
2026-07-28 08:37:12 +02:00
parent 44bbd00336
commit c6ae36ba67
6 changed files with 181 additions and 29 deletions
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-SMB_BASE="smb://vlda-01/software/Games/dosbox"
-GAME_ZIPS="stuntcar.zip t7g.zip"
-
-if [ -n "$(ls -A "${GAMES_HOME}" 2>/dev/null)" ]; then
-    echo "Games already present in ${GAMES_HOME}, skipping fetch"
-    exit 0
-fi
-
-echo "Fetching games into ${GAMES_HOME}..."
-TMPDIR=$(mktemp -d)
-trap 'rm -rf "${TMPDIR}"' EXIT
-
-cd "${TMPDIR}"
-for zip in ${GAME_ZIPS}; do
-    smbget -au "${SMB_BASE}/${zip}"
-done
-unzip -o -d "${GAMES_HOME}" "*.zip"
@@ -3,8 +3,9 @@ set -x

 RFB_PORT=59${DISPLAY_NUM}
 NOVNC_PORT=80${DISPLAY_NUM}
+SETUP_PORT=70${DISPLAY_NUM}

-${SCRIPTS_HOME}/fetch_games.sh
+SETUP_PORT=${SETUP_PORT} ${SCRIPTS_HOME}/setup_server.py &

 echo Display at ${DISPLAY} with ${SCREEN_W}x${SCREEN_H}x24
 Xvnc ${DISPLAY} -geometry ${SCREEN_W}x${SCREEN_H} -depth 24 +xinerama -securitytypes none >/var/log/xvfb.log &
@@ -0,0 +1,166 @@
+#!/usr/bin/env python3
+"""HTML setup routine: lets the user browse games available on the SMB
+share and install them into GAMES_HOME on demand, instead of the image
+auto-downloading everything at container startup."""
+
+import html
+import os
+import re
+import subprocess
+import threading
+from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
+from urllib.parse import parse_qs, urlparse
+
+SMB_SERVER = "vlda-01"
+SMB_SHARE = "software"
+SMB_DIR = r"Games\dosbox"
+GAMES_HOME = os.environ["GAMES_HOME"]
+SETUP_PORT = int(os.environ.get("SETUP_PORT", "8080"))
+
+state_lock = threading.Lock()
+install_state = {}  # name -> "downloading" | "extracting" | "done" | "error: ..."
+
+
+def list_remote_games():
+    result = subprocess.run(
+        ["smbclient", "-N", f"//{SMB_SERVER}/{SMB_SHARE}", "-c", f"ls {SMB_DIR}\\*.zip"],
+        capture_output=True, text=True, timeout=15,
+    )
+    games = []
+    for line in result.stdout.splitlines():
+        m = re.match(r"\s*(\S+)\.zip\s+A\s+(\d+)", line)
+        if m:
+            games.append((m.group(1), int(m.group(2))))
+    return sorted(games)
+
+
+def list_installed_games():
+    if not os.path.isdir(GAMES_HOME):
+        return set()
+    return {
+        name for name in os.listdir(GAMES_HOME)
+        if os.path.isdir(os.path.join(GAMES_HOME, name)) and os.listdir(os.path.join(GAMES_HOME, name))
+    }
+
+
+def install_game(name):
+    with state_lock:
+        if install_state.get(name) in ("downloading", "extracting"):
+            return
+        install_state[name] = "downloading"
+
+    tmpdir = f"/tmp/setup-{name}"
+    try:
+        os.makedirs(tmpdir, exist_ok=True)
+        zip_path = os.path.join(tmpdir, f"{name}.zip")
+        # smbget's -a (guest) can't be combined with -o (output file), so let it save
+        # under the default name in tmpdir instead, same as the original build-time fetch.
+        subprocess.run(
+            ["smbget", "-au", f"smb://{SMB_SERVER}/{SMB_SHARE}/Games/dosbox/{name}.zip"],
+            check=True, timeout=1800, cwd=tmpdir,
+        )
+        with state_lock:
+            install_state[name] = "extracting"
+        os.makedirs(GAMES_HOME, exist_ok=True)
+        subprocess.run(["unzip", "-o", "-d", GAMES_HOME, zip_path], check=True, timeout=600)
+        with state_lock:
+            install_state[name] = "done"
+    except Exception as exc:
+        with state_lock:
+            install_state[name] = f"error: {exc}"
+    finally:
+        subprocess.run(["rm", "-rf", tmpdir], check=False)
+
+
+def render_page():
+    remote = list_remote_games()
+    installed = list_installed_games()
+    with state_lock:
+        pending = dict(install_state)
+
+    any_pending = any(v in ("downloading", "extracting") for v in pending.values())
+    refresh_tag = '<meta http-equiv="refresh" content="3">' if any_pending else ""
+
+    rows = []
+    for name, size in remote:
+        status = pending.get(name)
+        if name in installed and status not in ("downloading", "extracting"):
+            action = '<span class="status ok">Installed</span>'
+        elif status in ("downloading", "extracting"):
+            action = f'<span class="status busy">{status}...</span>'
+        elif status and status.startswith("error"):
+            action = (
+                f'<span class="status err">{html.escape(status)}</span>'
+                f'<form method="post" action="/install"><input type="hidden" name="name" value="{html.escape(name)}">'
+                f'<button type="submit">Retry</button></form>'
+            )
+        else:
+            action = (
+                f'<form method="post" action="/install"><input type="hidden" name="name" value="{html.escape(name)}">'
+                f'<button type="submit">Install</button></form>'
+            )
+        rows.append(
+            f"<tr><td>{html.escape(name)}</td><td>{size / 1_000_000:.1f} MB</td><td>{action}</td></tr>"
+        )
+
+    return f"""<!doctype html>
+<html>
+<head>
+<title>dosbox-novnc game setup</title>
+{refresh_tag}
+<style>
+body {{ font-family: sans-serif; margin: 2em; }}
+table {{ border-collapse: collapse; width: 100%; max-width: 640px; }}
+th, td {{ text-align: left; padding: 0.5em 1em; border-bottom: 1px solid #ccc; }}
+form {{ margin: 0; }}
+button {{ padding: 0.3em 0.8em; }}
+.status.ok {{ color: #2a2; font-weight: bold; }}
+.status.busy {{ color: #a70; font-weight: bold; }}
+.status.err {{ color: #c22; }}
+</style>
+</head>
+<body>
+<h1>DOSBox games</h1>
+<table>
+<tr><th>Game</th><th>Size</th><th>Status / Action</th></tr>
+{''.join(rows) if rows else '<tr><td colspan="3">No games found on the share</td></tr>'}
+</table>
+</body>
+</html>"""
+
+
+class Handler(BaseHTTPRequestHandler):
+    def log_message(self, fmt, *args):
+        pass
+
+    def _send_html(self, body, status=200):
+        encoded = body.encode("utf-8")
+        self.send_response(status)
+        self.send_header("Content-Type", "text/html; charset=utf-8")
+        self.send_header("Content-Length", str(len(encoded)))
+        self.end_headers()
+        self.wfile.write(encoded)
+
+    def do_GET(self):
+        if urlparse(self.path).path == "/":
+            self._send_html(render_page())
+        else:
+            self._send_html("Not found", status=404)
+
+    def do_POST(self):
+        if urlparse(self.path).path != "/install":
+            self._send_html("Not found", status=404)
+            return
+        length = int(self.headers.get("Content-Length", 0))
+        body = self.rfile.read(length).decode("utf-8")
+        name = parse_qs(body).get("name", [""])[0]
+        valid_names = {n for n, _ in list_remote_games()}
+        if name in valid_names:
+            threading.Thread(target=install_game, args=(name,), daemon=True).start()
+        self.send_response(303)
+        self.send_header("Location", "/")
+        self.end_headers()
+
+
+if __name__ == "__main__":
+    ThreadingHTTPServer(("0.0.0.0", SETUP_PORT), Handler).serve_forever()