mikkeli/pi-dashboard-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

silent alarms available

Browse Source
This commit is contained in:
Mikkeli Matlock
2026-02-17 12:45:21 +09:00
parent 7ec68fec84
commit 37a09ef66b
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
contents_server.py
View File

@@ -48,12 +48,22 @@ def _resolve_path(relative: str) -> Path:
return p
def _prepare_alarm(entry: dict) -> dict:
def _prepare_alarm(entry: dict, audio_cache: dict[Path, tuple]) -> dict:
"""Pre-resolve paths and load resources for a single alarm entry."""
audio_path = find_wav(_resolve_path(entry.get("alarm_audio", "assets/alarm/alarm_test.wav")))
alarm_img_path = _resolve_path(entry.get("alarm_image", "assets/img/on_alarm.png"))
pcm, sr, ch, bits = read_wav(audio_path)
img = load_status_image(alarm_img_path)
pcm = sr = ch = bits = None
raw_audio = entry.get("alarm_audio")
if raw_audio is not None:
audio_path = find_wav(_resolve_path(raw_audio))
if audio_path in audio_cache:
log.info("Reusing cached audio for %s", audio_path)
pcm, sr, ch, bits = audio_cache[audio_path]
else:
pcm, sr, ch, bits = read_wav(audio_path)
audio_cache[audio_path] = (pcm, sr, ch, bits)
return {
"config": entry,
"pcm": pcm, "sr": sr, "ch": ch, "bits": bits,
@@ -71,7 +81,8 @@ async def handler(ws):
img_idle = load_status_image(IMG_DIR / "idle.png")
current_img = img_idle
alarms = [_prepare_alarm(entry) for entry in configs] if configs else []
audio_cache: dict[Path, tuple] = {}
alarms = [_prepare_alarm(entry, audio_cache) for entry in configs] if configs else []
async def alarm_ticker():
nonlocal current_img
@@ -91,10 +102,14 @@ async def handler(ws):
alarm["config"]["alarm_time"], current_minute)
current_img = alarm["img"]
await send_status_image(ws, current_img)
await stream_alarm(ws, alarm["pcm"], alarm["sr"],
alarm["ch"], alarm["bits"])
# let the image persist a bit more
await asyncio.sleep(1)
if alarm["pcm"] is not None:
await stream_alarm(ws, alarm["pcm"], alarm["sr"],
alarm["ch"], alarm["bits"])
# let the image persist a bit more
await asyncio.sleep(1)
else:
# longer image persistence when no audio
await asyncio.sleep(10)
current_img = img_idle
await send_status_image(ws, current_img)