consolidate; add route to play sound fx

app.py

@@ -48,26 +48,31 @@ def sigh(signum: int, _frame):
     shutdown(status)
 
 
-async def mpv_start(args: list[str] = ["--idle"]):
-    global mpv_process
-    mpv_process = subprocess.Popen(
+def mpv_spawn(args: list[str]):
+    return subprocess.Popen(
         [
             "mpv",
-            f"--input-ipc-server={mpv_socket}",
             "--no-video",
             f"--volume={volume}",
+            "--terminal=no",
             *args,
         ],
         stdout=subprocess.DEVNULL,
         stderr=subprocess.DEVNULL,
     )
+
+
+async def mpv_start(args: list[str]):
+    global mpv_process
+    mpv_process = mpv_spawn([f"--input-ipc-server={mpv_socket}", *args])
+
     open(mpv_pidfile, "w").write(str(mpv_process.pid))
 
     while not mpv_socket.exists():
         await asyncio.sleep(0.01)
 
 
-async def playback_start(args: list[str] = ["--idle"]):
+async def playback_start():
     return await mpv_start(
         args=[
             "--shuffle",
@@ -238,32 +243,15 @@ async def api_nowplaying():
     return jsonify(response)
 
 
+@app.route("/api/play", methods=["POST"], defaults={"filename_or_url": None})
 @app.route("/api/play/<path:filename_or_url>", methods=["POST"])
-async def api_play_file(
-    filename_or_url: str, error_str: str = "Could not play file '{filename}'"
+async def api_play_track(
+    filename_or_url: str | None = None,
+    error_str: str = "Could not play file '{filename}'",
 ):
-    if re.match("^https?://.*", filename_or_url):
-        playback_uri = filename_or_url
-    else:
-        file_path = music_path.joinpath(filename_or_url)
-        if not file_path.exists():
-            return jsonify(error_str.format(filename=filename_or_url)), 404
-        playback_uri = str(file_path)
+    if filename_or_url is None:
+        filename_or_url = request.get_data().decode()
 
-    if mpv_running():
-        mpv_stop()
-
-    await mpv_start([playback_uri])
-
-    if not mpv_running():
-        return jsonify(error_str.format(filename=filename_or_url)), 500
-
-    return jsonify("ok")
-
-
-@app.route("/api/play", methods=["POST"])
-async def api_play_file2(error_str: str = "Could not play file '{filename}'"):
-    filename_or_url = request.get_data().decode()
     if re.match("^https?://.*", filename_or_url):
         playback_uri = filename_or_url
     else:
@@ -285,11 +273,37 @@ async def api_play_file2(error_str: str = "Could not play file '{filename}'"):
 
 @app.route("/api/isengard", methods=["POST"])
 async def api_isengard():
-    return await api_play_file(
+    return await api_play_track(
         "isengard.mp3", error_str="Could not take the hobbits to Isengard"
     )
 
 
+@app.route("/api/fx", methods=["POST"], defaults={"filename_or_url": None})
+@app.route("/api/fx/<path:filename_or_url>", methods=["POST"])
+async def api_play_fx(
+    filename_or_url: str | None = None,
+    error_str: str = "Could not play file '{filename}'",
+):
+    if filename_or_url is None:
+        filename_or_url = request.get_data().decode()
+
+    if re.match("^https?://.*", filename_or_url):
+        playback_uri = filename_or_url
+    else:
+        file_path = music_path.joinpath(filename_or_url)
+        if not file_path.exists():
+            return jsonify(error_str.format(filename=filename_or_url)), 404
+        playback_uri = str(file_path)
+
+    fx_process = mpv_spawn([playback_uri])
+    await asyncio.sleep(0.1)
+    fx_process.poll()
+    if fx_process.returncode not in [None, 0]:
+        return jsonify(error_str.format(filename=filename_or_url)), 500
+
+    return jsonify("ok")
+
+
 @app.route("/api/volume", methods=["GET", "PUT"])
 async def api_volume():
     if request.method == "PUT":