From f3546408d2d105b2105b04d636321766a695411a Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Fri, 13 Nov 2026 16:18:25 +0100 Subject: [PATCH] feat: auto generate edits --- data/songs.json | 38 ++++++++--------- routes.py | 77 +++++++++++++++++++++++++++++++++- templates/admin_add_task.html | 72 ++++++++++++++++++++++--------- templates/admin_tasksList.html | 4 +- 4 files changed, 149 insertions(+), 42 deletions(-) diff --git a/data/songs.json b/data/songs.json index 2db645e..77a8190 100644 --- a/data/songs.json +++ b/data/songs.json @@ -1,21 +1,21 @@ [ - { - "name": "Umsonst gelebt", - "artist": "Jugend Chor", - "id": "002", - "original_name": "-", - "original": { - "filename": "m003.mp3", - "sampling_rate": 44.1, - "bitrate": 256 - }, - "edits": [ - { - "filename": "m004.mp3", - "sampling_rate": 22.1, - "bitrate": 63, - "id": "1" - } - ] - } + { + "name": "Umsonst gelebt", + "artist": "Jugend Chor", + "id": "002", + "original_name": "-", + "original": { + "filename": "m003.mp3", + "sampling_rate": 44100, + "bitrate": 256000 + }, + "edits": [ + { + "filename": "m004.mp3", + "sampling_rate": 22100, + "bitrate": 63000, + "id": "1" + } + ] + } ] \ No newline at end of file diff --git a/routes.py b/routes.py index 14232f7..32ecc48 100644 --- a/routes.py +++ b/routes.py @@ -15,6 +15,7 @@ from db import init_db, get_db, close_db, create_participant, now from datetime import datetime, timezone import threading from mutagen import File +import subprocess bp = Blueprint("main", __name__) @@ -368,4 +369,78 @@ def api_admin_add(): "edits": [], }) - return jsonify({"saved": True, "filename": filename_new}) \ No newline at end of file + return jsonify({"saved": True, "filename": filename_new}) + +VALID_SAMPLING_RATES = {8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000} + +@bp.route("/api/admin/add/", methods=["POST"]) +@admin_required +def api_admin_add_task(songId): + mode = request.form.get("mode", "cbr") + sampling_rate = request.form.get("sampling_rate", type=int) + + if mode not in ("cbr", "vbr"): + return jsonify({"saved": False, "error": "Ungültiger Modus"}), 400 + if sampling_rate not in VALID_SAMPLING_RATES: + return jsonify({"saved": False, "error": "Ungültige Abtastrate"}), 400 + + songs = load_songs_list() + song = next((s for s in songs if str(s["id"]) == songId), None) + if song is None: + return jsonify({"saved": False, "error": "Song nicht gefunden"}), 404 + + original = song["original"] + if sampling_rate > original["sampling_rate"]: + return jsonify({"saved": False, "error": "Abtastrate höher als Original"}), 400 + + if mode == "vbr": + quality = request.form.get("quality", type=int) + if quality is None or not 0 <= quality <= 9: + return jsonify({"saved": False, "error": "Ungültige VBR-Qualität"}), 400 + quality_args = ["-q:a", str(quality)] + else: + bitrate_kbps = request.form.get("bitrate", type=int) + if not bitrate_kbps or bitrate_kbps <= 0: + return jsonify({"saved": False, "error": "Bitrate fehlt"}), 400 + if bitrate_kbps * 1000 > original["bitrate"] + 1000: + return jsonify({"saved": False, "error": "Bitrate höher als Original"}), 400 + quality_args = ["-b:a", f"{bitrate_kbps}k"] + + src = BASE_MUSIC_DIR / original["filename"] + if not src.is_file(): + return jsonify({"saved": False, "error": "Originaldatei fehlt"}), 404 + + edit_id = uuid.uuid4().hex + dst = BASE_MUSIC_DIR / (edit_id + ".mp3") # immer MP3, siehe Hinweis unten + + try: + subprocess.run( + ["ffmpeg", "-y", "-i", str(src), "-vn", + "-c:a", "libmp3lame", *quality_args, + "-ar", str(sampling_rate), str(dst)], + check=True, capture_output=True, timeout=300, + ) + except subprocess.CalledProcessError as e: + dst.unlink(missing_ok=True) + current_app.logger.error("ffmpeg: %s", e.stderr.decode(errors="replace")[-1000:]) + return jsonify({"saved": False, "error": "Konvertierung fehlgeschlagen"}), 500 + except subprocess.TimeoutExpired: + dst.unlink(missing_ok=True) + return jsonify({"saved": False, "error": "Zeitüberschreitung"}), 500 + + # tatsächliche Werte aus der fertigen Datei lesen + out = File(dst) + actual_bitrate = out.info.bitrate if out else None + actual_rate = out.info.sample_rate if out else sampling_rate + + song.setdefault("edits", []).append({ + "id": edit_id, + "filename": dst.name, + "mode": mode, + "quality": quality if mode == "vbr" else None, + "bitrate": actual_bitrate, + "sampling_rate": actual_rate, + }) + save_songs_list(songs) + + return jsonify({"saved": True, "id": edit_id}) \ No newline at end of file diff --git a/templates/admin_add_task.html b/templates/admin_add_task.html index 41c74df..0a2512a 100644 --- a/templates/admin_add_task.html +++ b/templates/admin_add_task.html @@ -3,13 +3,40 @@ {% block admin_title %}Kopie erstellen{% endblock %} {% block admin_content %} -{{ song }}
- - + + - - +
+ + +
+ + + + +
@@ -18,8 +45,8 @@ - - + + @@ -31,7 +58,7 @@ {% for e in song.edits %} - + {% endfor %} @@ -44,20 +71,25 @@ const form = document.getElementById("form"); form.addEventListener("submit", async (event) => { event.preventDefault(); - const res = await fetch("/api/admin/add", { - method: "POST", - body: new FormData(form), - }); - const result = await res.json(); - console.log(result); + const button = form.querySelector("button"); + button.disabled = true; // Doppelklick verhindern + try { + const res = await fetch("/api/admin/add/{{ song.id }}", { + method: "POST", + body: new FormData(form), + }); + if (!res.ok) throw new Error("Fehler " + res.status); + location.reload(); // Tabelle aktualisieren + } catch (err) { + alert("Erstellen fehlgeschlagen: " + err.message); + button.disabled = false; + } }); - const fileInput = document.getElementById("file"); - const fileName = document.getElementById("file-name"); - fileInput.addEventListener("change", () => { - fileName.textContent = fileInput.files.length - ? fileInput.files[0].name - : "Keine Datei ausgewählt"; + const mode = document.getElementById("mode"); + mode.addEventListener("change", () => { + document.getElementById("cbr-field").hidden = mode.value !== "cbr"; + document.getElementById("vbr-field").hidden = mode.value !== "vbr"; }); diff --git a/templates/admin_tasksList.html b/templates/admin_tasksList.html index 431c4c7..8e02e3e 100644 --- a/templates/admin_tasksList.html +++ b/templates/admin_tasksList.html @@ -18,8 +18,8 @@ - - + + {% for s in songs %}
IDBitrateAbtastrateBitrate (bit/s)Abtastrate (Hz)
{{ e.id }}{{ e.bitrate }} ({{ (e.bitrate / song.original.bitrate * 100) | round(1) }}%){{ e.bitrate }} ({{ (e.bitrate / song.original.bitrate * 100) | round(1) }}%) {{ e.get("mode", "cbr") | upper }} {{ e.sampling_rate }} ({{ (e.sampling_rate / song.original.sampling_rate * 100) | round(1) }}%)
Name Artist IDBitrateAbtastrateBitrate (bit/s)Abtastrate (Hz)