From f31a85a62cb0a1c72a80305b4857c843f7f2791c Mon Sep 17 00:00:00 2001 From: KubaPro010 Date: Wed, 15 Apr 2026 21:17:50 +0200 Subject: [PATCH] make ws api simpler --- modules/web.html | 4 ---- modules/web.py | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/web.html b/modules/web.html index 3d971ed..8a98b1a 100644 --- a/modules/web.html +++ b/modules/web.html @@ -284,10 +284,6 @@ const d = msg.data || {}; if(d.track) applyProgressState(d.track); if(d.dirs) updateDirs(d.dirs); - if(d.rds) { - const rt = (d.rds?.rt) ?? ""; - document.getElementById("rds-text").textContent = rt ?? ""; - } } else if (msg.event === "rds") { const rt = (msg.data?.rt) ?? ""; document.getElementById("rds-text").textContent = rt ?? ""; diff --git a/modules/web.py b/modules/web.py index 6cbe701..cb5298f 100644 --- a/modules/web.py +++ b/modules/web.py @@ -16,13 +16,12 @@ async def ws_handler(websocket: ServerConnection, shared_data: dict, imc_q: mult try: initial = { "track": json.loads(shared_data.get("track", "{}")), - "progress": json.loads(shared_data.get("progress", "{}")), "dirs": {"files": [i.name for i in list(MAIN_PATH_DIR.iterdir()) if i.is_file()], "dirs": [i.name for i in list(MAIN_PATH_DIR.iterdir()) if i.is_dir()], "base": str(MAIN_PATH_DIR)}, - "rds": json.loads(shared_data.get("rds", "{}")) } - except Exception: initial = {"track": {}, "progress": {}, "dirs": {}, "rds": {}} + except Exception: initial = {"track": {}, "dirs": {}} await websocket.send(json.dumps({"event": "state", "data": initial})) await websocket.send(json.dumps({"event": "playlist", "data": json.loads(shared_data.get("playlist", "[]"))})) + await websocket.send(json.dumps({"event": "rds", "data": json.loads(shared_data.get("rds", "{}"))})) async for raw in websocket: try: msg: dict = json.loads(raw)