feat: Add time-based scheduling for playlist items

app.py

@@ -217,14 +217,52 @@ def playlist_item_name(item):
     return ""
 
 
-def playlist_item_enabled(item):
+def is_item_active(item):
-    """Prüft, ob ein Playlist-Eintrag aktiviert ist.
+    """Prüft, ob ein Playlist-Eintrag aktiviert und zeitlich gültig ist.
-       Strings sind immer aktiv, Dicts haben ein optionales "enabled"-Feld (default: True)."""
+       Berücksichtigt enabled-Status und optionale Zeitsteuerung."""
-    if isinstance(item, (str,)):
+    now = datetime.now()
-        return True
+    
+    # Standardmäßig aktiv, wenn kein enabled-Status gesetzt ist
     if isinstance(item, dict):
+        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)
-    return 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)
 
 
 # -------------------------------------------------
@@ -252,8 +290,9 @@ def load_priority_files():
                          "type": "url",
                          "size": "URL",
                          "zoom": url_data.get("zoom", 1.0),
-                    "enabled": playlist_item_enabled(item),
+                         "enabled": is_item_active(item),
-                    "passthrough": item.get("passthrough_params", False) if isinstance(item, dict) else False
+                         "passthrough": item.get("passthrough_params", False) if isinstance(item, dict) else False,
+                         "schedule": item.get("schedule")
                      })
                  continue
 
@@ -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)
+                            changed = len(active) != len(user.trusted_devices)
-                            for d in trusted:
+                            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)
@@ -1041,7 +1080,8 @@ def player(site, screen):
             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)
+            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),
+                        "enabled": is_item_active(item),
-                        "passthrough": item.get("passthrough_params", False) if isinstance(item, dict) else False
+                        "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})

templates/admin.html

@@ -248,9 +248,12 @@
                            title="<img src='/media/{{ current_site }}/{{ screen }}/{{ file.name }}' style='max-width: 200px; max-height: 150px; border: none; background: white; padding: 2px;' alt='Vorschau'>"
                          {% elif file.type == "url" %}
                            data-bs-toggle="tooltip"
-                          title="URL: {{ file.name }}{% if file.zoom %} (Zoom: {{ file.zoom }}x){% endif %}"
+                           title="URL: {{ file.name }}{% if file.zoom %} (Zoom: {{ file.zoom }}x){% endif %}"{% if file.schedule %}
+                           data-bs-custom-class="schedule-tooltip"
+                           data-bs-title="Zeitsteuerung: {% if file.schedule.mode == 'once' %}Einmalig: {{ file.schedule.start }} bis {{ file.schedule.end }}{% elif file.schedule.mode == 'daily' %}Täglich: {{ file.schedule.start.split('T')[1][:5] }} bis {{ file.schedule.end.split('T')[1][:5] }}{% elif file.schedule.mode == 'weekly' %}Wöchentlich: {{ file.schedule.start.split('T')[1][:5] }} bis {{ file.schedule.end.split('T')[1][:5] }} an {% for day in file.schedule.days %}{{ ['Mo','Di','Mi','Do','Fr','Sa','So'][int(day)] }}{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}"
                          {% endif %}>
                      {{ file.name }}{% if file.type == "url" and file.zoom != 1.0 %} <strong style="color: #DA002D;">[{{ file.zoom }}x]</strong>{% endif %}{% if file.type == "url" %}{% if file.get('passthrough', False) %} <i class="ti ti-link" style="color:#6c757d;" title="Query-Parameter werden übergeben"></i>{% else %} <i class="ti ti-link-off" style="color:#adb5bd;" title="Query-Parameter werden nicht übergeben"></i>{% endif %}{% endif %}
+                     {% if file.schedule %}<span class="badge bg-info text-white ms-1">Zeit</span>{% endif %}
                    </span>
 
                   <!-- Typ-Badge -->
@@ -273,7 +276,7 @@
 
                    <!-- Löschen -->
                    <form action="{{ url_for('delete_file', site=current_site, screen=screen, filename=file.name) }}"
-                        method="post">
+                         method="post" style="margin: 0; padding: 0;">
                      <button type="submit"
                              class="btn btn-outline-danger btn-sm"
                              onclick="return confirm('Datei wirklich löschen?')">
@@ -291,7 +294,8 @@
                            data-site="{{ current_site }}"
                            data-screen="{{ screen }}"
                            data-oldname="{{ file.name | e }}"
-                           data-passthrough="{{ 'true' if file.get('passthrough', False) else 'false' }}">
+                           data-passthrough="{{ 'true' if file.get('passthrough', False) else 'false' }}"
+                           data-schedule="{{ file.schedule | tojson }}">
                      Edit
                    </button>
                    {% else %}
@@ -492,6 +496,75 @@
                    <label class="form-label">Zoom Faktor (z.B. 1.0, 1.5, 2.0)</label>
                    <input type="number" name="zoom" class="form-control" step="0.1" value="1.0" min="0.1">
                  </div>
+                 
+                 <!-- Zeitsteuerung -->
+                 <div class="card mb-3">
+                   <div class="card-header">
+                     <div class="form-check">
+                       <input class="form-check-input" type="checkbox" id="schedule-enabled-{{ screen }}" name="schedule_enabled">
+                       <label class="form-check-label" for="schedule-enabled-{{ screen }}">
+                         Zeitgesteuerte Wiedergabe
+                       </label>
+                     </div>
+                   </div>
+                   <div class="card-body" id="schedule-options-{{ screen }}" style="display: none;">
+                     
+                     <div class="mb-3">
+                       <label class="form-label">Wiederholung</label>
+                       <select class="form-select" name="schedule_mode">
+                         <option value="once">Einmalig</option>
+                         <option value="daily">Täglich</option>
+                         <option value="weekly">Wöchentlich</option>
+                       </select>
+                     </div>
+                     
+                     <div class="row mb-3">
+                       <div class="col">
+                         <label class="form-label">Start</label>
+                         <input type="datetime-local" class="form-control" name="schedule_start" required>
+                       </div>
+                       <div class="col">
+                         <label class="form-label">Ende</label>
+                         <input type="datetime-local" class="form-control" name="schedule_end" required>
+                       </div>
+                     </div>
+                     
+                     <div class="mb-3" id="schedule-days-{{ screen }}" style="display: none;">
+                       <label class="form-label">Wochentage</label>
+                       <div class="d-flex gap-2">
+                         <div class="form-check">
+                           <input class="form-check-input" type="checkbox" name="schedule_days" value="0" id="mon-{{ screen }}">
+                           <label class="form-check-label" for="mon-{{ screen }}">Mo</label>
+                         </div>
+                         <div class="form-check">
+                           <input class="form-check-input" type="checkbox" name="schedule_days" value="1" id="tue-{{ screen }}">
+                           <label class="form-check-label" for="tue-{{ screen }}">Di</label>
+                         </div>
+                         <div class="form-check">
+                           <input class="form-check-input" type="checkbox" name="schedule_days" value="2" id="wed-{{ screen }}">
+                           <label class="form-check-label" for="wed-{{ screen }}">Mi</label>
+                         </div>
+                         <div class="form-check">
+                           <input class="form-check-input" type="checkbox" name="schedule_days" value="3" id="thu-{{ screen }}">
+                           <label class="form-check-label" for="thu-{{ screen }}">Do</label>
+                         </div>
+                         <div class="form-check">
+                           <input class="form-check-input" type="checkbox" name="schedule_days" value="4" id="fri-{{ screen }}">
+                           <label class="form-check-label" for="fri-{{ screen }}">Fr</label>
+                         </div>
+                         <div class="form-check">
+                           <input class="form-check-input" type="checkbox" name="schedule_days" value="5" id="sat-{{ screen }}">
+                           <label class="form-check-label" for="sat-{{ screen }}">Sa</label>
+                         </div>
+                         <div class="form-check">
+                           <input class="form-check-input" type="checkbox" name="schedule_days" value="6" id="sun-{{ screen }}">
+                           <label class="form-check-label" for="sun-{{ screen }}">So</label>
+                         </div>
+                       </div>
+                     </div>
+                   </div>
+                 </div>
+                 
                  <button class="btn btn-primary" type="submit">URL hinzufügen</button>
                </form>
             </div>
@@ -554,6 +627,37 @@ document.addEventListener("click", function (e) {
     document.getElementById("edit-url-input").value = btn.dataset.oldname;
     document.getElementById("edit-zoom-input").value = btn.dataset.zoom;
     document.getElementById("edit-passthrough-input").checked = btn.dataset.passthrough === "true";
+    
+    // Zeitsteuerung aus Daten setzen
+    const schedule = JSON.parse(btn.dataset.schedule || 'null');
+    const enabledEl = document.getElementById("edit-schedule-enabled");
+    const optionsEl = document.getElementById("edit-schedule-options");
+    
+    if (schedule) {
+      enabledEl.checked = true;
+      optionsEl.style.display = "";
+      document.getElementById("edit-schedule-mode").value = schedule.mode || "once";
+      document.getElementById("edit-schedule-start").value = schedule.start || "";
+      document.getElementById("edit-schedule-end").value = schedule.end || "";
+      
+      // Wochentage setzen
+      const days = schedule.days || [];
+      document.getElementById("edit-mon").checked = days.includes("0");
+      document.getElementById("edit-tue").checked = days.includes("1");
+      document.getElementById("edit-wed").checked = days.includes("2");
+      document.getElementById("edit-thu").checked = days.includes("3");
+      document.getElementById("edit-fri").checked = days.includes("4");
+      document.getElementById("edit-sat").checked = days.includes("5");
+      document.getElementById("edit-sun").checked = days.includes("6");
+      
+      // Wochentage-Anzeige entsprechend Modus aktualisieren
+      updateScheduleDaysVisibility();
+    } else {
+      enabledEl.checked = false;
+      optionsEl.style.display = "none";
+      updateScheduleDaysVisibility();
+    }
+    
     document.getElementById("edit-url-error").style.display = "none";
     new bootstrap.Modal(document.getElementById("edit-url-modal")).show();
   });
@@ -611,6 +715,25 @@ document.addEventListener("DOMContentLoaded", function () {
     return new bootstrap.Tooltip(tooltipTriggerEl);
   });
   
+  /* ─── Zeitsteuerung: Anzeige der Wochentage entsprechend Modus ─── */
+  function updateScheduleDaysVisibility() {
+    const mode = document.getElementById("edit-schedule-mode").value;
+    const daysEl = document.getElementById("edit-schedule-days");
+    daysEl.style.display = mode === "weekly" ? "" : "none";
+  }
+  
+  /* ─── Zeitsteuerung: Änderungs-Events verarbeiten ─── */
+  document.getElementById("edit-schedule-enabled").addEventListener("change", function() {
+    document.getElementById("edit-schedule-options").style.display = this.checked ? "" : "none";
+  });
+  
+  document.getElementById("edit-schedule-mode").addEventListener("change", function() {
+    updateScheduleDaysVisibility();
+  });
+  
+  // Initiale Anzeige
+  updateScheduleDaysVisibility();
+
   /* ─── Edit-URL-Modal: Speichern-Button ─── */
   document.getElementById("edit-url-save").addEventListener("click", function () {
     const newUrl = document.getElementById("edit-url-input").value.trim();
@@ -625,6 +748,40 @@ document.addEventListener("DOMContentLoaded", function () {
 
     errorEl.style.display = "none";
 
+    // Zeitsteuerung sammeln
+    const scheduleEnabled = document.getElementById("edit-schedule-enabled").checked;
+    let schedule = null;
+    
+    if (scheduleEnabled) {
+      const mode = document.getElementById("edit-schedule-mode").value;
+      const start = document.getElementById("edit-schedule-start").value;
+      const end = document.getElementById("edit-schedule-end").value;
+      
+      if (!start || !end) {
+        errorEl.textContent = "Start- und Endzeit müssen angegeben werden";
+        errorEl.style.display = "block";
+        return;
+      }
+      
+      schedule = {
+        mode: mode,
+        start: start,
+        end: end
+      };
+      
+      if (mode === "weekly") {
+        const days = [];
+        if (document.getElementById("edit-mon").checked) days.push("0");
+        if (document.getElementById("edit-tue").checked) days.push("1");
+        if (document.getElementById("edit-wed").checked) days.push("2");
+        if (document.getElementById("edit-thu").checked) days.push("3");
+        if (document.getElementById("edit-fri").checked) days.push("4");
+        if (document.getElementById("edit-sat").checked) days.push("5");
+        if (document.getElementById("edit-sun").checked) days.push("6");
+        schedule.days = days;
+      }
+    }
+
     fetch("/admin/" + editState.site + "/update-playlist-item/" + editState.screen, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
@@ -632,7 +789,8 @@ document.addEventListener("DOMContentLoaded", function () {
         old_name: editState.oldName,
         new_url: newUrl,
         zoom: zoom,
-        passthrough: document.getElementById("edit-passthrough-input").checked
+        passthrough: document.getElementById("edit-passthrough-input").checked,
+        schedule: schedule
       })
     }).then(function (r) {
       if (r.ok) {
@@ -673,6 +831,75 @@ document.addEventListener("DOMContentLoaded", function () {
           <input type="checkbox" class="form-check-input" id="edit-passthrough-input">
           <label class="form-check-label" for="edit-passthrough-input">Query-Parameter an diese URL übergeben</label>
         </div>
+        
+        <!-- Zeitsteuerung -->
+        <div class="card">
+          <div class="card-header">
+            <div class="form-check">
+              <input class="form-check-input" type="checkbox" id="edit-schedule-enabled">
+              <label class="form-check-label" for="edit-schedule-enabled">
+                Zeitgesteuerte Wiedergabe
+              </label>
+            </div>
+          </div>
+          <div class="card-body" id="edit-schedule-options" style="display: none;">
+            
+            <div class="mb-3">
+              <label class="form-label">Wiederholung</label>
+              <select class="form-select" id="edit-schedule-mode">
+                <option value="once">Einmalig</option>
+                <option value="daily">Täglich</option>
+                <option value="weekly">Wöchentlich</option>
+              </select>
+            </div>
+            
+            <div class="row mb-3">
+              <div class="col">
+                <label class="form-label">Start</label>
+                <input type="datetime-local" class="form-control" id="edit-schedule-start">
+              </div>
+              <div class="col">
+                <label class="form-label">Ende</label>
+                <input type="datetime-local" class="form-control" id="edit-schedule-end">
+              </div>
+            </div>
+            
+            <div class="mb-3" id="edit-schedule-days" style="display: none;">
+              <label class="form-label">Wochentage</label>
+              <div class="d-flex gap-2">
+                <div class="form-check">
+                  <input class="form-check-input" type="checkbox" value="0" id="edit-mon">
+                  <label class="form-check-label" for="edit-mon">Mo</label>
+                </div>
+                <div class="form-check">
+                  <input class="form-check-input" type="checkbox" value="1" id="edit-tue">
+                  <label class="form-check-label" for="edit-tue">Di</label>
+                </div>
+                <div class="form-check">
+                  <input class="form-check-input" type="checkbox" value="2" id="edit-wed">
+                  <label class="form-check-label" for="edit-wed">Mi</label>
+                </div>
+                <div class="form-check">
+                  <input class="form-check-input" type="checkbox" value="3" id="edit-thu">
+                  <label class="form-check-label" for="edit-thu">Do</label>
+                </div>
+                <div class="form-check">
+                  <input class="form-check-input" type="checkbox" value="4" id="edit-fri">
+                  <label class="form-check-label" for="edit-fri">Fr</label>
+                </div>
+                <div class="form-check">
+                  <input class="form-check-input" type="checkbox" value="5" id="edit-sat">
+                  <label class="form-check-label" for="edit-sat">Sa</label>
+                </div>
+                <div class="form-check">
+                  <input class="form-check-input" type="checkbox" value="6" id="edit-sun">
+                  <label class="form-check-label" for="edit-sun">So</label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        
         <div class="alert alert-danger py-2" id="edit-url-error" style="display:none"></div>
       </div>
       <div class="modal-footer">