ethiele/signage
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Loeschen entfernt auch den Playlist-Eintrag der Datei

Browse Source 
Der Filter in delete_file verglich nur item["url"], traf damit aber nur
URL-Eintraege. Bei Dateien wurde die Datei vom Datentraeger geloescht,
der Eintrag {"name": ...} blieb als Karteileiche in der config.json
stehen - in der Priority-Playlist wie in jeder Screen-Playlist.
Vergleich laeuft jetzt ueber playlist_item_name(), das alle drei
Eintragsformen abdeckt.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Erik Thiele
2026-09-08 09:09:37 +02:00
parent ccfd90d4b5
commit cbadf096fd
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app.py
View File

@@ -1878,18 +1878,15 @@ def delete_file(site, screen, filename):
if screen == "priority": if screen == "priority":
path = os.path.join(priority_dir(site), filename) path = os.path.join(priority_dir(site), filename)
playlist = get_priority_config(cfg, site).get("playlist", []) 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)
)]
else: else:
path = os.path.join(MEDIA_DIR, site, screen, filename) path = os.path.join(MEDIA_DIR, site, screen, filename)
screens_cfg = cfg.get("sites", {}).get(site, {}).get("screens", {}) screens_cfg = cfg.get("sites", {}).get(site, {}).get("screens", {})
playlist = screens_cfg.get(screen, {}).get("playlist", []) playlist = screens_cfg.get(screen, {}).get("playlist", [])
playlist[:] = [item for item in playlist if not (
(isinstance(item, str) and item == filename) or # Ueber playlist_item_name vergleichen: Datei-Eintraege stehen als
(isinstance(item, dict) and item.get("url") == filename) # {"name": ...}, URLs als {"url": ...}, Altbestand als reiner String.
)] playlist[:] = [item for item in playlist
if playlist_item_name(item) != filename]
if os.path.exists(path): if os.path.exists(path):
os.remove(path) os.remove(path)