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

feat: Add time-based scheduling for playlist items

Browse Source
This commit is contained in:
Erik Thiele
2026-08-29 16:29:40 +02:00
parent 7870c889f8
commit 26efed87a5
2 changed files with 427 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
app.py
View File

@@ -217,14 +217,52 @@ def playlist_item_name(item):
return ""
def playlist_item_enabled(item):
"""Prüft, ob ein Playlist-Eintrag aktiviert ist.
Strings sind immer aktiv, Dicts haben ein optionales "enabled"-Feld (default: True)."""
if isinstance(item, (str,)):
return True
def is_item_active(item):
"""Prüft, ob ein Playlist-Eintrag aktiviert und zeitlich gültig ist.
Berücksichtigt enabled-Status und optionale Zeitsteuerung."""
now = datetime.now()
# Standardmäßig aktiv, wenn kein enabled-Status gesetzt ist
if isinstance(item, dict):
return item.get("enabled", True)
return True
if not item.get("enabled", True):
return False
# Zeitsteuerung prüfen
schedule = item.get("schedule")
if schedule:
start_str = schedule.get("start")
end_str = schedule.get("end")
if not start_str or not end_str:
return item.get("enabled", True)
try:
start = datetime.fromisoformat(start_str)
end = datetime.fromisoformat(end_str)
mode = schedule.get("mode", "once")
if mode == "once":
return start <= now <= end
elif mode == "daily":
current_time = now.time()
start_time = start.time()
end_time = end.time()
return start_time <= current_time <= end_time
elif mode == "weekly":
days = schedule.get("days", [])
current_weekday = now.weekday() # 0=Montag, 6=Sonntag
current_time = now.time()
start_time = start.time()
end_time = end.time()
return (str(current_weekday) in days or
f"{current_weekday}".lower()[:3] in [d.lower() for d in days]) and \
start_time <= current_time <= end_time
except (ValueError, TypeError):
pass
# Für Strings oder keine Zeitsteuerung: nur enabled prüfen
return playlist_item_enabled(item)
# -------------------------------------------------
@@ -244,18 +282,19 @@ def load_priority_files():
# 1. Einträge aus der config.json-Playlist
for item in prio_playlist:
item_name = playlist_item_name(item)
if is_url(item):
url_data = normalize_url(item)
if url_data:
priority_files.append({
"name": url_data["url"],
"type": "url",
"size": "URL",
"zoom": url_data.get("zoom", 1.0),
"enabled": playlist_item_enabled(item),
"passthrough": item.get("passthrough_params", False) if isinstance(item, dict) else False
})
continue
if is_url(item):
url_data = normalize_url(item)
if url_data:
priority_files.append({
"name": url_data["url"],
"type": "url",
"size": "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")
})
continue
file_path = os.path.join(prio_dir, item_name)
if not os.path.exists(file_path):
@@ -520,11 +559,11 @@ def login():
if trust_token:
now = datetime.now()
# Abgelaufene Einträge bereinigen
active = [d for d in trusted
active = [d for d in user.trusted_devices
if d.get("token") != trust_token or
datetime.fromisoformat(d["expires"]) > now]
changed = len(active) != len(trusted)
for d in trusted:
changed = len(active) != len(user.trusted_devices)
for d in user.trusted_devices:
if d.get("token") == trust_token:
try:
expires = datetime.fromisoformat(d["expires"])
@@ -981,7 +1020,7 @@ def player(site, screen):
if is_url(item):
url_data = normalize_url(item)
if url_data:
normal_files.append({"kind": "url", "url": url_data["url"], "zoom": url_data.get("zoom", 1.0), "enabled": True, "passthrough": item.get("passthrough_params", False) if isinstance(item, dict) else False})
normal_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")})
continue
if item_name and os.path.exists(os.path.join(folder, item_name)) and allowed_file(item_name):
@@ -1011,7 +1050,7 @@ def player(site, screen):
if is_url(item):
url_data = normalize_url(item)
if url_data:
prio_files.append({"kind": "url", "url": url_data["url"], "zoom": url_data.get("zoom", 1.0), "enabled": True, "passthrough": item.get("passthrough_params", False) if isinstance(item, dict) else False})
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")})
continue
file_path = os.path.join(MEDIA_DIR, "priority", item_name)
@@ -1020,29 +1059,30 @@ def player(site, screen):
else:
prio_files = []
return render_template(
"player.html",
site=site,
screen=screen,
normal_files=[item for item in normal_files if item.get("enabled", True)],
prio_files=[item for item in prio_files if item.get("enabled", True)],
interval=screen_cfg.get("interval", 10),
newsticker_text=screen_cfg.get("newsticker_text", ""),
newsticker_enabled=screen_cfg.get("newsticker_enabled", False),
custom_url=screen_cfg.get("custom_url", ""),
custom_url_label=screen_cfg.get("custom_url_label", ""),
custom_url_enabled=screen_cfg.get("custom_url_enabled", False),
custom_url_target=screen_cfg.get("custom_url_target", "overlay"),
custom_url_position=screen_cfg.get("custom_url_position", "top-left"),
stay_on_first=screen_cfg.get("stay_on_first", False),
voice_agent_enabled=screen_cfg.get("voice_agent_enabled", False),
voice_agent_show_image=screen_cfg.get("voice_agent_show_image") if screen_cfg.get("voice_agent_show_image") is not None else False,
voice_agent_url=config.get("voice_agent_url", ""),
voice_agent_label=screen_cfg.get("voice_agent_label", "Digitaler Assistent"),
voice_agent_target=screen_cfg.get("voice_agent_target", "overlay"),
voice_agent_position=screen_cfg.get("voice_agent_position", "top-left"),
player_params=dict(request.args)
)
return render_template(
"player.html",
site=site,
screen=screen,
normal_files=[item for item in normal_files if item.get("enabled", True)],
prio_files=[item for item in prio_files if item.get("enabled", True)],
interval=screen_cfg.get("interval", 10),
newsticker_text=screen_cfg.get("newsticker_text", ""),
newsticker_enabled=screen_cfg.get("newsticker_enabled", False),
custom_url=screen_cfg.get("custom_url", ""),
custom_url_label=screen_cfg.get("custom_url_label", ""),
custom_url_enabled=screen_cfg.get("custom_url_enabled", False),
custom_url_target=screen_cfg.get("custom_url_target", "overlay"),
custom_url_position=screen_cfg.get("custom_url_position", "top-left"),
stay_on_first=screen_cfg.get("stay_on_first", False),
voice_agent_enabled=screen_cfg.get("voice_agent_enabled", False),
voice_agent_show_image=screen_cfg.get("voice_agent_show_image") if screen_cfg.get("voice_agent_show_image") is not None else False,
voice_agent_url=config.get("voice_agent_url", ""),
voice_agent_label=screen_cfg.get("voice_agent_label", "Digitaler Assistent"),
voice_agent_target=screen_cfg.get("voice_agent_target", "overlay"),
voice_agent_position=screen_cfg.get("voice_agent_position", "top-left"),
player_params=dict(request.args),
now=datetime.now().isoformat()
)
# -------------------------------------------------
@@ -1201,8 +1241,9 @@ def admin(site):
"type": "url",
"size": "URL",
"zoom": url_data.get("zoom", 1.0),
"enabled": playlist_item_enabled(item),
"passthrough": item.get("passthrough_params", False) if isinstance(item, dict) else False
"enabled": is_item_active(item),
"passthrough": item.get("passthrough_params", False) if isinstance(item, dict) else False,
"schedule": item.get("schedule")
})
continue
@@ -1224,7 +1265,8 @@ def admin(site):
"name": item_name,
"type": ftype,
"size": size,
"enabled": playlist_item_enabled(item)
"enabled": is_item_active(item),
"schedule": item.get("schedule")
})
# 2. Neue Dateien (ohne Playlist-Eintrag) anhängen
@@ -1474,7 +1516,7 @@ def upload(site, screen):
@app.route("/admin/<site>/add-url/<screen>", methods=["POST"])
@site_access_required
def add_url(site, screen):
"""Fügt eine URL (mit Zoom-Faktor) zur Playlist eines Screens oder der Priority-Playlist hinzu."""
"""Fügt eine URL (mit Zoom-Faktor und optionaler Zeitsteuerung) zur Playlist eines Screens oder der Priority-Playlist hinzu."""
url = request.form.get("url", "").strip()
zoom = request.form.get("zoom", "1.0").strip()
@@ -1488,7 +1530,32 @@ def add_url(site, screen):
except (ValueError, TypeError):
zoom_factor = 1.0
# Zeitsteuerung verarbeiten
schedule_enabled = "schedule_enabled" in request.form
schedule = None
if schedule_enabled:
mode = request.form.get("schedule_mode", "once")
start = request.form.get("schedule_start")
end = request.form.get("schedule_end")
if not start or not end:
flash("Start- und Endzeit müssen angegeben werden", "error")
return redirect(f"/admin/{site}")
schedule = {
"mode": mode,
"start": start,
"end": end
}
if mode == "weekly":
days = request.form.getlist("schedule_days")
schedule["days"] = days
url_data = {"url": url, "zoom": zoom_factor}
if schedule:
url_data["schedule"] = schedule
config = load_config()
if screen == "priority":
@@ -1584,11 +1651,13 @@ def save_playlist(site, screen):
@app.route("/admin/<site>/update-playlist-item/<screen>", methods=["POST"])
@site_access_required
def update_playlist_item(site, screen):
"""Aktualisiert URL und Zoom eines einzelnen Playlist-Items."""
"""Aktualisiert URL, Zoom und Zeitsteuerung eines einzelnen Playlist-Items."""
data = request.get_json()
old_name = data.get("old_name")
new_url = data.get("new_url", "").strip()
zoom = data.get("zoom", 1.0)
passthrough = data.get("passthrough")
schedule = data.get("schedule") # Kann None, {} oder schedule-Objekt sein
if not is_url(new_url):
return jsonify({"error": "Ungültige URL"}), 400
@@ -1611,14 +1680,26 @@ def update_playlist_item(site, screen):
name = playlist_item_name(item)
if name == old_name:
updated = {"url": new_url, "zoom": zoom}
passthrough = data.get("passthrough", None)
# Passthrough beibehalten oder aktualisieren
if passthrough is not None:
updated["passthrough_params"] = bool(passthrough)
else:
# Bestehenden Wert übernehmen falls vorhanden
existing = item.get("passthrough_params") if isinstance(item, dict) else None
if existing is not None:
updated["passthrough_params"] = existing
# Zeitsteuerung beibehalten, entfernen oder aktualisieren
if schedule is not None:
# Schedule wurde explizit gesendet (kann {} für Entfernen sein)
if schedule: # Nicht leer
updated["schedule"] = schedule
# Wenn schedule leer ist {}, wird es nicht hinzugefügt (entfernt)
else:
# Nicht im Request → bestehenden Wert beibehalten
if isinstance(item, dict) and "schedule" in item:
updated["schedule"] = item["schedule"]
playlist[i] = updated
save_config(config)
return jsonify({"success": True})