diff --git a/Pipfile b/Pipfile index 052f39c..6908fa0 100644 --- a/Pipfile +++ b/Pipfile @@ -27,7 +27,7 @@ python_version = "3.11" web = "python tests/web.py" watch = "python -m watchfiles \"python tests/web.py\" src tests" run = "sh -c 'cd src && python main.py'" -dev = "python -m watchfiles \"sh -c 'cd src && python main.py'\" src" +dev = "python -m watchfiles \"sh -c 'cd src && LED_CONTROLLER_LIVE_RELOAD=1 python main.py'\" src" test = "python -m pytest" test-browser = "sh -c 'python tests/web.py > /tmp/led-controller-web.log 2>&1 & pid=$!; trap \"kill $pid\" EXIT; sleep 2; LED_CONTROLLER_RUN_BROWSER_TESTS=1 LED_CONTROLLER_DEVICE_IP=http://127.0.0.1:5000 python -m pytest tests/test_browser.py'" test-browser-device = "sh -c 'LED_CONTROLLER_RUN_BROWSER_TESTS=1 python -m pytest tests/test_browser.py'" diff --git a/db/pattern.json b/db/pattern.json index 6215840..e038d35 100644 --- a/db/pattern.json +++ b/db/pattern.json @@ -104,7 +104,7 @@ "n3": "In time (ms)", "min_delay": 10, "max_delay": 10000, - "max_colors": 2, + "max_colors": 10, "has_background": true, "supports_manual": true }, diff --git a/db/preset.json b/db/preset.json index b122b0c..c2b4579 100644 --- a/db/preset.json +++ b/db/preset.json @@ -1 +1 @@ -{"1": {"name": "on", "pattern": "on", "colors": ["#FFFFFF"], "brightness": 255, "delay": 100, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "2": {"name": "off", "pattern": "off", "colors": [], "brightness": 0, "delay": 100, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "3": {"name": "rainbow", "pattern": "rainbow", "colors": [], "brightness": 255, "delay": 100, "auto": true, "n1": 2, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "4": {"name": "transition", "pattern": "transition", "colors": ["#FF0000", "#00FF00", "#0000FF"], "brightness": 255, "delay": 300, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null, null]}, "5": {"name": "chase", "pattern": "chase", "colors": ["#FFFF00", "#FF00FF"], "brightness": 255, "delay": 200, "auto": false, "n1": 30, "n2": 30, "n3": 30, "n4": 30, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [3, 4], "manual_beat_n": 1}, "6": {"name": "pulse", "pattern": "pulse", "colors": ["#FF00FF"], "brightness": 255, "delay": 1000, "auto": false, "n1": 100, "n2": 0, "n3": 100, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [4], "background_color": "#ec0909", "background_palette_ref": null, "manual_beat_n": 1, "background": "#090a00"}, "7": {"name": "circle", "pattern": "circle", "colors": ["#FFA500", "#800080"], "brightness": 255, "delay": 200, "auto": true, "n1": 2, "n2": 10, "n3": 2, "n4": 5, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "8": {"name": "blink", "pattern": "blink", "colors": ["#FF0000", "#00FF00", "#0000FF", "#FFFF00"], "brightness": 255, "delay": 1000, "auto": false, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null, null, null]}, "9": {"name": "warm white", "pattern": "on", "colors": ["#FFF5E6"], "brightness": 200, "delay": 100, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "10": {"name": "cool white", "pattern": "on", "colors": ["#E6F2FF"], "brightness": 200, "delay": 100, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "11": {"name": "red", "pattern": "on", "colors": ["#FF0000"], "brightness": 255, "delay": 100, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "12": {"name": "blue", "pattern": "on", "colors": ["#0000FF"], "brightness": 255, "delay": 100, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "13": {"name": "rainbow slow", "pattern": "rainbow", "colors": [], "brightness": 255, "delay": 150, "auto": true, "n1": 1, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "14": {"name": "pulse slow", "pattern": "pulse", "colors": ["#FF6600"], "brightness": 255, "delay": 800, "auto": true, "n1": 2000, "n2": 1000, "n3": 2000, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "15": {"name": "blink red green", "pattern": "blink", "colors": ["#FF0000", "#00FF00"], "brightness": 255, "delay": 500, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "30": {"name": "rainbow slow", "pattern": "rainbow", "colors": [], "brightness": 255, "delay": 150, "auto": true, "n1": 1, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "2"}, "31": {"name": "DJ Rainbow", "pattern": "rainbow", "colors": [], "brightness": 220, "delay": 60, "n1": 12, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "2"}, "32": {"name": "DJ Single Color", "pattern": "on", "colors": ["#ff00ff"], "brightness": 220, "delay": 100, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "2"}, "33": {"name": "DJ Transition", "pattern": "transition", "colors": ["#ff0000", "#00ff00", "#0000ff"], "brightness": 220, "delay": 250, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "2"}, "34": {"name": "DJ Rainbow", "pattern": "rainbow", "colors": [], "brightness": 220, "delay": 60, "n1": 12, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "2"}, "35": {"name": "DJ Single Color", "pattern": "on", "colors": ["#ff00ff"], "brightness": 220, "delay": 100, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "2"}, "36": {"name": "DJ Transition", "pattern": "transition", "colors": ["#ff0000", "#00ff00", "#0000ff"], "brightness": 220, "delay": 250, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "2"}, "37": {"name": "tranistion2", "pattern": "transition", "colors": ["#FF0000", "#FFFF00", "#FF00FF"], "brightness": 128, "delay": 1000, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [0, 3, 4]}, "38": {"name": "Colour Cycle", "pattern": "colour_cycle", "colors": ["#FF0000", "#0000FF"], "brightness": 255, "delay": 100, "auto": true, "n1": 1, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null]}, "39": {"name": "flicker", "pattern": "flicker", "colors": ["#ae00ff"], "brightness": 255, "delay": 50, "auto": false, "n1": 100, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null], "background": "#000000", "manual_beat_n": 1}, "40": {"name": "flame", "pattern": "flame", "colors": ["#ffc800"], "brightness": 128, "delay": 50, "auto": true, "n1": 35, "n2": 2600, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null]}, "41": {"name": "twinkle", "pattern": "twinkle", "colors": ["#78C8FF", "#508CFF", "#B478FF", "#64DCE8", "#A0C8FF"], "brightness": 255, "delay": 100, "auto": true, "n1": 150, "n2": 20, "n3": 0, "n4": 10, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null, null, null, null], "background": "#000000", "manual_beat_n": 1}, "42": {"name": "radiate", "pattern": "radiate", "colors": ["#a600ff"], "brightness": 255, "delay": 2000, "auto": false, "n1": 60, "n2": 200, "n3": 100, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null], "manual_beat_n": 1, "background": "#0a0a00"}, "43": {"name": "test meteor rain", "pattern": "meteor_rain", "colors": ["#FF5000", "#0080FF"], "brightness": 200, "delay": 40, "auto": true, "n1": 50, "n2": 1, "n3": 200, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null]}, "44": {"name": "test scanner", "pattern": "scanner", "colors": ["#FF0000"], "brightness": 255, "delay": 30, "auto": true, "n1": 4, "n2": 2, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "45": {"name": "test gradient scroll", "pattern": "gradient_scroll", "colors": ["#FF0000", "#00FF00", "#0000FF"], "brightness": 220, "delay": 60, "auto": true, "n1": 2, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "46": {"name": "test comet dual", "pattern": "comet_dual", "colors": ["#FFAA00", "#00AAFF"], "brightness": 200, "delay": 60, "auto": true, "n1": 8, "n2": 1, "n3": 3, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null], "background": "#0b000f", "manual_beat_n": 1}, "47": {"name": "test sparkle trail", "pattern": "sparkle_trail", "colors": ["#88CCFF", "#FFFFFF"], "brightness": 200, "delay": 60, "auto": true, "n1": 24, "n2": 210, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null], "background": "#000000", "manual_beat_n": 1}, "48": {"name": "test wave", "pattern": "wave", "colors": ["#00B4FF"], "brightness": 200, "delay": 60, "auto": true, "n1": 12, "n2": 180, "n3": 1, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "49": {"name": "test plasma", "pattern": "plasma", "colors": ["#FF0066"], "brightness": 200, "delay": 60, "auto": true, "n1": 6, "n2": 2, "n3": 2, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "50": {"name": "test segment chase", "pattern": "segment_chase", "colors": ["#FF0000", "#0000FF"], "brightness": 200, "delay": 60, "auto": true, "n1": 4, "n2": 1, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "51": {"name": "test bar graph", "pattern": "bar_graph", "colors": ["#00FF00", "#102010"], "brightness": 200, "delay": 60, "auto": true, "n1": 60, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "52": {"name": "test breathing dual", "pattern": "breathing_dual", "colors": ["#FF0088", "#00AAFF"], "brightness": 200, "delay": 60, "auto": true, "n1": 128, "n2": 1, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "53": {"name": "test strobe burst", "pattern": "strobe_burst", "colors": ["#FFFFFF"], "brightness": 200, "delay": 60, "auto": false, "n1": 2, "n2": 10, "n3": 100, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null], "background": "#000000", "manual_beat_n": 1}, "54": {"name": "test rain drops", "pattern": "rain_drops", "colors": ["#7cbdfe"], "brightness": 200, "delay": 60, "auto": true, "n1": 32, "n2": 3, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null], "background": "#000000", "manual_beat_n": 1}, "55": {"name": "test fireflies", "pattern": "fireflies", "colors": ["#FFD060", "#90FF90"], "brightness": 200, "delay": 60, "auto": false, "n1": 6, "n2": 8, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null], "background": "#000000", "manual_beat_n": 1}, "56": {"name": "test clock sweep", "pattern": "clock_sweep", "colors": ["#FFFFFF", "#202020"], "brightness": 200, "delay": 60, "auto": true, "n1": 1, "n2": 5, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "57": {"name": "test marquee", "pattern": "marquee", "colors": ["#FFFFFF"], "brightness": 200, "delay": 60, "auto": true, "n1": 3, "n2": 2, "n3": 1, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "58": {"name": "test aurora", "pattern": "aurora", "colors": ["#2CC88C", "#5078FF", "#A050DC"], "brightness": 200, "delay": 60, "auto": true, "n1": 3, "n2": 40, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "59": {"name": "test snowfall", "pattern": "snowfall", "colors": ["#FFFFFF", "#B0DCFF"], "brightness": 200, "delay": 60, "auto": true, "n1": 20, "n2": 1, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "60": {"name": "test heartbeat", "pattern": "heartbeat", "colors": ["#FF2840"], "brightness": 200, "delay": 60, "auto": false, "n1": 200, "n2": 50, "n3": 500, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null], "background": "#000000", "manual_beat_n": 1}, "61": {"name": "test orbit", "pattern": "orbit", "colors": ["#FFFFFF", "#00B4FF", "#FF0077"], "brightness": 200, "delay": 60, "auto": true, "n1": 3, "n2": 1, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null, null]}, "62": {"name": "test palette morph", "pattern": "palette_morph", "colors": ["#FF0000", "#00FF00", "#0000FF"], "brightness": 200, "delay": 60, "auto": true, "n1": 1200, "n2": 200, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}} \ No newline at end of file +{"1": {"name": "on", "pattern": "on", "colors": ["#FFFFFF"], "brightness": 255, "delay": 100, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "2": {"name": "off", "pattern": "off", "colors": [], "brightness": 0, "delay": 100, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "3": {"name": "rainbow", "pattern": "rainbow", "colors": [], "brightness": 255, "delay": 100, "auto": true, "n1": 2, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "4": {"name": "transition", "pattern": "transition", "colors": ["#FF0000", "#00FF00", "#0000FF"], "brightness": 255, "delay": 300, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null, null], "background": "#000000", "manual_beat_n": 1}, "5": {"name": "chase", "pattern": "chase", "colors": ["#FFFF00", "#FF00FF"], "brightness": 255, "delay": 200, "auto": false, "n1": 30, "n2": 30, "n3": 30, "n4": 30, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [3, 4], "manual_beat_n": 1}, "6": {"name": "pulse", "pattern": "pulse", "colors": ["#FF00FF", "#00FF00", "#00FFFF", "#0000FF"], "brightness": 255, "delay": 1000, "auto": false, "n1": 100, "n2": 0, "n3": 100, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [4, 1, 5, 2], "background_color": "#ec0909", "background_palette_ref": null, "manual_beat_n": 1, "background": "#090a00"}, "7": {"name": "circle", "pattern": "circle", "colors": ["#FFA500", "#800080"], "brightness": 255, "delay": 200, "auto": true, "n1": 2, "n2": 10, "n3": 2, "n4": 5, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "8": {"name": "blink", "pattern": "blink", "colors": ["#FF0000", "#00FF00", "#0000FF", "#FFFF00"], "brightness": 255, "delay": 1000, "auto": false, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null, null, null]}, "9": {"name": "warm white", "pattern": "on", "colors": ["#FFF5E6"], "brightness": 200, "delay": 100, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "10": {"name": "cool white", "pattern": "on", "colors": ["#E6F2FF"], "brightness": 200, "delay": 100, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "11": {"name": "red", "pattern": "on", "colors": ["#FF0000"], "brightness": 255, "delay": 100, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "12": {"name": "blue", "pattern": "on", "colors": ["#0000FF"], "brightness": 255, "delay": 100, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "13": {"name": "rainbow slow", "pattern": "rainbow", "colors": [], "brightness": 255, "delay": 150, "auto": true, "n1": 1, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "14": {"name": "pulse slow", "pattern": "pulse", "colors": ["#FF6600"], "brightness": 255, "delay": 800, "auto": true, "n1": 2000, "n2": 1000, "n3": 2000, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "15": {"name": "blink red green", "pattern": "blink", "colors": ["#FF0000", "#00FF00"], "brightness": 255, "delay": 500, "auto": true, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "30": {"name": "rainbow slow", "pattern": "rainbow", "colors": [], "brightness": 255, "delay": 150, "auto": true, "n1": 1, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "2"}, "31": {"name": "DJ Rainbow", "pattern": "rainbow", "colors": [], "brightness": 220, "delay": 60, "n1": 12, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "2"}, "32": {"name": "DJ Single Color", "pattern": "on", "colors": ["#ff00ff"], "brightness": 220, "delay": 100, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "2"}, "33": {"name": "DJ Transition", "pattern": "transition", "colors": ["#ff0000", "#00ff00", "#0000ff"], "brightness": 220, "delay": 250, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "2"}, "34": {"name": "DJ Rainbow", "pattern": "rainbow", "colors": [], "brightness": 220, "delay": 60, "n1": 12, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "2"}, "35": {"name": "DJ Single Color", "pattern": "on", "colors": ["#ff00ff"], "brightness": 220, "delay": 100, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "2"}, "36": {"name": "DJ Transition", "pattern": "transition", "colors": ["#ff0000", "#00ff00", "#0000ff"], "brightness": 220, "delay": 250, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "2"}, "37": {"name": "tranistion2", "pattern": "transition", "colors": ["#FF0000", "#FFFF00", "#FF00FF"], "brightness": 128, "delay": 1000, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [0, 3, 4]}, "38": {"name": "Colour Cycle", "pattern": "colour_cycle", "colors": ["#FF0000", "#0000FF"], "brightness": 255, "delay": 100, "auto": true, "n1": 1, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null]}, "39": {"name": "flicker", "pattern": "flicker", "colors": ["#ae00ff"], "brightness": 255, "delay": 50, "auto": false, "n1": 100, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null], "background": "#000000", "manual_beat_n": 1}, "40": {"name": "flame", "pattern": "flame", "colors": ["#ffc800"], "brightness": 128, "delay": 50, "auto": true, "n1": 35, "n2": 2600, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null]}, "41": {"name": "twinkle", "pattern": "twinkle", "colors": ["#78C8FF", "#508CFF", "#B478FF", "#64DCE8", "#A0C8FF"], "brightness": 255, "delay": 100, "auto": true, "n1": 150, "n2": 20, "n3": 0, "n4": 10, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null, null, null, null], "background": "#000000", "manual_beat_n": 1}, "42": {"name": "radiate", "pattern": "radiate", "colors": ["#a600ff"], "brightness": 255, "delay": 2000, "auto": false, "n1": 60, "n2": 200, "n3": 100, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null], "manual_beat_n": 1, "background": "#0a0a00"}, "43": {"name": "test meteor rain", "pattern": "meteor_rain", "colors": ["#FF5000", "#0080FF"], "brightness": 200, "delay": 40, "auto": true, "n1": 50, "n2": 1, "n3": 200, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null]}, "44": {"name": "test scanner", "pattern": "scanner", "colors": ["#FF0000"], "brightness": 255, "delay": 30, "auto": true, "n1": 4, "n2": 2, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "45": {"name": "test gradient scroll", "pattern": "gradient_scroll", "colors": ["#FF0000", "#00FF00", "#0000FF"], "brightness": 220, "delay": 60, "auto": true, "n1": 2, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "46": {"name": "test comet dual", "pattern": "comet_dual", "colors": ["#FFAA00", "#00AAFF"], "brightness": 200, "delay": 60, "auto": true, "n1": 8, "n2": 1, "n3": 3, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null], "background": "#0b000f", "manual_beat_n": 1}, "47": {"name": "test sparkle trail", "pattern": "sparkle_trail", "colors": ["#88CCFF", "#FFFFFF"], "brightness": 200, "delay": 60, "auto": true, "n1": 24, "n2": 210, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null], "background": "#000000", "manual_beat_n": 1}, "48": {"name": "test wave", "pattern": "wave", "colors": ["#00B4FF"], "brightness": 200, "delay": 60, "auto": true, "n1": 12, "n2": 180, "n3": 1, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "49": {"name": "test plasma", "pattern": "plasma", "colors": ["#FF0066"], "brightness": 200, "delay": 60, "auto": true, "n1": 6, "n2": 2, "n3": 2, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "50": {"name": "test segment chase", "pattern": "segment_chase", "colors": ["#FF0000", "#0000FF"], "brightness": 200, "delay": 60, "auto": true, "n1": 4, "n2": 1, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "51": {"name": "test bar graph", "pattern": "bar_graph", "colors": ["#00FF00", "#102010"], "brightness": 200, "delay": 60, "auto": true, "n1": 60, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "52": {"name": "test breathing dual", "pattern": "breathing_dual", "colors": ["#FF0088", "#00AAFF"], "brightness": 200, "delay": 60, "auto": true, "n1": 128, "n2": 1, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "53": {"name": "test strobe burst", "pattern": "strobe_burst", "colors": ["#FFFFFF"], "brightness": 200, "delay": 60, "auto": false, "n1": 2, "n2": 10, "n3": 100, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null], "background": "#000000", "manual_beat_n": 1}, "54": {"name": "test rain drops", "pattern": "rain_drops", "colors": ["#7cbdfe"], "brightness": 200, "delay": 60, "auto": true, "n1": 32, "n2": 3, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null], "background": "#000000", "manual_beat_n": 1}, "55": {"name": "test fireflies", "pattern": "fireflies", "colors": ["#FFD060", "#90FF90"], "brightness": 200, "delay": 60, "auto": false, "n1": 6, "n2": 8, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null], "background": "#000000", "manual_beat_n": 1}, "56": {"name": "test clock sweep", "pattern": "clock_sweep", "colors": ["#FFFFFF", "#202020"], "brightness": 200, "delay": 60, "auto": true, "n1": 1, "n2": 5, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "57": {"name": "test marquee", "pattern": "marquee", "colors": ["#FFFFFF"], "brightness": 200, "delay": 60, "auto": true, "n1": 3, "n2": 2, "n3": 1, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "58": {"name": "test aurora", "pattern": "aurora", "colors": ["#2CC88C", "#5078FF", "#A050DC"], "brightness": 200, "delay": 60, "auto": true, "n1": 3, "n2": 40, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "59": {"name": "test snowfall", "pattern": "snowfall", "colors": ["#FFFFFF", "#B0DCFF"], "brightness": 200, "delay": 60, "auto": true, "n1": 20, "n2": 1, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "60": {"name": "test heartbeat", "pattern": "heartbeat", "colors": ["#FF2840"], "brightness": 200, "delay": 60, "auto": false, "n1": 200, "n2": 50, "n3": 500, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null], "background": "#000000", "manual_beat_n": 1}, "61": {"name": "test orbit", "pattern": "orbit", "colors": ["#FFFFFF", "#00B4FF", "#FF0077"], "brightness": 200, "delay": 60, "auto": true, "n1": 3, "n2": 1, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1", "palette_refs": [null, null, null]}, "62": {"name": "test palette morph", "pattern": "palette_morph", "colors": ["#FF0000", "#00FF00", "#0000FF"], "brightness": 200, "delay": 60, "auto": true, "n1": 1200, "n2": 200, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "profile_id": "1"}, "63": {"name": "off", "pattern": "off", "colors": [], "background": "#000000", "brightness": 0, "delay": 0, "n1": 0, "n2": 0, "n3": 0, "n4": 0, "n5": 0, "n6": 0, "n7": 0, "n8": 0, "manual_beat_n": 1, "profile_id": "2", "palette_refs": [], "auto": true}} \ No newline at end of file diff --git a/src/main.py b/src/main.py index 076cf0c..9cf9c45 100644 --- a/src/main.py +++ b/src/main.py @@ -2,6 +2,7 @@ import asyncio import errno import json import os +import secrets import signal import socket import threading @@ -38,6 +39,11 @@ _tcp_device_lock = threading.Lock() DISCOVERY_UDP_PORT = 8766 +def _live_reload_enabled() -> bool: + v = os.environ.get("LED_CONTROLLER_LIVE_RELOAD", "").strip().lower() + return v not in ("", "0", "false", "no") + + def _register_udp_device_sync( device_name: str, peer_ip: str, mac, device_type=None ) -> None: @@ -248,9 +254,22 @@ async def main(port=80): app = Microdot() audio_detector = AudioBeatDetector() + try: + from util.audio_run_persist import coerce_audio_device, read_audio_run_state + + persisted = read_audio_run_state() + if persisted.get("enabled"): + dev = coerce_audio_device(persisted.get("device")) + audio_detector.start(device=dev) + print("[startup] audio beat detector started from saved run state") + except Exception as e: + print(f"[startup] audio auto-start skipped: {e!r}") from util import beat_driver_route beat_driver_route.set_beat_route_main_loop(asyncio.get_running_loop()) + from util import sequence_playback as seq_pb + + seq_pb.ensure_beat_consumer_started() # Initialize sessions with a secret key from settings secret_key = settings.get('session_secret_key', 'led-controller-secret-key-change-in-production') @@ -284,11 +303,42 @@ async def main(port=80): tcp_client_registry.set_settings(settings) tcp_client_registry.set_tcp_status_broadcaster(broadcast_device_tcp_status) + live_reload = _live_reload_enabled() + dev_build_id = secrets.token_hex(12) if live_reload else None + if live_reload: + print( + "[dev] LED_CONTROLLER_LIVE_RELOAD: browser refreshes when the server process restarts" + ) + + if dev_build_id: + + @app.route("/__dev/build-id") + def dev_build_id_route(request): + _ = request + return ( + dev_build_id, + 200, + { + "Content-Type": "text/plain; charset=utf-8", + "Cache-Control": "no-store", + }, + ) + # Serve index.html at root (cwd is src/ when run via pipenv run run) - @app.route('/') + @app.route("/") def index(request): """Serve the main web UI.""" - return send_file('templates/index.html') + if dev_build_id: + try: + with open("templates/index.html", encoding="utf-8") as f: + html = f.read() + tag = '' + if "" in html: + html = html.replace("", tag + "\n", 1) + return html, 200, {"Content-Type": "text/html; charset=utf-8"} + except OSError: + pass + return send_file("templates/index.html") # Favicon: avoid 404 in browser console (no file needed) @app.route('/favicon.ico') @@ -319,6 +369,9 @@ async def main(port=80): pass try: audio_detector.start(device=device) + from util.audio_run_persist import write_audio_run_state + + write_audio_run_state(enabled=True, device=device) return {"ok": True, "status": audio_detector.status()} except Exception as e: return {"ok": False, "error": str(e)}, 500 @@ -327,12 +380,47 @@ async def main(port=80): async def audio_stop(request): _ = request audio_detector.stop() + from util.audio_run_persist import write_audio_run_state + + write_audio_run_state(enabled=False) return {"ok": True, "status": audio_detector.status()} @app.route('/api/audio/status') async def audio_status(request): _ = request - return {"status": audio_detector.status()} + from util import beat_driver_route + from util import sequence_playback + + st = audio_detector.status() + st["sequence"] = sequence_playback.playback_status() + st["manual_beat_stride"] = beat_driver_route.manual_beat_stride_status() + seq = st.get("sequence") + beat_readout = "" + if isinstance(seq, dict) and str(seq.get("beat_readout") or "").strip(): + beat_readout = str(seq.get("beat_readout") or "").strip() + elif st.get("running"): + mb = st.get("manual_beat_stride") + if isinstance(mb, dict) and mb.get("active"): + try: + n = int(mb.get("stride_n") or 1) + except (TypeError, ValueError): + n = 1 + n = max(1, min(64, n)) + try: + bi = int(mb.get("beat_in_stride") or 1) + except (TypeError, ValueError): + bi = 1 + pos = min(n, max(1, bi)) + beat_readout = f"{pos}/{n}" + else: + try: + bs = int(st.get("beat_seq") or 0) + except (TypeError, ValueError): + bs = 0 + if bs > 0: + beat_readout = str(bs) + st["beat_readout"] = beat_readout + return {"status": st} # Static file route @app.route("/static/") diff --git a/src/models/zone.py b/src/models/zone.py index ae53236..bb5beee 100644 --- a/src/models/zone.py +++ b/src/models/zone.py @@ -36,6 +36,9 @@ class Zone(Model): if "group_ids" not in doc: doc["group_ids"] = [] changed = True + if "preset_group_ids" not in doc or not isinstance(doc.get("preset_group_ids"), dict): + doc["preset_group_ids"] = {} + changed = True if changed: self.save() @@ -48,6 +51,7 @@ class Zone(Model): "name": name, "names": names if names else [], "group_ids": gid_list, + "preset_group_ids": {}, "presets": presets if presets else [], "default_preset": None, "brightness": 255, diff --git a/src/static/audio.js b/src/static/audio.js index 4dc12c3..7986ef8 100644 --- a/src/static/audio.js +++ b/src/static/audio.js @@ -1,8 +1,21 @@ (() => { let pollTimer = null; let lastBeatSeq = 0; + let lastLoggedSequenceBeatFractions = ""; + /** Prior poll had server zone sequence playback active (`status.sequence.active === true`). */ + let prevZoneSequencePlaybackActive = false; + /** + * After sequence playback ends/stops while audio keeps running, keep header # idle until the + * next beat bumps `beat_seq` (avoids the stuck final cumulative value vs sequence readout). + */ + let headerBeatStickyIdleAfterSeq = false; + /** Suppresses duplicate `console.log` when the same `beat_seq` + server `beat_readout` repeats. */ + let lastBeatConsoleKey = ""; + /** @type {Set>} */ + const pendingBeatPhaseTimers = new Set(); const STORAGE_KEY = "led-controller-audio-restore"; + const PHASE_MS_KEY = "led-controller-audio-beat-phase-ms"; const STORAGE_VERSION = 1; function readRestorePrefs() { @@ -48,6 +61,45 @@ return document.getElementById(id); } + /** @param {Record} status */ + function updateBeatReadoutDisplays(status) { + const text = String((status && status.beat_readout) || "").trim(); + for (const id of ["audio-top-beat-readout", "audio-modal-beat-readout"]) { + const n = el(id); + if (n) n.textContent = text; + } + } + + /** + * On each new audio `beat_seq`, log server `beat_readout` once (deduped when poll repeats the + * same `beat_seq` + line). + * @param {Record} status + */ + function logServerBeatConsoleOnPollEdge(status) { + const beatSeq = Number((status && status.beat_seq) || 0); + const line = String((status && status.beat_readout) || "").trim(); + const key = `${beatSeq}\t${line}`; + if (key !== lastBeatConsoleKey) { + lastBeatConsoleKey = key; + if (!line) return; + const seq = /** @type {Record|undefined} */ (status && status.sequence); + const seqBeats = + !!seq && + !!seq.active && + String(seq.advance_mode || "").toLowerCase() === "beats"; + let out = line; + if (seqBeats) { + const nLanes = Number(seq && seq.num_lanes); + const lanesNote = + Number.isFinite(nLanes) && nLanes > 1 + ? `lane 1 of ${nLanes} (readout is for this lane only)` + : "lane 1"; + out = `${line} — ${lanesNote}`; + } + console.log(out); + } + } + function updateBpmDisplay(bpm) { const node = el("audio-bpm-value"); if (!node) return; @@ -58,11 +110,45 @@ } } - function updateBeatCounter(seq) { - const topNode = el("audio-top-beat-count"); - if (!topNode) return; - const n = Number(seq); - topNode.textContent = Number.isFinite(n) && n >= 0 ? `#${Math.floor(n)}` : "#0"; + /** Zone sequence playback (server); only when `active === true` is beat X/Y meaningful. */ + function sequencePlaybackActiveFromStatus(status) { + const seq = /** @type {Record|undefined} */ ( + status && status.sequence + ); + return !!(seq && seq.active); + } + + /** Build sequence beat fractions for debug logging (browser console only). */ + function formatSequenceBeatFractionsForLog(status) { + const seq = /** @type {Record|undefined} */ (status && status.sequence); + if (!seq || !seq.active) return null; + if (seq.advance_mode !== "beats") return null; + + const laneBeatAt = Number(seq.lane0_beat_in_step); + const laneBeatsPerStep = Number(seq.lane0_beats_per_step); + if ( + !Number.isFinite(laneBeatAt) || + laneBeatAt <= 0 || + !Number.isFinite(laneBeatsPerStep) || + laneBeatsPerStep <= 0 + ) { + return null; + } + const presetFraction = `${Math.floor(laneBeatAt)}/${Math.floor(laneBeatsPerStep)}`; + + const sequenceBeatAt = Number(seq.sequence_beat_at); + const sequenceBeatsPerPass = Number(seq.sequence_beats_per_pass); + if ( + !Number.isFinite(sequenceBeatAt) || + sequenceBeatAt <= 0 || + !Number.isFinite(sequenceBeatsPerPass) || + sequenceBeatsPerPass <= 0 + ) { + return null; + } + const sequenceFraction = `${Math.floor(sequenceBeatAt)}/${Math.floor(sequenceBeatsPerPass)}`; + + return `${presetFraction} ${sequenceFraction}`; } function updateHitTypeDisplay(hitType, confidence) { @@ -91,15 +177,67 @@ } } + function clearBeatPhaseTimers() { + pendingBeatPhaseTimers.forEach((t) => clearTimeout(t)); + pendingBeatPhaseTimers.clear(); + } + + function getBeatPhaseDelayMs() { + const inp = el("audio-beat-phase-ms"); + if (inp && String(inp.value).trim() !== "") { + const n = parseInt(String(inp.value).trim(), 10); + if (Number.isFinite(n)) return Math.min(500, Math.max(0, n)); + } + try { + const v = parseInt(localStorage.getItem(PHASE_MS_KEY) || "0", 10); + return Number.isFinite(v) ? Math.min(500, Math.max(0, v)) : 0; + } catch { + return 0; + } + } + + function persistBeatPhaseMs() { + try { + localStorage.setItem(PHASE_MS_KEY, String(getBeatPhaseDelayMs())); + } catch (e) { + console.warn("beat phase ms save failed", e); + } + } + + function scheduleBeatPhaseFire(seq, delayMs) { + let tid = null; + const run = () => { + if (tid != null) pendingBeatPhaseTimers.delete(tid); + flashBeat(); + try { + window.dispatchEvent( + new CustomEvent("ledControllerAudioBeat", { detail: { beatSeq: seq } }), + ); + } catch (e) { + /* ignore */ + } + }; + if (delayMs <= 0) { + run(); + return; + } + tid = setTimeout(run, delayMs); + pendingBeatPhaseTimers.add(tid); + } + /** Stop detector and polling; does not clear “resume on load” prefs (used before restart). */ async function stopAudioOnly() { setTopBpmVisible(false); + clearBeatPhaseTimers(); if (pollTimer) { clearInterval(pollTimer); pollTimer = null; } lastBeatSeq = 0; - updateBeatCounter(0); + prevZoneSequencePlaybackActive = false; + headerBeatStickyIdleAfterSeq = false; + lastBeatConsoleKey = ""; + updateBeatReadoutDisplays({}); try { await fetch("/api/audio/stop", { method: "POST" }); } catch (e) { @@ -115,7 +253,7 @@ async function pollStatus() { try { - const res = await fetch("/api/audio/status"); + const res = await fetch("/api/audio/status", { cache: "no-store" }); const data = await res.json(); const status = data?.status || {}; if (status.error && String(status.error).trim()) { @@ -123,6 +261,7 @@ if (node) { node.textContent = String(status.error).trim().slice(0, 120); } + updateBeatReadoutDisplays({}); updateBpmDisplay(null); setTopBpmVisible(!!status.running); if (!status.running && pollTimer) { @@ -134,12 +273,46 @@ setTopBpmVisible(!!status.running); updateBpmDisplay(status.bpm); updateHitTypeDisplay(status.beat_type, Number(status.beat_type_confidence)); - const seq = Number(status.beat_seq || 0); - updateBeatCounter(seq); - if (seq > lastBeatSeq) { - lastBeatSeq = seq; - flashBeat(); + /* + * `status.beat_seq` is cumulative since Audio Start — used only for flash / sticky idle + * after sequence ends. Preset and sequence loop counts come from `manual_beat_stride` / + * `sequence` on each poll. + */ + const beatSeq = Number(status.beat_seq || 0); + const zoneSeqActive = sequencePlaybackActiveFromStatus(status); + const endedSeq = prevZoneSequencePlaybackActive && !zoneSeqActive; + const startedSeq = !prevZoneSequencePlaybackActive && zoneSeqActive; + prevZoneSequencePlaybackActive = zoneSeqActive; + if (startedSeq) { + headerBeatStickyIdleAfterSeq = false; + lastLoggedSequenceBeatFractions = ""; } + if (endedSeq) { + headerBeatStickyIdleAfterSeq = true; + clearBeatPhaseTimers(); + lastBeatSeq = beatSeq; + } + if (!zoneSeqActive && headerBeatStickyIdleAfterSeq) { + if (beatSeq > lastBeatSeq) { + lastBeatSeq = beatSeq; + logServerBeatConsoleOnPollEdge(status); + scheduleBeatPhaseFire(beatSeq, getBeatPhaseDelayMs()); + headerBeatStickyIdleAfterSeq = false; + } + } else if (beatSeq > lastBeatSeq) { + lastBeatSeq = beatSeq; + logServerBeatConsoleOnPollEdge(status); + scheduleBeatPhaseFire(beatSeq, getBeatPhaseDelayMs()); + } + const beatFractions = formatSequenceBeatFractionsForLog(status); + if (beatFractions) { + if (beatFractions !== lastLoggedSequenceBeatFractions) { + lastLoggedSequenceBeatFractions = beatFractions; + } + } else { + lastLoggedSequenceBeatFractions = ""; + } + updateBeatReadoutDisplays(status); } catch (e) { console.warn("audio status poll failed", e); } @@ -164,7 +337,6 @@ writeRestorePrefs(override, selected); updateBpmDisplay(null); updateHitTypeDisplay("unknown", NaN); - updateBeatCounter(0); pollTimer = setInterval(pollStatus, 250); await pollStatus(); } @@ -252,17 +424,30 @@ }); } + const phaseInp = el("audio-beat-phase-ms"); + if (phaseInp) { + try { + const stored = parseInt(localStorage.getItem(PHASE_MS_KEY) || "0", 10); + if (Number.isFinite(stored)) { + phaseInp.value = String(Math.min(500, Math.max(0, stored))); + } + } catch { + /* ignore */ + } + phaseInp.addEventListener("change", () => persistBeatPhaseMs()); + phaseInp.addEventListener("input", () => persistBeatPhaseMs()); + } } async function resumePollingIfDetectorRunning() { try { - const res = await fetch("/api/audio/status"); + const res = await fetch("/api/audio/status", { cache: "no-store" }); const data = await res.json(); const status = data?.status || {}; if (status.running && !pollTimer) { pollTimer = setInterval(pollStatus, 250); lastBeatSeq = Number(status.beat_seq || 0); - updateBeatCounter(lastBeatSeq); + prevZoneSequencePlaybackActive = sequencePlaybackActiveFromStatus(status); await pollStatus(); } } catch (e) { @@ -270,8 +455,11 @@ } } - async function restoreAudioIfNeeded() { - if (pollTimer) return; + /** + * Apply browser-stored device fields only (GET /devices list); does not start detection. + * Beat detector run/stop is server-owned (`db/audio_run.json` + explicit Start/Stop in UI). + */ + async function applySavedAudioDeviceFormOnly() { const prefs = readRestorePrefs(); if (!prefs) return; const ov = el("audio-device-override"); @@ -280,20 +468,14 @@ try { await refreshDevices(); } catch (e) { - console.warn("audio restore refresh devices failed", e); + console.warn("audio device list refresh failed", e); } if (sel && prefs.select) sel.value = prefs.select; - try { - await startAudio(); - } catch (e) { - console.warn("audio auto-restart failed", e); - clearRestorePrefs(); - } } document.addEventListener("DOMContentLoaded", async () => { bind(); await resumePollingIfDetectorRunning(); - await restoreAudioIfNeeded(); + await applySavedAudioDeviceFormOnly(); }); })(); diff --git a/src/static/dev-live-reload.js b/src/static/dev-live-reload.js new file mode 100644 index 0000000..64f3ec6 --- /dev/null +++ b/src/static/dev-live-reload.js @@ -0,0 +1,25 @@ +/* Polls server build id; full reload when watchfiles restarts Python (new process = new id). */ +(function () { + var prev = null; + function tick() { + fetch('/__dev/build-id', { cache: 'no-store', credentials: 'same-origin' }) + .then(function (r) { + return r.ok ? r.text() : ''; + }) + .then(function (id) { + id = (id || '').trim(); + if (!id) return; + if (prev === null) { + prev = id; + return; + } + if (id !== prev) { + prev = id; + window.location.reload(); + } + }) + .catch(function () {}); + } + setInterval(tick, 750); + tick(); +})(); diff --git a/src/static/presets.js b/src/static/presets.js index e57bc79..b36105e 100644 --- a/src/static/presets.js +++ b/src/static/presets.js @@ -29,6 +29,9 @@ const filterPresetsForCurrentProfile = async (presetsObj) => { }), ); }; +try { + window.filterPresetsForCurrentProfile = filterPresetsForCurrentProfile; +} catch (e) {} const getCurrentProfileData = async () => { try { @@ -154,7 +157,44 @@ function tabDeviceNamesFromSection(section) { : []; } -async function postDriverSequence(sequence, targetMacs, delayS) { +/** Device names for ``presetId`` on the current zone tab (per-preset groups or zone default). */ +async function deviceNamesForPresetOnCurrentZone(presetId) { + const section = document.querySelector('.presets-section[data-zone-id]'); + const fallback = tabDeviceNamesFromSection(section); + if (!section || !presetId) return fallback; + const zm = window.zonesManager; + if (!zm || typeof zm.resolveDeviceNamesForZonePreset !== 'function') return fallback; + const zoneId = section.dataset.zoneId; + try { + const res = await fetch(`/zones/${zoneId}`, { headers: { Accept: 'application/json' } }); + if (!res.ok) return fallback; + const zd = await res.json(); + const names = await zm.resolveDeviceNamesForZonePreset(zd, String(presetId)); + return names.length ? names : fallback; + } catch (_) { + return fallback; + } +} + +function formatPresetTargetGroupsLine(zoneDoc, presetId, groupsMap) { + const zm = window.zonesManager; + const gids = + zm && typeof zm.effectiveGroupIdsForZonePreset === 'function' + ? zm.effectiveGroupIdsForZonePreset(zoneDoc, presetId) + : Array.isArray(zoneDoc && zoneDoc.group_ids) + ? zoneDoc.group_ids.map((x) => String(x).trim()).filter((x) => x.length > 0) + : []; + const parts = (gids || []) + .map((id) => { + const g = groupsMap && groupsMap[id]; + const gn = g && g.name ? String(g.name).trim() : ''; + return gn; + }) + .filter(Boolean); + return parts.length ? parts.join(', ') : ''; +} + +async function postDriverSequence(sequence, targetMacs, delayS, pushOptions) { const body = { sequence, targets: Array.isArray(targetMacs) && targetMacs.length ? [...new Set(targetMacs)] : undefined, @@ -1169,7 +1209,7 @@ document.addEventListener('DOMContentLoaded', () => { // Create modal const modal = document.createElement('div'); - modal.className = 'modal active'; + modal.className = 'modal active modal-child-overlay'; modal.id = 'add-preset-to-zone-modal'; modal.innerHTML = `
@@ -1284,7 +1324,10 @@ document.addEventListener('DOMContentLoaded', () => { const newGrid = arrayToGrid(flat, 3); tabData.presets = newGrid; tabData.presets_flat = flat; - + if (!tabData.preset_group_ids || typeof tabData.preset_group_ids !== 'object') { + tabData.preset_group_ids = {}; + } + // Update zone const updateResponse = await fetch(`/zones/${zoneId}`, { method: 'PUT', @@ -1378,7 +1421,7 @@ document.addEventListener('DOMContentLoaded', () => { } const modal = document.createElement('div'); - modal.className = 'modal active'; + modal.className = 'modal active modal-child-overlay'; modal.innerHTML = `

Pick Palette Color

@@ -1449,12 +1492,10 @@ document.addEventListener('DOMContentLoaded', () => { alert('Preset name is required to send.'); return; } - // Send current editor values and then select on all devices in the current zone (if any) - const section = document.querySelector('.presets-section[data-zone-id]'); - const deviceNames = tabDeviceNamesFromSection(section); - // Work out the preset ID: for existing presets use currentEditId, otherwise fall back to name + // Send current editor values to zone devices (if any); never persist on device. const presetId = currentEditId || payload.name; - // Try sends preset first, then select; never persist on device. + const deviceNames = await deviceNamesForPresetOnCurrentZone(presetId); + // Auto: load + immediate select. Manual: load only; first advance on the next audio beat. await sendPresetViaEspNow(presetId, payload, deviceNames, false, false, '2'); }); } @@ -1466,9 +1507,8 @@ document.addEventListener('DOMContentLoaded', () => { alert('Preset name is required.'); return; } - const section = document.querySelector('.presets-section[data-zone-id]'); - const deviceNames = tabDeviceNamesFromSection(section); const presetId = currentEditId || payload.name; + const deviceNames = await deviceNamesForPresetOnCurrentZone(presetId); await sendPresetViaEspNow(presetId, payload, deviceNames, true, true, '1'); await updateTabDefaultPreset(presetId); await sendDefaultPreset('1', deviceNames); @@ -1503,9 +1543,9 @@ document.addEventListener('DOMContentLoaded', () => { throw new Error('Failed to save preset'); } - // Same device targeting as Try: zone tab supplies names and selection without persistence. - const section = document.querySelector('.presets-section[data-zone-id]'); - const deviceNames = tabDeviceNamesFromSection(section); + // Same device targeting as Try: per-preset zone groups when in a zone tab. + const presetIdForSend = currentEditId || payload.name; + const deviceNames = await deviceNamesForPresetOnCurrentZone(presetIdForSend); // Use saved preset from server response for sending const saved = await response.json().catch(() => null); @@ -1644,6 +1684,7 @@ const sendPresetViaEspNow = async ( saveToDevice = true, setDefault = false, devicePresetId = null, + pushOptions = null, ) => { try { const baseColors = Array.isArray(preset.colors) && preset.colors.length @@ -1707,7 +1748,7 @@ const sendPresetViaEspNow = async ( } } - await postDriverSequence(sequence, targetMacs, 0.05); + await postDriverSequence(sequence, targetMacs, 0.05, pushOptions); } catch (error) { console.error('Failed to send preset to devices:', error); alert('Failed to send preset to devices.'); @@ -1776,6 +1817,48 @@ try { // window may not exist in some environments; ignore. } +// Store selected preset(s) per zone (multi-select; merge send order = click order, last wins on device). +const zoneSelectedPresetIds = {}; +const zonePresetSelectionOrder = {}; + +function ensureZonePresetSelection(zoneId) { + const z = String(zoneId); + if (!zoneSelectedPresetIds[z]) zoneSelectedPresetIds[z] = new Set(); + if (!zonePresetSelectionOrder[z]) zonePresetSelectionOrder[z] = []; +} + +function pruneZonePresetSelection(zoneId, validIdSet) { + const z = String(zoneId); + ensureZonePresetSelection(z); + const set = zoneSelectedPresetIds[z]; + for (const id of [...set]) { + if (!validIdSet.has(String(id))) set.delete(id); + } + zonePresetSelectionOrder[z] = (zonePresetSelectionOrder[z] || []).filter((id) => set.has(String(id))); +} + +function getOrderedZonePresetSelection(zoneId) { + const z = String(zoneId); + ensureZonePresetSelection(z); + const set = zoneSelectedPresetIds[z]; + return (zonePresetSelectionOrder[z] || []).filter((id) => set.has(String(id))); +} + +async function sendMergedZonePresetSelection(zoneId, tabData, allPresets) { + const ids = getOrderedZonePresetSelection(zoneId); + if (!ids.length) return; + for (let i = 0; i < ids.length; i += 1) { + const pid = ids[i]; + const preset = allPresets[pid]; + if (!preset) continue; + const names = + window.zonesManager && typeof window.zonesManager.resolveDeviceNamesForZonePreset === 'function' + ? await window.zonesManager.resolveDeviceNamesForZonePreset(tabData, pid) + : []; + await sendPresetViaEspNow(pid, preset, names, false, false, '2'); + } +} + // Store selected preset per zone const selectedPresets = {}; // Store selected preset payload per zone for beat-trigger reliability. @@ -1920,19 +2003,37 @@ const insertDraggingOntoTarget = (presetsList, dragging, dropTarget) => { }; // Function to render presets for a specific zone in 2D grid -const renderTabPresets = async (zoneId) => { +/** + * @param {string} zoneId + * @param {{ stopSequencePlayback?: boolean }} [options] - pass `{ stopSequencePlayback: true }` only when + * the UI action should stop server zone sequence playback (default: do not POST /sequences/stop). + */ +const renderTabPresets = async (zoneId, options = {}) => { const presetsList = document.getElementById('presets-list-zone'); if (!presetsList) return; - + + const stopSeq = options.stopSequencePlayback === true; + if (stopSeq && typeof window.stopZoneSequencePlayback === 'function') { + // Pass false: an earlier render's stop() can finish after this pass rebuilds the DOM and + // would otherwise clear .active from new sequence tiles (breaks edit/run selection). + await window.stopZoneSequencePlayback(false); + } + try { - // Get zone data to see which presets are associated - const tabResponse = await fetch(`/zones/${zoneId}`, { - headers: { Accept: 'application/json' }, - }); + const [tabResponse, groupsStripRes, presetsResponse] = await Promise.all([ + fetch(`/zones/${zoneId}`, { + headers: { Accept: 'application/json' }, + }), + fetch('/groups', { headers: { Accept: 'application/json' } }), + fetch('/presets', { + headers: { Accept: 'application/json' }, + }), + ]); if (!tabResponse.ok) { throw new Error('Failed to load zone'); } const tabData = await tabResponse.json(); + const groupsMapStrip = groupsStripRes.ok ? await groupsStripRes.json() : {}; // Get presets - support both 2D grid and flat array (for backward compatibility) let presetGrid = tabData.presets; @@ -1945,10 +2046,6 @@ const renderTabPresets = async (zoneId) => { presetGrid = arrayToGrid(presetGrid, 3); } - // Get all presets - const presetsResponse = await fetch('/presets', { - headers: { Accept: 'application/json' }, - }); if (!presetsResponse.ok) { throw new Error('Failed to load presets'); } @@ -2021,13 +2118,10 @@ const renderTabPresets = async (zoneId) => { }); } - // Get the currently selected preset for this zone - const selectedPresetId = selectedPresets[zoneId]; - - // Render presets in grid layout - // Flatten the grid and render all presets (grid CSS will handle layout) const flatPresets = presetGrid.flat().filter(id => id); - + const validIdSet = new Set(flatPresets.map((id) => String(id))); + pruneZonePresetSelection(zoneId, validIdSet); + if (flatPresets.length === 0) { // Show empty message if this zone has no presets const empty = document.createElement('p'); @@ -2039,23 +2133,36 @@ const renderTabPresets = async (zoneId) => { flatPresets.forEach((presetId) => { const preset = allPresets[presetId]; if (preset) { - const isSelected = presetId === selectedPresetId; + ensureZonePresetSelection(zoneId); + const isSelected = zoneSelectedPresetIds[String(zoneId)].has(String(presetId)); const displayPreset = { ...preset, colors: resolveColorsWithPaletteRefs(preset.colors, preset.palette_refs, paletteColors), }; - const wrapper = createPresetButton(presetId, displayPreset, zoneId, isSelected); + const wrapper = createPresetButton( + presetId, + displayPreset, + zoneId, + isSelected, + tabData, + groupsMapStrip, + allPresets, + ); presetsList.appendChild(wrapper); } }); } + + if (typeof window.appendZoneSequenceTiles === 'function') { + await window.appendZoneSequenceTiles(zoneId, tabData, allPresets, paletteColors, presetsList); + } } catch (error) { console.error('Failed to render zone presets:', error); presetsList.innerHTML = '

Failed to load presets.

'; } }; -const createPresetButton = (presetId, preset, zoneId, isSelected = false) => { +const createPresetButton = (presetId, preset, zoneId, isSelected, tabData, groupsMap, allPresets) => { const uiMode = getPresetUiMode(); const row = document.createElement('div'); @@ -2069,7 +2176,6 @@ const createPresetButton = (presetId, preset, zoneId, isSelected = false) => { button.className = 'pattern-button preset-tile-main'; if (isSelected) { button.classList.add('active'); - selectedPresetPayloads[zoneId] = preset; } const colors = Array.isArray(preset.colors) ? preset.colors.filter((c) => c) : []; @@ -2093,6 +2199,14 @@ const createPresetButton = (presetId, preset, zoneId, isSelected = false) => { presetNameLabel.className = 'pattern-button-label'; button.appendChild(presetNameLabel); + const groupsText = formatPresetTargetGroupsLine(tabData || {}, presetId, groupsMap || {}); + if (groupsText) { + const groupsSpan = document.createElement('span'); + groupsSpan.className = 'preset-tile-groups'; + groupsSpan.textContent = groupsText; + button.appendChild(groupsSpan); + } + const bgSwatch = document.createElement('span'); const bgColor = coercePresetBackground(preset); bgSwatch.title = `Background: ${bgColor}`; @@ -2111,7 +2225,7 @@ const createPresetButton = (presetId, preset, zoneId, isSelected = false) => { `; button.appendChild(bgSwatch); - const isManualPreset = preset && typeof preset.auto === 'boolean' ? !preset.auto : false; + const isManualPreset = preset && !coercePresetAuto(preset); if (isManualPreset) { const manualBadge = document.createElement('span'); manualBadge.textContent = '1'; @@ -2138,18 +2252,42 @@ const createPresetButton = (presetId, preset, zoneId, isSelected = false) => { button.addEventListener('click', () => { if (isDraggingPreset) return; - const presetsListEl = document.getElementById('presets-list-zone'); - if (presetsListEl) { - presetsListEl.querySelectorAll('.pattern-button').forEach((btn) => btn.classList.remove('active')); + console.info('Preset button pressed', { zoneId, presetId, name: (preset && preset.name) || presetId }); + if (typeof window.stopZoneSequencePlayback === 'function') { + window.stopZoneSequencePlayback(); } - button.classList.add('active'); - selectedPresets[zoneId] = presetId; - selectedPresetPayloads[zoneId] = preset; - const section = row.closest('.presets-section'); - const deviceNames = tabDeviceNamesFromSection(section); - sendPresetViaEspNow(presetId, preset, deviceNames, false, false, '2').catch((err) => { - console.error(err); - }); + const presetsListEl = document.getElementById('presets-list-zone'); + ensureZonePresetSelection(zoneId); + const z = String(zoneId); + const set = zoneSelectedPresetIds[z]; + const order = zonePresetSelectionOrder[z]; + const idStr = String(presetId); + if (set.has(idStr)) { + set.delete(idStr); + zonePresetSelectionOrder[z] = order.filter((x) => String(x) !== idStr); + } else { + set.add(idStr); + order.push(idStr); + } + if (presetsListEl) { + presetsListEl.querySelectorAll('.preset-tile-row:not(.sequence-tile-row)').forEach((rw) => { + const pid = rw.dataset.presetId; + const btnEl = rw.querySelector('.preset-tile-main'); + if (!btnEl || !pid) return; + if (set.has(String(pid))) btnEl.classList.add('active'); + else btnEl.classList.remove('active'); + }); + } + const orderList = getOrderedZonePresetSelection(zoneId); + if (orderList.length) { + const lastPid = orderList[orderList.length - 1]; + selectedPresets[zoneId] = lastPid; + selectedPresetPayloads[zoneId] = (allPresets && allPresets[lastPid]) || preset; + } else { + delete selectedPresets[zoneId]; + delete selectedPresetPayloads[zoneId]; + } + void sendMergedZonePresetSelection(zoneId, tabData, allPresets); }); if (canDrag) { @@ -2173,7 +2311,9 @@ const createPresetButton = (presetId, preset, zoneId, isSelected = false) => { }); } - row.appendChild(button); + const top = document.createElement('div'); + top.className = 'preset-tile-row-top'; + top.appendChild(button); if (uiMode === 'edit') { const actions = document.createElement('div'); @@ -2192,9 +2332,11 @@ const createPresetButton = (presetId, preset, zoneId, isSelected = false) => { }); actions.appendChild(editBtn); - row.appendChild(actions); + top.appendChild(actions); } + row.appendChild(top); + return row; }; @@ -2279,6 +2421,12 @@ const removePresetFromTab = async (zoneId, presetId) => { tabData.presets = newGrid; tabData.presets_flat = flat; + if (tabData.preset_group_ids && typeof tabData.preset_group_ids === 'object') { + const pg = { ...tabData.preset_group_ids }; + delete pg[String(presetId)]; + tabData.preset_group_ids = pg; + } + const updateResponse = await fetch(`/zones/${zoneId}`, { method: 'PUT', headers: { 'Content-Type': 'application/json' }, @@ -2297,6 +2445,10 @@ const removePresetFromTab = async (zoneId, presetId) => { try { window.removePresetFromTab = removePresetFromTab; } catch (e) {} +try { + window.renderTabPresets = renderTabPresets; + window.getPresetUiMode = getPresetUiMode; +} catch (e) {} // Listen for HTMX swaps to render presets document.body.addEventListener('htmx:afterSwap', (event) => { @@ -2327,10 +2479,7 @@ document.addEventListener('DOMContentLoaded', () => { } const mainMenu = document.getElementById('main-menu-dropdown'); if (mainMenu) mainMenu.classList.remove('open'); - const leftPanel = document.querySelector('.presets-section[data-zone-id]'); - if (leftPanel) { - renderTabPresets(leftPanel.dataset.zoneId); - } + // Preset strip re-renders from `zones.js` after `loadZones()` (no driver/playback side effects). }); }); }); diff --git a/src/static/style.css b/src/static/style.css index abf67ef..d0c762c 100644 --- a/src/static/style.css +++ b/src/static/style.css @@ -199,13 +199,31 @@ header h1 { .audio-top-indicator { display: none; - align-items: center; - gap: 0.4rem; + flex-direction: column; + align-items: stretch; + gap: 0.15rem; padding: 0.25rem 0.55rem; border: 1px solid #4a4a4a; border-radius: 6px; background-color: #1a1a1a; - min-width: 6.5rem; + min-width: 9rem; +} + +.audio-top-indicator-main { + display: inline-flex; + align-items: center; + gap: 0.4rem; +} + +.audio-top-indicator-extra { + font-size: 0.62rem; + color: #9e9e9e; + line-height: 1.25; + text-align: right; + max-width: 16rem; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .audio-top-indicator.audio-running { @@ -226,6 +244,19 @@ header h1 { text-align: right; } +.audio-top-beat-readout { + font-size: 0.62rem; + color: #b0bec5; + line-height: 1.25; + max-width: 12rem; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + flex: 1; + min-width: 0; + text-align: left; +} + .audio-top-indicator-subvalue { font-size: 0.75rem; color: #9e9e9e; @@ -240,7 +271,9 @@ header h1 { .audio-top-indicator.flash .audio-top-indicator-value, .audio-top-indicator.flash .audio-top-indicator-label, -.audio-top-indicator.flash .audio-top-indicator-subvalue { +.audio-top-indicator.flash .audio-top-indicator-subvalue, +.audio-top-indicator.flash .audio-top-indicator-extra, +.audio-top-indicator.flash .audio-top-beat-readout { color: #fff; } @@ -620,7 +653,8 @@ body.preset-ui-run .edit-mode-only { overflow-x: hidden; display: grid; grid-template-columns: repeat(8, minmax(0, 1fr)); - grid-auto-rows: 5rem; + /* min-content height prevents taller tiles (edit actions, wrapping) from overlapping the next row and stealing clicks */ + grid-auto-rows: minmax(5rem, auto); column-gap: 0.3rem; row-gap: 0.3rem; align-content: start; @@ -784,6 +818,26 @@ body.preset-ui-run .edit-mode-only { border-radius: 6px; } +.audio-bpm-row { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 0.75rem; +} + +.audio-bpm-row .audio-bpm-readout { + flex: 0 0 auto; + min-width: 5rem; +} + +.audio-modal-beat-readout { + flex: 1; + min-width: 10rem; + font-size: 0.85rem; + line-height: 1.35; + text-align: left; +} + .audio-hit-type-readout { font-size: 1.1rem; font-weight: 600; @@ -851,17 +905,43 @@ body.preset-ui-run .edit-mode-only { flex-direction: row; align-items: stretch; min-width: 0; - min-height: 0; + min-height: 5rem; } -.preset-tile-row--run .preset-tile-actions { - display: none; +.preset-tile-row-top { + display: flex; + flex-direction: row; + align-items: stretch; + flex: 1; + min-width: 0; + min-height: 5rem; } .preset-tile-main { flex: 1; min-width: 0; height: 5rem; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 0.12rem; +} + +.preset-tile-main .preset-tile-groups { + font-size: 0.68rem; + font-weight: 500; + line-height: 1.15; + opacity: 0.88; + text-align: center; + max-width: 100%; + padding: 0 0.35rem; + box-sizing: border-box; + word-break: break-word; +} + +.preset-tile-row--run .preset-tile-actions { + display: none; } /* Edit only beside the preset tile in edit mode. */ @@ -1030,6 +1110,46 @@ body.preset-ui-run .edit-mode-only { display: flex; } +/* Stack sequence modals below groups / preset editor so in-modal actions stay visible */ +#sequence-editor-modal.active, +#sequences-modal.active { + z-index: 1040; +} +#groups-modal.active, +#edit-group-modal.active, +#presets-modal.active { + z-index: 1050; +} +#preset-editor-modal.active { + z-index: 1060; +} + +/* Child / overlay modals: must paint above preset editor (1060) and list modals (1050). */ +#color-palette-modal.active, +#pattern-editor-modal.active, +#edit-device-modal.active, +#edit-zone-modal.active { + z-index: 1070; +} + +/* Patterns library (often used next to presets); below preset editor, above sequences. */ +#patterns-modal.active { + z-index: 1055; +} + +/* Header / global dialogs */ +#help-modal.active, +#audio-modal.active, +#settings-modal.active, +#led-tool-modal.active { + z-index: 1080; +} + +/* JS-appended overlays (e.g. preset “From Palette”, add-preset-to-zone) — must sit above #preset-editor-modal */ +.modal.modal-child-overlay.active { + z-index: 1080; +} + .modal-content { background-color: #2e2e2e; padding: 2rem; diff --git a/src/static/zones.js b/src/static/zones.js index c9005e2..a46b71e 100644 --- a/src/static/zones.js +++ b/src/static/zones.js @@ -1,6 +1,12 @@ // Zone management JavaScript let currentZoneId = null; let brightnessSendTimeout = null; +/** + * When true, the next `loadZoneContent` skips `sendZoneBrightness` (run/edit toggle: same zone, UI only). + */ +let suppressZoneContentDriverSideEffects = false; +/** First successful `loadZoneContent` after open: skip hardware brightness push (read-only hydration). */ +let isFirstZoneContentHydration = true; function clamp255(n) { const v = parseInt(n, 10); @@ -202,8 +208,160 @@ async function computeZoneTargets(zone) { }; } +function normalizeDeviceMac(raw) { + return String(raw || "") + .trim() + .toLowerCase() + .replace(/:/g, "") + .replace(/-/g, ""); +} + +/** Flat preset ids on a zone document (grid or flat). */ +function tabPresetIdsInZoneDoc(zoneDoc) { + let ids = []; + if (Array.isArray(zoneDoc && zoneDoc.presets_flat)) { + ids = zoneDoc.presets_flat.slice(); + } else if (Array.isArray(zoneDoc && zoneDoc.presets)) { + if (zoneDoc.presets.length && typeof zoneDoc.presets[0] === "string") { + ids = zoneDoc.presets.slice(); + } else if (zoneDoc.presets.length && Array.isArray(zoneDoc.presets[0])) { + ids = zoneDoc.presets.flat(); + } + } + return (ids || []).filter(Boolean); +} + +/** Group ids for a preset: explicit ``preset_group_ids[presetId]`` when non-empty, else zone ``group_ids``. */ +function effectiveGroupIdsForZonePreset(zoneDoc, presetId) { + const pid = String(presetId); + const raw = zoneDoc && zoneDoc.preset_group_ids && zoneDoc.preset_group_ids[pid]; + if (Array.isArray(raw) && raw.length > 0) { + return raw.map((x) => String(x).trim()).filter((x) => x.length > 0); + } + return Array.isArray(zoneDoc && zoneDoc.group_ids) + ? zoneDoc.group_ids.map((x) => String(x).trim()).filter((x) => x.length > 0) + : []; +} + +/** Resolve device names + MACs from a list of group ids (same rules as zone group expansion). */ +async function resolveTargetsFromGroupIds(groupIds) { + const dm = await fetchDevicesMap(); + const gids = Array.isArray(groupIds) + ? groupIds.map((x) => String(x).trim()).filter((x) => x.length > 0) + : []; + if (!gids.length) { + return { names: [], macs: [] }; + } + const gm = await fetchGroupsMap(); + const seen = new Set(); + const names = []; + const macs = []; + for (const gid of gids) { + const g = gm[gid]; + if (!g || !Array.isArray(g.devices)) continue; + for (const raw of g.devices) { + const m = normalizeDeviceMac(raw); + if (m.length !== 12) continue; + if (seen.has(m)) continue; + seen.add(m); + const d = dm[m]; + const n = d && String((d.name || "").trim()) ? String(d.name).trim() : m; + names.push(n); + macs.push(m); + } + } + return { names, macs }; +} + +/** Device names for one zone preset slot (effective groups, or whole zone by name when no groups). */ +async function resolveDeviceNamesForZonePreset(zoneDoc, presetId) { + const gids = effectiveGroupIdsForZonePreset(zoneDoc, presetId); + if (gids.length) { + const t = await resolveTargetsFromGroupIds(gids); + if (t.names.length) return t.names; + } + const zt = await computeZoneTargets(zoneDoc); + return Array.isArray(zt.names) ? zt.names.slice() : []; +} + +/** Union of all devices targeted by any preset on the zone (for tab strip + sequence scope). */ +async function computeZonePresetUnionTargets(zoneDoc) { + const ids = tabPresetIdsInZoneDoc(zoneDoc); + if (!ids.length) { + return await computeZoneTargets(zoneDoc); + } + const seen = new Set(); + const names = []; + const macs = []; + for (const pid of ids) { + const gids = effectiveGroupIdsForZonePreset(zoneDoc, pid); + let t; + if (gids.length) { + t = await resolveTargetsFromGroupIds(gids); + } else { + t = await computeZoneTargets(zoneDoc); + } + const tn = Array.isArray(t.names) ? t.names : []; + const tm = Array.isArray(t.macs) ? t.macs : []; + for (let i = 0; i < tm.length; i++) { + const m = normalizeDeviceMac(tm[i]); + if (m.length !== 12 || seen.has(m)) continue; + seen.add(m); + macs.push(tm[i]); + names.push(tn[i] || m); + } + } + if (!names.length) { + return await computeZoneTargets(zoneDoc); + } + return { names, macs }; +} + +/** + * Device names for one sequence step. Empty stepGroupIds => all zone names. + * Otherwise: devices in those groups intersected with the zone's target MACs. + */ +async function resolveSequenceStepDeviceNames(zone, stepGroupIds) { + const zoneT = await computeZonePresetUnionTargets(zone); + const names = Array.isArray(zoneT.names) ? zoneT.names : []; + const macs = Array.isArray(zoneT.macs) ? zoneT.macs : []; + const gids = Array.isArray(stepGroupIds) + ? stepGroupIds.map((x) => String(x).trim()).filter((x) => x.length > 0) + : []; + if (!gids.length) { + return names.slice(); + } + const zoneMacSet = new Set( + macs.map((m) => normalizeDeviceMac(m)).filter((m) => m.length === 12), + ); + const zoneNameByMac = new Map(); + for (let i = 0; i < macs.length; i++) { + const m = normalizeDeviceMac(macs[i]); + if (m.length === 12 && !zoneNameByMac.has(m)) { + zoneNameByMac.set(m, names[i] || m); + } + } + const gm = await fetchGroupsMap(); + const stepMacs = new Set(); + for (const gid of gids) { + const g = gm[gid]; + if (!g || !Array.isArray(g.devices)) continue; + for (const raw of g.devices) { + const m = normalizeDeviceMac(raw); + if (m.length !== 12 || !zoneMacSet.has(m)) continue; + stepMacs.add(m); + } + } + const out = []; + for (const m of stepMacs) { + const n = zoneNameByMac.get(m); + if (n) out.push(n); + } + return out; +} + async function resolveZoneDeviceMacsFromZoneData(zone) { - const t = await computeZoneTargets(zone); + const t = await computeZonePresetUnionTargets(zone); return t.macs; } @@ -710,7 +868,7 @@ async function loadZoneContent(zoneId) { // Render zone content (presets section) const tabName = zone.name || `Zone ${zoneId}`; - const targets = await computeZoneTargets(zone); + const targets = await computeZonePresetUnionTargets(zone); const namesJsonAttr = encodeURIComponent(JSON.stringify(targets.names)); const macsJsonAttr = encodeURIComponent(JSON.stringify(targets.macs)); const legacyOk = @@ -735,8 +893,14 @@ async function loadZoneContent(zoneId) { ? Math.max(0, Math.min(255, Math.round(zoneBrightness))) : 255; applyBrightnessSliders(normalizedBrightness); - // Apply this zone's saved brightness when switching zones. - sendZoneBrightness(zoneId, normalizedBrightness); + const initialHydration = isFirstZoneContentHydration; + if (isFirstZoneContentHydration) { + isFirstZoneContentHydration = false; + } + if (!suppressZoneContentDriverSideEffects && !initialHydration) { + // Apply this zone's saved brightness when switching zones (not initial page load or UI-only strip refresh). + sendZoneBrightness(zoneId, normalizedBrightness); + } // Trigger presets loading if the function exists if (typeof renderTabPresets === 'function') { @@ -857,17 +1021,46 @@ async function sendProfilePresets() { } function tabPresetIdsInOrder(tabData) { - let ids = []; - if (Array.isArray(tabData.presets_flat)) { - ids = tabData.presets_flat.slice(); - } else if (Array.isArray(tabData.presets)) { - if (tabData.presets.length && typeof tabData.presets[0] === "string") { - ids = tabData.presets.slice(); - } else if (tabData.presets.length && Array.isArray(tabData.presets[0])) { - ids = tabData.presets.flat(); - } + return tabPresetIdsInZoneDoc(tabData); +} + +async function saveZonePresetGroupOverride(zoneId, presetId, useDefault, selectedGids) { + const tabRes = await fetch(`/zones/${zoneId}`, { headers: { Accept: "application/json" } }); + if (!tabRes.ok) { + alert("Failed to load zone."); + return false; } - return (ids || []).filter(Boolean); + const tabData = await tabRes.json(); + const pg = + tabData.preset_group_ids && typeof tabData.preset_group_ids === "object" + ? { ...tabData.preset_group_ids } + : {}; + if (useDefault) { + delete pg[String(presetId)]; + } else { + const gids = Array.isArray(selectedGids) + ? selectedGids.map((x) => String(x).trim()).filter((x) => x.length > 0) + : []; + if (!gids.length) { + alert("Select at least one group, or use zone default."); + return false; + } + pg[String(presetId)] = gids; + } + tabData.preset_group_ids = pg; + const up = await fetch(`/zones/${zoneId}`, { + method: "PUT", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify(tabData), + }); + if (!up.ok) { + alert("Failed to save preset groups."); + return false; + } + if (typeof window.renderTabPresets === "function") { + await window.renderTabPresets(zoneId); + } + return true; } // Presets already on the zone (remove) and presets available to add (select). @@ -891,7 +1084,10 @@ async function refreshEditTabPresetsUi(zoneId) { const inTabIds = tabPresetIdsInOrder(tabData); const inTabSet = new Set(inTabIds.map((id) => String(id))); - const presetsRes = await fetch("/presets", { headers: { Accept: "application/json" } }); + const [presetsRes, groupsMapEdit] = await Promise.all([ + fetch("/presets", { headers: { Accept: "application/json" } }), + fetchGroupsMap(), + ]); const allPresets = presetsRes.ok ? await presetsRes.json() : {}; const makeRow = () => { @@ -911,8 +1107,12 @@ async function refreshEditTabPresetsUi(zoneId) { for (const presetId of inTabIds) { const preset = allPresets[presetId] || {}; const name = preset.name || presetId; - const row = makeRow(); + const block = document.createElement("div"); + block.style.cssText = + "border:1px solid rgba(255,255,255,0.12);border-radius:6px;padding:0.5rem 0.65rem;margin-bottom:0.65rem;"; + const top = makeRow(); const label = document.createElement("span"); + label.style.fontWeight = "600"; label.textContent = name; const removeBtn = document.createElement("button"); removeBtn.type = "button"; @@ -924,9 +1124,90 @@ async function refreshEditTabPresetsUi(zoneId) { await window.removePresetFromTab(zoneId, presetId); await refreshEditTabPresetsUi(zoneId); }); - row.appendChild(label); - row.appendChild(removeBtn); - currentEl.appendChild(row); + top.appendChild(label); + top.appendChild(removeBtn); + block.appendChild(top); + + const hasExplicit = + tabData.preset_group_ids && + typeof tabData.preset_group_ids === "object" && + Array.isArray(tabData.preset_group_ids[presetId]) && + tabData.preset_group_ids[presetId].length > 0; + const zoneG = Array.isArray(tabData.group_ids) + ? tabData.group_ids.map((x) => String(x).trim()).filter((x) => x.length > 0) + : []; + const initialChecked = new Set( + hasExplicit + ? tabData.preset_group_ids[presetId].map((x) => String(x).trim()) + : zoneG, + ); + + const useRow = document.createElement("div"); + useRow.className = "profiles-row"; + useRow.style.marginTop = "0.35rem"; + const useDefCb = document.createElement("input"); + useDefCb.type = "checkbox"; + useDefCb.id = `edit-zone-preset-use-def-${presetId}`; + useDefCb.checked = !hasExplicit; + const useDefLbl = document.createElement("label"); + useDefLbl.htmlFor = useDefCb.id; + useDefLbl.style.marginLeft = "0.25rem"; + useDefLbl.style.fontSize = "0.9em"; + useDefLbl.textContent = "Use zone default groups"; + useRow.appendChild(useDefCb); + useRow.appendChild(useDefLbl); + block.appendChild(useRow); + + const boxHost = document.createElement("div"); + boxHost.style.cssText = `display:${hasExplicit ? "flex" : "none"};flex-wrap:wrap;gap:0.4rem;margin-top:0.35rem;align-items:center;`; + const entries = Object.keys(groupsMapEdit || {}) + .sort((a, b) => a.localeCompare(b)) + .map((gid) => { + const g = groupsMapEdit[gid]; + const gn = g && g.name ? String(g.name).trim() : ""; + return { gid, label: gn ? `${gn} (${gid})` : `Group ${gid}` }; + }); + entries.forEach(({ gid, label: glabel }) => { + const id = `zpg-${zoneId}-${presetId}-${gid}`; + const lbl = document.createElement("label"); + lbl.style.cssText = "display:inline-flex;align-items:center;gap:0.2rem;font-size:0.85em;"; + const cb = document.createElement("input"); + cb.type = "checkbox"; + cb.className = "edit-zone-preset-group-cb"; + cb.value = gid; + cb.id = id; + cb.checked = initialChecked.has(String(gid)); + const sp = document.createElement("span"); + sp.textContent = glabel; + lbl.appendChild(cb); + lbl.appendChild(sp); + boxHost.appendChild(lbl); + }); + block.appendChild(boxHost); + + useDefCb.addEventListener("change", () => { + boxHost.style.display = useDefCb.checked ? "none" : "flex"; + }); + + const applyBtn = document.createElement("button"); + applyBtn.type = "button"; + applyBtn.className = "btn btn-primary btn-small"; + applyBtn.style.marginTop = "0.4rem"; + applyBtn.textContent = "Apply preset groups"; + applyBtn.addEventListener("click", async () => { + const useD = !!useDefCb.checked; + const sel = []; + if (!useD) { + boxHost.querySelectorAll(".edit-zone-preset-group-cb:checked").forEach((c) => { + if (c.value) sel.push(String(c.value)); + }); + } + const ok = await saveZonePresetGroupOverride(zoneId, presetId, useD, sel); + if (ok) await refreshEditTabPresetsUi(zoneId); + }); + block.appendChild(applyBtn); + + currentEl.appendChild(block); } } @@ -1016,6 +1297,9 @@ async function openEditZoneModal(zoneId, zone) { if (modal) modal.classList.add("active"); await refreshEditTabPresetsUi(zoneId); + if (typeof window.refreshEditTabSequencesUi === "function") { + await window.refreshEditTabSequencesUi(zoneId); + } } // Update an existing zone @@ -1220,9 +1504,14 @@ document.addEventListener('DOMContentLoaded', () => { // When run/edit mode toggles, refresh tabs UI so edit actions show/hide immediately. document.querySelectorAll('.ui-mode-toggle').forEach((btn) => { btn.addEventListener('click', async () => { - await loadZones(); - if (zonesModal && zonesModal.classList.contains("active")) { - await loadZonesModal(); + suppressZoneContentDriverSideEffects = true; + try { + await loadZones(); + if (zonesModal && zonesModal.classList.contains("active")) { + await loadZonesModal(); + } + } finally { + suppressZoneContentDriverSideEffects = false; } }); }); @@ -1240,6 +1529,11 @@ window.zonesManager = { resolveZoneDeviceMacsFromZoneData, resolveTabDeviceMacs: resolveZoneDeviceMacs, getCurrentZoneId: () => currentZoneId, + computeZoneTargets, + computeZonePresetUnionTargets, + effectiveGroupIdsForZonePreset, + resolveDeviceNamesForZonePreset, + resolveSequenceStepDeviceNames, }; window.tabsManager = window.zonesManager; window.tabsManager.getCurrentTabId = () => currentZoneId; diff --git a/src/templates/index.html b/src/templates/index.html index 9bfb6a9..c522253 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -16,9 +16,11 @@
- BPM - -- - #0 +
+ BPM + -- + +
@@ -30,6 +32,7 @@ + @@ -51,6 +54,7 @@ + @@ -104,6 +108,10 @@
+ +
+ +
@@ -169,6 +177,10 @@
+
+ +
+

Runs identify on every driver in the group at the same time so they blink together.

@@ -280,6 +292,62 @@
+ + + + + +
-
--
+
+
--
+
+
@@ -543,6 +614,11 @@
+
+ + + Delays beat flashes and sequenced beats so they line up with what you hear (saved in this browser). +
@@ -709,6 +785,7 @@ + diff --git a/src/util/audio_detector.py b/src/util/audio_detector.py index e4a2fd8..7c921c6 100644 --- a/src/util/audio_detector.py +++ b/src/util/audio_detector.py @@ -161,11 +161,11 @@ class AudioBeatDetector: self._status["beat_type_confidence"] = float(beat_type_confidence or 0.0) self._status["beat_seq"] = int(self._status.get("beat_seq", 0)) + 1 try: - from util.beat_driver_route import notify_beat_detected + from util import sequence_playback as seq_pb - notify_beat_detected() + seq_pb.push_thread_beat() except Exception as e: - print(f"[audio] beat driver route: {e}") + print(f"[audio] sequence beat queue: {e}") def _run_loop(self, device): try: diff --git a/src/util/audio_run_persist.py b/src/util/audio_run_persist.py new file mode 100644 index 0000000..d96d8e0 --- /dev/null +++ b/src/util/audio_run_persist.py @@ -0,0 +1,52 @@ +"""Persist whether the audio beat detector should be running (survives process restarts).""" + +from __future__ import annotations + +import json +import os +from typing import Any, Dict, Optional + + +def _db_path() -> str: + base = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + return os.path.join(base, "db", "audio_run.json") + + +def coerce_audio_device(device: Any) -> Optional[Any]: + """Match ``/api/audio/start`` body coercion (None = host default input).""" + if device in ("", None): + return None + try: + return int(device) + except (TypeError, ValueError): + return device + + +def read_audio_run_state() -> Dict[str, Any]: + path = _db_path() + try: + with open(path, "r", encoding="utf-8") as f: + raw = json.load(f) + except (OSError, json.JSONDecodeError, TypeError): + return {"enabled": False, "device": None} + if not isinstance(raw, dict): + return {"enabled": False, "device": None} + enabled = bool(raw.get("enabled")) + dev = raw.get("device", None) + return {"enabled": enabled, "device": dev} + + +def write_audio_run_state(*, enabled: bool, device: Any = None) -> None: + """Write run intent. When ``enabled`` is false, keep ``device`` from the previous file for next start.""" + path = _db_path() + prev = read_audio_run_state() + if enabled: + data = {"enabled": True, "device": device} + else: + data = {"enabled": False, "device": prev.get("device")} + try: + os.makedirs(os.path.dirname(path), exist_ok=True) + with open(path, "w", encoding="utf-8") as f: + json.dump(data, f, indent=2) + except OSError as e: + print(f"[audio_run_persist] save failed: {e!r}") diff --git a/tests/audio/beat_test_120bpm.wav b/tests/audio/beat_test_120bpm.wav new file mode 100644 index 0000000..acdd507 Binary files /dev/null and b/tests/audio/beat_test_120bpm.wav differ diff --git a/tests/test_browser.py b/tests/test_browser.py index 19f1b3c..5ab35dd 100644 --- a/tests/test_browser.py +++ b/tests/test_browser.py @@ -750,6 +750,46 @@ def test_presets_ui(browser: BrowserTest) -> bool: print(f"\nBrowser presets UI tests: {passed}/{total} passed") return passed == total +def test_preset_editor_palette_child_modal_zindex(browser: BrowserTest) -> bool: + """ + Regression: preset editor 'From Palette' builds a body-appended .modal without an id. + It must use .modal-child-overlay so z-index clears #preset-editor-modal (1060). + """ + print("\n=== Testing preset child overlay z-index ===") + if not browser.setup(): + return False + try: + if not browser.navigate("/"): + return False + z_editor, z_child = browser.driver.execute_script( + """ + const ed = document.getElementById('preset-editor-modal'); + if (!ed) { return [0, 0]; } + ed.classList.add('active'); + const m = document.createElement('div'); + m.className = 'modal active modal-child-overlay'; + m.innerHTML = '

stack probe

'; + document.body.appendChild(m); + const ze = parseInt(getComputedStyle(ed).zIndex, 10) || 0; + const zc = parseInt(getComputedStyle(m).zIndex, 10) || 0; + m.remove(); + ed.classList.remove('active'); + return [ze, zc]; + """ + ) + print(f" preset-editor z-index={z_editor} modal-child-overlay z-index={z_child}") + if z_child > z_editor >= 1000: + print("✓ Child overlay stacks above preset editor") + return True + print("✗ Child overlay did not stack above preset editor") + return False + except Exception as e: + print(f"✗ z-index probe failed: {e}") + return False + finally: + browser.teardown() + + def test_color_palette_ui(browser: BrowserTest) -> bool: """Test color palette UI in browser.""" print("\n=== Testing Color Palette UI in Browser ===") @@ -1105,6 +1145,9 @@ def main(): results.append(("Zones UI", test_zones_ui(browser))) results.append(("Profiles UI", test_profiles_ui(browser))) results.append(("Presets UI", test_presets_ui(browser))) + results.append( + ("Preset palette child z-index", test_preset_editor_palette_child_modal_zindex(browser)) + ) results.append(("Color Palette UI", test_color_palette_ui(browser))) results.append(("Preset Drag and Drop", test_preset_drag_and_drop(browser))) diff --git a/tools/generate_beat_test_track.py b/tools/generate_beat_test_track.py new file mode 100644 index 0000000..dcaada2 --- /dev/null +++ b/tools/generate_beat_test_track.py @@ -0,0 +1,221 @@ +#!/usr/bin/env python3 +""" +Metronome-style mono click track for testing the audio beat detector. + +Without ``-o``: streams S16LE PCM to ``aplay`` (stdin) until you press Ctrl+C. + +With ``-o``: writes a WAV file of fixed length and exits. + +Examples: + python3 tools/generate_beat_test_track.py + python3 tools/generate_beat_test_track.py --bpm 90 + python3 tools/generate_beat_test_track.py -o tests/audio/beat_test_120bpm.wav --duration 30 +""" + +from __future__ import annotations + +import argparse +import math +import shutil +import struct +import subprocess +import wave +from pathlib import Path + + +def _parse_args() -> argparse.Namespace: + p = argparse.ArgumentParser(description=__doc__) + p.add_argument( + "-o", + "--output", + type=Path, + default=None, + help="If set, write this WAV file and exit (no live playback)", + ) + p.add_argument("--bpm", type=float, default=120.0, help="Beats per minute (default: 120)") + p.add_argument( + "--duration", + type=float, + default=30.0, + help="With -o only: click section length in seconds after intro (default: 30)", + ) + p.add_argument( + "--intro-silence", + type=float, + default=0.5, + help="Leading silence in seconds (default: 0.5)", + ) + p.add_argument("--sample-rate", type=int, default=44100, help="Sample rate Hz (default: 44100)") + p.add_argument( + "--click-ms", + type=float, + default=18.0, + help="Approximate click length in ms (default: 18)", + ) + p.add_argument( + "--freq", + type=float, + default=1000.0, + help="Click sine frequency Hz (default: 1000)", + ) + return p.parse_args() + + +def _click_int16_samples(sr: int, click_ms: float, freq: float) -> tuple[list[int], int]: + """One click; returns samples and click_len (same as len(samples)).""" + click_len = max(1, int(sr * max(4.0, click_ms) / 1000.0)) + freq_clamped = max(200.0, min(4000.0, float(freq))) + floats: list[float] = [] + for i in range(click_len): + t = i / sr + env = math.sin(0.5 * math.pi * (i + 1) / click_len) ** 2 + floats.append(env * math.sin(2.0 * math.pi * freq_clamped * t)) + peak = max(abs(x) for x in floats) or 1.0 + scale = 0.92 / peak + out: list[int] = [] + for x in floats: + v = int(round(max(-1.0, min(1.0, x * scale)) * 32767.0)) + out.append(max(-32767, min(32767, v))) + return out, click_len + + +def _render_scaled_samples( + sr: int, + bpm: float, + intro: float, + dur: float, + click_ms: float, + freq: float, +) -> tuple[list[float], int, float, int]: + beat_sec = 60.0 / bpm + click_len = max(1, int(sr * max(4.0, click_ms) / 1000.0)) + freq_clamped = max(200.0, min(4000.0, float(freq))) + total_sec = intro + dur + n_samples = int(sr * total_sec) + intro_samples = int(sr * intro) + + samples = [0.0] * n_samples + beat_samples = int(round(sr * beat_sec)) + if beat_samples < click_len + 1: + raise SystemExit("BPM too high for this sample rate / click length") + + beat_idx = 0 + while True: + start = intro_samples + beat_idx * beat_samples + if start >= n_samples: + break + for i in range(click_len): + pos = start + i + if pos >= n_samples: + break + t = i / sr + env = math.sin(0.5 * math.pi * (i + 1) / click_len) ** 2 + s = env * math.sin(2.0 * math.pi * freq_clamped * t) + samples[pos] += s + beat_idx += 1 + + peak = max(abs(x) for x in samples) or 1.0 + scale = 0.92 / peak + for i in range(n_samples): + samples[i] = max(-1.0, min(1.0, samples[i] * scale)) + + return samples, sr, total_sec, beat_idx + + +def write_wav_mono16(path: Path, samples: list[float], sr: int) -> None: + path.parent.mkdir(parents=True, exist_ok=True) + with wave.open(str(path), "w") as w: + w.setnchannels(1) + w.setsampwidth(2) + w.setframerate(sr) + for x in samples: + v = int(round(x * 32767.0)) + w.writeframes(struct.pack(" None: + aplay = shutil.which("aplay") + if not aplay: + raise SystemExit("aplay not found; install alsa-utils, or use -o to write a WAV file.") + + click_samps, click_len = _click_int16_samples(sr, click_ms, freq) + beat_samples = int(round(sr * 60.0 / bpm)) + if beat_samples < click_len + 1: + raise SystemExit("BPM too high for this sample rate / click length") + + silence_samples = beat_samples - click_len + beat_chunk = struct.pack("<" + "h" * len(click_samps), *click_samps) + ( + b"\x00\x00" * silence_samples + ) + + intro_samples = int(sr * max(0.0, float(intro_silence))) + intro_chunk = b"\x00\x00" * intro_samples + + argv = [aplay, "-q", "-t", "raw", "-f", "S16_LE", "-c", "1", "-r", str(sr)] + proc = subprocess.Popen(argv, stdin=subprocess.PIPE) + if proc.stdin is None: + raise SystemExit("aplay did not open stdin") + + print( + f"Streaming {bpm} BPM, {sr} Hz mono -> aplay (raw). Ctrl+C to stop.", + flush=True, + ) + try: + if intro_chunk: + proc.stdin.write(intro_chunk) + beats_written = 0 + # Write several beats per syscall to reduce overhead + batch = 8 + multi = beat_chunk * batch + while True: + proc.stdin.write(multi) + beats_written += batch + if beats_written % 256 == 0: + proc.stdin.flush() + except BrokenPipeError: + print("aplay exited.", flush=True) + except KeyboardInterrupt: + print("\nStopped.", flush=True) + finally: + try: + proc.stdin.close() + except BrokenPipeError: + pass + proc.wait(timeout=3) + + +def main() -> None: + args = _parse_args() + sr = max(8000, min(96000, int(args.sample_rate))) + bpm = max(40.0, min(240.0, float(args.bpm))) + + if args.output is not None: + intro = max(0.0, float(args.intro_silence)) + dur = max(1.0, float(args.duration)) + samples, sr_u, total_sec, beats = _render_scaled_samples( + sr, bpm, intro, dur, float(args.click_ms), float(args.freq) + ) + write_wav_mono16(args.output, samples, sr_u) + print( + f"Wrote {args.output} ({len(samples)} samples, {total_sec:.1f}s, {sr_u} Hz mono): " + f"{bpm} BPM, ~{beats} beats" + ) + return + + _stream_aplay_until_interrupt( + sr, + bpm, + float(args.intro_silence), + float(args.click_ms), + float(args.freq), + ) + + +if __name__ == "__main__": + main()