fix: Priority-Playlist je Standort statt global
Die Priority-Playlist lag unter config["priority"] und wirkte damit auf *alle* Standorte. In der Praxis lief so ein Stuttgart-spezifischer Eintrag (wbxroompresence...find=Stuttgart) auch auf den Karlsruher Screens. Sie liegt jetzt unter sites.<site>.priority, die Medien unter media/<site>/priority/: - get_priority_config(cfg, site) liefert die Konfiguration des Standorts. Ist dort nichts hinterlegt, wird ein globaler Altbestand einmalig uebernommen - per deepcopy, damit spaetere Aenderungen nicht zwischen Standorten durchschlagen. - load_priority_files(site), priority_dir(site) sowie Player, Hash, Upload, Loeschen, URL-Anlegen, Umsortieren und Einzeleintrag- Bearbeitung arbeiten durchgaengig standortbezogen. - Route /media/priority/<datei> -> /media/<site>/priority/<datei>, Templates entsprechend. - Der Ordnername "priority" ist wie "logos" in der Screen-Erkennung ausgenommen. media/<site>/priority/ waere sonst als Screen in der Konfiguration gelandet; "priority" ist in den Routen ohnehin als Kennzeichen belegt, ein Screen dieses Namens war nie moeglich. Migration der vorhandenen Konfiguration: der globale Block wurde in alle drei Standorte uebernommen und der globale Schluessel entfernt. Der leere globale Ordner media/priority/ ist entfallen. README, AGENTS.md und Hilfeseite nachgezogen. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Erik Thiele
75
app.py
75
app.py
@@ -10,6 +10,7 @@ zugeschaltet werden, die auf allen Playern abwechselnd eingeblendet wird.
|
||||
|
||||
import os
|
||||
import json
|
||||
import copy
|
||||
import hashlib
|
||||
import re
|
||||
import time
|
||||
@@ -380,16 +381,38 @@ def is_item_active(item):
|
||||
# -------------------------------------------------
|
||||
# Priority-Playlist-Helfer
|
||||
# -------------------------------------------------
|
||||
def load_priority_files():
|
||||
"""Lädt die Priority-Playlist aus config.json plus die dazugehörigen Dateien
|
||||
aus media/priority/. Gibt eine Liste von Dicts mit name/type/size/enabled zurück.
|
||||
PRIORITY_DIRNAME = "priority"
|
||||
|
||||
|
||||
def priority_dir(site):
|
||||
"""Verzeichnis der Priority-Medien eines Standorts: media/<site>/priority/."""
|
||||
return os.path.join(MEDIA_DIR, site, PRIORITY_DIRNAME)
|
||||
|
||||
|
||||
def get_priority_config(cfg, site):
|
||||
"""Priority-Konfiguration eines Standorts (erzeugt fehlende Ebenen).
|
||||
|
||||
Die Priority-Playlist gilt ausschliesslich fuer den eigenen Standort.
|
||||
Aeltere Konfigurationen hatten sie global unter cfg["priority"]; ist beim
|
||||
Standort noch nichts hinterlegt, wird der Altbestand einmalig uebernommen."""
|
||||
site_cfg = cfg.setdefault("sites", {}).setdefault(site, {})
|
||||
if "priority" not in site_cfg:
|
||||
alt = cfg.get("priority")
|
||||
site_cfg["priority"] = copy.deepcopy(alt) if isinstance(alt, dict) else {}
|
||||
return site_cfg["priority"]
|
||||
|
||||
|
||||
def load_priority_files(site):
|
||||
"""Lädt die Priority-Playlist eines Standorts aus config.json plus die
|
||||
dazugehörigen Dateien aus media/<site>/priority/.
|
||||
Gibt eine Liste von Dicts mit name/type/size/enabled zurück.
|
||||
Neue Dateien im Ordner, die noch nicht in der Playlist sind, werden angehängt."""
|
||||
cfg = load_config()
|
||||
prio_dir = os.path.join(MEDIA_DIR, "priority")
|
||||
prio_dir = priority_dir(site)
|
||||
os.makedirs(prio_dir, exist_ok=True)
|
||||
|
||||
priority_files = []
|
||||
prio_playlist = cfg.get("priority", {}).get("playlist", [])
|
||||
prio_playlist = get_priority_config(cfg, site).get("playlist", [])
|
||||
|
||||
# 1. Einträge aus der config.json-Playlist
|
||||
for item in prio_playlist:
|
||||
@@ -1143,11 +1166,10 @@ def api_add_customer():
|
||||
# -------------------------------------------------
|
||||
# Medien ausliefern (statische Dateien)
|
||||
# -------------------------------------------------
|
||||
@app.route("/media/priority/<path:filename>")
|
||||
def media_priority(filename):
|
||||
"""Liefert globale Priority-Medien aus media/priority/ aus."""
|
||||
path = os.path.join(MEDIA_DIR, "priority")
|
||||
return send_from_directory(path, filename)
|
||||
@app.route("/media/<site>/priority/<path:filename>")
|
||||
def media_priority(site, filename):
|
||||
"""Liefert die Priority-Medien eines Standorts aus media/<site>/priority/ aus."""
|
||||
return send_from_directory(priority_dir(site), filename)
|
||||
|
||||
|
||||
@app.route("/media/<site>/<screen>/<path:filename>")
|
||||
@@ -1229,7 +1251,7 @@ def player(site, screen):
|
||||
normal_files.append({"kind": "file", "name": f})
|
||||
|
||||
# ─── Priority-Playlist (global) ───
|
||||
priority_cfg = config.get("priority", {})
|
||||
priority_cfg = get_priority_config(config, site)
|
||||
|
||||
if priority_cfg.get("enabled", False):
|
||||
prio_files = []
|
||||
@@ -1243,7 +1265,7 @@ def player(site, screen):
|
||||
prio_files.append({"kind": "url", "url": url_data["url"], "zoom": url_data.get("zoom", 1.0), "enabled": is_item_active(item), "passthrough": item.get("passthrough_params", False) if isinstance(item, dict) else False, "schedule": item.get("schedule") if isinstance(item, dict) else None})
|
||||
continue
|
||||
|
||||
file_path = os.path.join(MEDIA_DIR, "priority", item_name)
|
||||
file_path = os.path.join(priority_dir(site), item_name)
|
||||
if os.path.exists(file_path):
|
||||
prio_files.append({"kind": "file", "name": item_name, "enabled": True})
|
||||
else:
|
||||
@@ -1296,7 +1318,7 @@ def playlist_hash(site, screen):
|
||||
screen_playlist = (
|
||||
config.get("sites", {}).get(site, {}).get("screens", {}).get(screen, {}).get("playlist", [])
|
||||
)
|
||||
prio_cfg = config.get("priority", {})
|
||||
prio_cfg = get_priority_config(config, site)
|
||||
prio_playlist = prio_cfg.get("playlist", []) if prio_cfg.get("enabled", False) else []
|
||||
|
||||
relevant = {
|
||||
@@ -1409,15 +1431,17 @@ def admin(site):
|
||||
config_screens = site_cfg.setdefault("screens", {})
|
||||
|
||||
# Ordner im Medienverzeichnis = Screens.
|
||||
# "logos" ist reserviert: aeltere Versionen legten dort hochgeladene
|
||||
# Kundenlogos ab, und ein solcher Ordner wuerde sonst dauerhaft als Screen
|
||||
# in der Konfiguration landen.
|
||||
# Reservierte Namen: "logos" (hochgeladene Kundenlogos) und "priority"
|
||||
# (Priority-Medien des Standorts). Solche Ordner wuerden sonst dauerhaft als
|
||||
# Screen in der Konfiguration landen; "priority" ist ausserdem in den Routen
|
||||
# bereits als Kennzeichen fuer die Priority-Playlist belegt.
|
||||
reserviert = {generate_welcome_page.LOGO_URL_PREFIX, PRIORITY_DIRNAME}
|
||||
if os.path.isdir(site_media_base):
|
||||
for entry in os.listdir(site_media_base):
|
||||
entry_path = os.path.join(site_media_base, entry)
|
||||
if (os.path.isdir(entry_path)
|
||||
and not entry.startswith("._")
|
||||
and entry != generate_welcome_page.LOGO_URL_PREFIX):
|
||||
and entry not in reserviert):
|
||||
known_screens.add(entry)
|
||||
|
||||
# Screens aus Config ergänzen (auch ohne Ordner)
|
||||
@@ -1523,7 +1547,7 @@ def admin_priority(site):
|
||||
"""Zeigt die Priority-Playlist-Seite mit Tabs (Playlist + Medien)."""
|
||||
cfg = load_config()
|
||||
site_list = get_accessible_sites(cfg, current_user)
|
||||
priority_files = load_priority_files()
|
||||
priority_files = load_priority_files(site)
|
||||
|
||||
return render_template(
|
||||
"priority.html",
|
||||
@@ -1719,7 +1743,8 @@ def upload(site, screen):
|
||||
filename = secure_filename(file.filename)
|
||||
|
||||
if screen == "priority":
|
||||
file.save(os.path.join(MEDIA_DIR, "priority", filename))
|
||||
os.makedirs(priority_dir(site), exist_ok=True)
|
||||
file.save(os.path.join(priority_dir(site), filename))
|
||||
else:
|
||||
file.save(os.path.join(MEDIA_DIR, site, screen, filename))
|
||||
|
||||
@@ -1790,7 +1815,7 @@ def add_url(site, screen):
|
||||
|
||||
config = load_config()
|
||||
if screen == "priority":
|
||||
config.setdefault("priority", {}).setdefault("playlist", []).append(url_data)
|
||||
get_priority_config(config, site).setdefault("playlist", []).append(url_data)
|
||||
else:
|
||||
cfg = get_screen_config(config, site, screen)
|
||||
cfg.setdefault("playlist", []).append(url_data)
|
||||
@@ -1809,8 +1834,8 @@ def delete_file(site, screen, filename):
|
||||
cfg = load_config()
|
||||
|
||||
if screen == "priority":
|
||||
path = os.path.join(MEDIA_DIR, "priority", filename)
|
||||
playlist = cfg.get("priority", {}).get("playlist", [])
|
||||
path = os.path.join(priority_dir(site), filename)
|
||||
playlist = get_priority_config(cfg, site).get("playlist", [])
|
||||
playlist[:] = [item for item in playlist if not (
|
||||
(isinstance(item, str) and item == filename) or
|
||||
(isinstance(item, dict) and item.get("url") == filename)
|
||||
@@ -1847,7 +1872,7 @@ def save_playlist(site, screen):
|
||||
enabled_map = data.get("enabled", {})
|
||||
|
||||
if screen == "priority":
|
||||
old_playlist = cfg.get("priority", {}).get("playlist", [])
|
||||
old_playlist = get_priority_config(cfg, site).get("playlist", [])
|
||||
else:
|
||||
screens_cfg = cfg.get("sites", {}).get(site, {}).get("screens", {})
|
||||
old_playlist = screens_cfg.get(screen, {}).get("playlist", [])
|
||||
@@ -1868,7 +1893,7 @@ def save_playlist(site, screen):
|
||||
new_playlist.append({"url": key, "zoom": 1.0, "enabled": enabled_map.get(key, True)} if is_url(key) else {"name": key, "enabled": enabled_map.get(key, True)})
|
||||
|
||||
if screen == "priority":
|
||||
cfg.setdefault("priority", {})["playlist"] = new_playlist
|
||||
get_priority_config(cfg, site)["playlist"] = new_playlist
|
||||
else:
|
||||
cfg.setdefault("sites", {}).setdefault(site, {}).setdefault("screens", {}).setdefault(screen, {})["playlist"] = new_playlist
|
||||
|
||||
@@ -1907,7 +1932,7 @@ def update_playlist_item(site, screen):
|
||||
config = load_config()
|
||||
|
||||
if screen == "priority":
|
||||
playlist = config.setdefault("priority", {}).setdefault("playlist", [])
|
||||
playlist = get_priority_config(config, site).setdefault("playlist", [])
|
||||
else:
|
||||
playlist = config["sites"][site]["screens"][screen].setdefault("playlist", [])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user