Version 2.0.0

2026-04-22 20:26:00 +02:00
parent 6faf207246
commit 5ac9dee8fc
10 changed files with 398 additions and 119 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/README.md
+++ b/README.md
--- a/app.py
+++ b/app.py
@@ -23,11 +23,11 @@ BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 MEDIA_DIR = os.path.join(BASE_DIR, "media")
 CONFIG_FILE = os.path.join(BASE_DIR, "config.json")

-APP_VERSION = "2.0.0"
+APP_VERSION = "2.1.0"
 UPLOAD_EXTENSIONS = {".jpg", ".jpeg", ".png", ".mp4"}

 app = Flask(__name__)
-app.secret_key = "CHANGE_THIS_SECRET"
+app.secret_key = "CHANGE_THIS_SECRET!!!"

 login_manager = LoginManager(app)
 login_manager.login_view = "login"
@@ -91,6 +91,7 @@ def media(screen, filename):
 # -------------------------------------------------
 # Player
 # -------------------------------------------------
+
@app.route("/player/<screen>")
 def player(screen):
    config = load_config()
@@ -116,81 +117,109 @@ def player(screen):
            return show_videos
        return False

-    ordered = []
+    # ------------------------------
+    # Normale Screen-Playlist
+    # ------------------------------
+    normal_files = []

    # 1. Playlist-Reihenfolge
    for name in playlist:
        if os.path.exists(os.path.join(folder, name)) and allowed_file(name):
-            ordered.append(name)
+            normal_files.append(name)

    # 2. Neue Dateien hintendran
    for f in sorted(os.listdir(folder)):
-        if f not in ordered and allowed_file(f):
-            ordered.append(f)
+        if f not in normal_files and allowed_file(f):
+            normal_files.append(f)
+
+    # ------------------------------
+    # Priority-Playlist (global)
+    # WICHTIG: IMMER definieren!
+    # ------------------------------
+    priority_cfg = config.get("priority", {})
+
+    if priority_cfg.get("enabled", False):
+        prio_files = priority_cfg.get("playlist", [])
+    else:
+        prio_files = []

    return render_template(
        "player.html",
        screen=screen,
-        files=ordered,
+        normal_files=normal_files,  # ✅ explizit
+        prio_files=prio_files,      # ✅ IMMER Liste
        interval=screen_cfg.get("interval", 10)
    )

+
 # -------------------------------------------------
 # Hash für automatisches Player-Reload
 # -------------------------------------------------
@app.route("/playlist/<screen>/hash")
 def playlist_hash(screen):
-    screen_dir = os.path.join(MEDIA_DIR, screen)
-    if not os.path.isdir(screen_dir):
-        return ""
+    config = load_config()

-    entries = []
-    for f in os.listdir(screen_dir):
-        if f.startswith("._"):
-            continue
-        p = os.path.join(screen_dir, f)
-        try:
-            entries.append(f"{f}:{int(os.path.getmtime(p))}")
-        except OSError:
-            pass
+    # ✅ Globaler Hash über ALLE relevanten Daten
+    relevant = {
+        "screens": {
+            screen: config["screens"].get(screen, {})
+        },
+        "priority": config.get("priority", {})
+    }
+
+    blob = json.dumps(relevant, sort_keys=True).encode()
+    return hashlib.md5(blob).hexdigest()

-    h = hashlib.md5("|".join(sorted(entries)).encode()).hexdigest()
-    return h

 # -------------------------------------------------
 # Admin Dashboard
 # -------------------------------------------------
+
@app.route("/admin")
@login_required
 def admin():
-    config = load_config()
-    screens_cfg = config.setdefault("screens", {})
+    cfg = load_config()

    screens = {}
    media_files = {}
    screen_status = {}

-    for screen in sorted(os.listdir(MEDIA_DIR)):
-        screen_dir = os.path.join(MEDIA_DIR, screen)
-        if not os.path.isdir(screen_dir):
+    for screen in os.listdir(MEDIA_DIR):
+        if screen == "priority":
+            continue   # ✅ kein echter Screen
+
+        path = os.path.join(MEDIA_DIR, screen)
+        if not os.path.isdir(path):
            continue

-        screens_cfg.setdefault(screen, {
-            "interval": 10,
-            "show_images": True,
-            "show_videos": True,
-            "playlist": []
-        })
-
-        screens[screen] = screens_cfg[screen]
-
        files = []
-        for f in sorted(os.listdir(screen_dir)):
-            if f.startswith("._"):
+        playlist = cfg["screens"][screen].get("playlist", [])
+
+        # 1️⃣ Playlist-Reihenfolge
+        for name in playlist:
+            file_path = os.path.join(path, name)
+            if not os.path.exists(file_path):
                continue
+
+            ext = os.path.splitext(name)[1].lower()
+            ftype = "video" if ext == ".mp4" else "image"
+            size = os.path.getsize(file_path) // 1024
+
+            files.append({
+                "name": name,
+                "type": ftype,
+                "size": size
+            })
+
+        # 2️⃣ Neue Dateien anhängen (nicht in Playlist)
+        for f in sorted(os.listdir(path)):
+            if f in playlist or f.startswith("._"):
+                continue
+
+            file_path = os.path.join(path, f)
            ext = os.path.splitext(f)[1].lower()
            ftype = "video" if ext == ".mp4" else "image"
-            size = os.path.getsize(os.path.join(screen_dir, f)) // 1024
+            size = os.path.getsize(file_path) // 1024

            files.append({
                "name": f,
@@ -198,21 +227,63 @@ def admin():
                "size": size
            })

+        screens[screen] = cfg["screens"][screen]
        media_files[screen] = files
        screen_status[screen] = "active" if files else "empty"

-    save_config(config)
+    
+    # --- PRIORITY EXTENSION: Admin ---
+    prio_dir = os.path.join(MEDIA_DIR, "priority")
+    os.makedirs(prio_dir, exist_ok=True)

+    priority_files = []
+    prio_playlist = cfg["priority"].get("playlist", [])
+
+    # 1️⃣ Playlist-Reihenfolge
+    for name in prio_playlist:
+        file_path = os.path.join(MEDIA_DIR, "priority")
+        if not os.path.exists(file_path):
+            continue
+
+        ext = os.path.splitext(name)[1].lower()
+        ftype = "video" if ext == ".mp4" else "image"
+        size = os.path.getsize(file_path) // 1024
+
+        priority_files.append({
+            "name": name,
+            "type": ftype,
+            "size": size
+        })
+
+    # 2️⃣ Neue Dateien anhängen (nicht in Playlist)
+    for f in sorted(os.listdir(prio_dir)):
+        if f in prio_playlist or f.startswith("._"):
+            continue
+
+        file_path = os.path.join(prio_dir, f)
+        ext = os.path.splitext(f)[1].lower()
+        ftype = "video" if ext == ".mp4" else "image"
+        size = os.path.getsize(file_path) // 1024
+
+        priority_files.append({
+            "name": f,
+            "type": ftype,
+            "size": size
+            })
+
+     
    return render_template(
        "admin.html",
        screens=screens,
        media_files=media_files,
        screen_status=screen_status,
-        hostname=socket.gethostname(),
        version=APP_VERSION,
-        year=datetime.now().year
+        year=datetime.now().year,
+        hostname=os.uname().nodename,
+        priority_files=priority_files
    )

+
 # -------------------------------------------------
 # Admin: Screen-Einstellungen speichern
 # -------------------------------------------------
@@ -251,29 +322,50 @@ def upload(screen):
 # -------------------------------------------------
 # Admin: Datei löschen
 # -------------------------------------------------
+
@app.route("/admin/delete/<screen>/<filename>", methods=["POST"])
@login_required
 def delete_file(screen, filename):
+    cfg = load_config()
+
+    # Datei löschen
    path = os.path.join(MEDIA_DIR, screen, filename)
    if os.path.exists(path):
        os.remove(path)
+
+    # --- Playlist bereinigen ---
+    if screen == "priority":
+        playlist = cfg.get("priority", {}).get("playlist", [])
+        if filename in playlist:
+            playlist.remove(filename)
+    else:
+        playlist = cfg["screens"].get(screen, {}).get("playlist", [])
+        if filename in playlist:
+            playlist.remove(filename)
+
+    save_config(cfg)
    return redirect("/admin")

+
 # -------------------------------------------------
 # Admin: Playlist speichern
 # -------------------------------------------------
+
@app.route("/admin/playlist/<screen>", methods=["POST"])
@login_required
-def update_playlist(screen):
-    config = load_config()
-    cfg = config["screens"][screen]
-
+def save_playlist(screen):
+    cfg = load_config()
    data = request.get_json()
-    cfg["playlist"] = data.get("playlist", [])

-    save_config(config)
+    if screen == "priority":
+        cfg["priority"]["playlist"] = data["playlist"]
+    else:
+        cfg["screens"][screen]["playlist"] = data["playlist"]
+
+    save_config(cfg)
    return "", 204

+
 # -------------------------------------------------
 # Main
 # -------------------------------------------------
--- a/config.json
+++ b/config.json
@@ -1,11 +1,18 @@
 {
+  "priority": {
+    "enabled": true,
+    "playlist": []
+  },
  "screens": {
    "lobby": {
      "interval": 10,
      "show_images": true,
      "show_videos": true,
      "playlist": [
-        "QRCode.png"
+        "HilfeKI.jpg",
+        "QRCode.png",
+        "Will_AI_Replace_Developers_1.jpg",
+        "Video CANCOM Jahresr\u00fcckblick 2025.MP4"
      ]
    },
    "casino": {
@@ -13,20 +20,12 @@
      "show_images": true,
      "show_videos": true,
      "playlist": [
-        "HilfeKI.jpg",
-        "IMG_6730.jpeg",
        "JET-Design.JPG"
      ]
-    },
-    "Erik": {
-      "interval": 10,
-      "show_images": true,
-      "show_videos": true,
-      "playlist": []
    }
  },
  "admin": {
    "username": "admin",
-    "password": "wooper-01"
+    "password": "cancom@2026!"
  }
 }
--- a/requirements.txt
+++ b/requirements.txt
--- a/static/cancom.svg
+++ b/static/cancom.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<!-- Created with xTool Creative Space (https://www.xtool.com/pages/software) -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xcs="https://www.xtool.com/pages/software" version="1.1" preserveAspectRatio="xMinYMin meet" width="61.682394106284505mm" height="9.909010347638684mm" viewBox="136.55880294685778 209.2954948261807 61.682394106284505 9.909010347638684" xcs:version="2.7.22"><style></style>
+<path transform="matrix(0.158038,0,0,0.158038,133.2558,163.322122)" stroke="none" fill="#ffffff" data-view-type="laser" d="M125.9,352.1h18.9L119,291.7h-16.2l-25,60.4h18.2l14.6-38.9L125.9,352.1z M323.6,322     c0,8.8-6.1,16.4-15.4,16.4c-9.1,0-15.4-7.6-15.4-16.4s6.1-16.4,15.2-16.4C317,305.6,323.6,313.4,323.6,322 M340.5,322.3     c0-17.4-13.4-31.3-32.3-31.3c-18.7,0-32.3,14.1-32.3,31.3c0,17.4,13.4,31.3,32.3,31.3C326.9,353.6,340.5,339.4,340.5,322.3      M230.4,322.5c0-8.8,6.1-16.4,14.9-16.4c3,0,5.8,0.8,8.1,2l6.6-13.4c-3-2-8.1-3.8-14.9-3.8c-18.2,0-31.6,14.1-31.6,31.3     c0,18.2,12.6,31.1,31.6,31.1c17.2,0,26-10.6,28.8-21l-13.6-5.6c-1.8,5.8-6.3,11.6-14.4,11.6C236.5,338.4,230.4,331.4,230.4,322.5      M38,322.5c0-8.8,6.1-16.4,14.9-16.4c3,0,5.8,0.8,8.1,2l6.6-13.4c-3-2-8.1-3.8-14.9-3.8c-18.4,0-31.8,14.1-31.8,31.3     c0,18.2,12.6,31.1,31.6,31.1c17.2,0,26-10.6,28.8-21l-13.6-5.6c-1.8,5.8-6.3,11.6-14.4,11.6C44,338.4,38,331.4,38,322.5      M191.8,352.1h14.4v-59.8H190v33.1l-25-33.1h-15.4v60.1h16.2v-34.1L191.8,352.1z M411.2,352.1v-59.8h-17.7l-14.4,23.2l-14.4-23.2     h-17.7v60.1h16.4V318l15.4,23.2h0.3l15.4-23.5v34.6L411.2,352.1L411.2,352.1z" fill-rule="nonzero"></path></svg>
--- a/static/favicon.ico
+++ b/static/favicon.ico
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -3,6 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>CANCOM Simple Signage Admin</title>
+<link rel="icon" href="{{ url_for('static', filename='favicon.ico') }}">

 <!-- Tabler CSS -->
 <link rel="stylesheet"
@@ -34,7 +35,7 @@

  /* CANCOM CI – Variante 1 */
  .card-header {
-    background-color: #ffffff;
+    background-color: #eeeeee;
    border-left: 6px solid #DA002D;
    padding-left: 1rem;
    font-weight: 600;
@@ -101,9 +102,24 @@
  <!-- Header -->
  <header class="navbar navbar-expand-md">
    <div class="container-xl">
-      <span class="navbar-brand">CANCOM Simple Signage Admin</span>
-      <div class="navbar-nav ms-auto">
-        <a href="/logout" class="nav-link text-white">Logout</a>
+      
+  <a class="navbar-brand d-flex align-items-center"
+     href="/admin">
+
+    <img src="{{ url_for('static', filename='cancom.svg') }}"
+        alt="CANCOM"
+        height="32"
+        class="me-2">
+
+    <!--<span class="text-white fw-semibold">-->
+      <span class="page-pretitle text-white">
+      Admin Dashboard
+      <h2 class="page-title text-white">Simple Signage</h2>
+    </span>
+  </a>s
+
+      <div class="d-none d-sm-inline">
+        <a href="/logout" class="btn">Logout</a>
      </div>
    </div>
  </header>
@@ -112,6 +128,88 @@
  <div class="page-wrapper">
    <div class="container-xl mt-4">

+  <!-- ========================= -->
+  <!-- PRIORITY / GLOBAL PLAYLIST -->
+  <!-- ========================= -->
+  <div class="card mb-4 border border-danger">
+    <div class="card-header d-flex justify-content-between align-items-center"
+         style="background:#fff5f5;">
+      <div>
+        <strong style="color:#DA002D;">
+          ⚠ PRIORITY (global)
+        </strong>
+      </div>
+      <span class="badge bg-success">wirkt auf alle Player</span>
+    </div>
+
+    <div class="card-body">
+      <p class="text-muted">
+        Inhalte dieser Playlist werden <strong>auf allen Playern</strong>
+        zusätzlich zur normalen Playlist angezeigt.
+        <br>
+        Die Wiedergabe erfolgt <strong>abwechselnd</strong>
+        (Normal → Priority → Normal → …).
+      </p>
+
+      <!-- Upload -->
+       <h4>Medien hochladen</h4>
+          <form action="/admin/upload/priority"
+                method="post" enctype="multipart/form-data">
+            <div class="input-group mb-3">
+              <input type="file" name="file" class="form-control" required>
+              <button class="btn btn-primary" type="submit">Upload</button>
+            </div>
+          </form>
+
+      <!-- Playlist -->
+        <h4>Playlist Reihenfolge</h4>
+
+        <ul class="list-group mb-3" id="playlist-priority">
+            {% for file in priority_files %}
+            <li class="list-group-item playlist-row"
+                data-file="{{ file.name }}">
+
+              <span class="playlist-name">{{ file.name }}</span>
+
+              {% if file.type == "image" %}
+                <span class="badge bg-blue-lt">Bild</span>
+              {% else %}
+                <span class="badge bg-orange-lt">Video</span>
+              {% endif %}
+
+              <span class="playlist-size">{{ file.size }} KB</span>
+
+              <!-- Delete -->
+              
+              <form action="{{url_for('delete_file',
+                              screen='priority',
+                              filename=file.name) }}"
+                  method="post"
+                  class="d-inline"
+                  onmousedown="event.stopPropagation()">
+                <button type="submit"
+                        class="btn btn-outline-danger btn-sm"
+                        onclick="return confirm('Datei wirklich löschen?')">
+                  Löschen
+                </button>
+              </form>
+
+
+              <!-- Drag -->
+              <span class="drag-handle" title="Reihenfolge ändern">⇅</span>
+            </li>
+            {% endfor %}
+          </ul>
+
+          <button class="btn btn-primary"
+                  onclick="savePlaylist('priority')">
+            Priority-Reihenfolge speichern
+          </button>
+
+        </div>
+      </div>
+
+
      {% for screen, cfg in screens.items() %}
      <div class="card mb-4">

@@ -157,7 +255,7 @@
          <hr>

          <!-- Upload -->
-          <h5>Medien hochladen</h5>
+          <h4>Medien hochladen</h4>
          <form action="/admin/upload/{{ screen }}"
                method="post" enctype="multipart/form-data">
            <div class="input-group mb-3">
@@ -167,7 +265,7 @@
          </form>

          <!-- Playlist -->
-          <h5>Playlist Reihenfolge</h5>
+          <h4>Playlist Reihenfolge</h4>

          <ul class="list-group mb-3" id="playlist-{{ screen }}">
            {% for file in media_files[screen] %}
@@ -215,7 +313,7 @@
  <!-- Footer -->
  <footer class="footer footer-transparent mt-4">
    <div class="container-xl text-muted">
-      © {{ year }} CANCOM · Version {{ version }} · {{ hostname }}
+      © {{ year }} CANCOM GmbH · Version {{ version }} · {{ hostname }}
    </div>
  </footer>

@@ -224,8 +322,8 @@
 <script>
 document.addEventListener("DOMContentLoaded", function () {

-  function initSortable(screen) {
-    const el = document.getElementById("playlist-" + screen);
+  function initSortable(name) {
+    const el = document.getElementById("playlist-" + name);
    if (!el || typeof Sortable === "undefined") return;

    new Sortable(el, {
@@ -236,6 +334,16 @@ document.addEventListener("DOMContentLoaded", function () {
    });
  }

+  // ✅ Normale Screens
+  {% for screen in screens.keys() %}
+    initSortable("{{ screen }}");
+  {% endfor %}
+
+  // ✅ Priority explizit
+  initSortable("priority");
+
+
+
  function savePlaylist(screen) {
    const items = document.querySelectorAll(
      "#playlist-" + screen + " li"
--- a/templates/login.html
+++ b/templates/login.html
--- a/templates/player.html
+++ b/templates/player.html
@@ -1,82 +1,158 @@
 <!doctype html>
 <html lang="de">
 <head>
-<meta charset="utf-8">
-<title>CANCOM Simple Signage Player</title>
+  <meta charset="utf-8">
+  <title>CANCOM Simple Signage Player</title>
+  <link rel="icon" href="{{ url_for('static', filename='favicon.ico') }}">

-<style>
-html, body {
-  margin: 0;
-  padding: 0;
-  background: black;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-}
+  <style>
+    html, body {
+      margin: 0;
+      padding: 0;
+      width: 100%;
+      height: 100%;
+      background: black;
+      overflow: hidden;
+    }

-#image, #video {
-  position: fixed;
-  inset: 0;
-  width: 100vw;
-  height: 100vh;
-  object-fit: contain;
-  background: black;
-}
-</style>
+    img, video {
+      width: 100vw;
+      height: 100vh;
+      object-fit: contain;
+      background: black;
+      display: none;
+    }
+  </style>
 </head>

 <body>

-<img id="image" hidden>
-<video id="video" hidden muted autoplay playsinline></video>
+<img id="image">
+<video id="video" muted autoplay playsinline></video>

 <script>
-const files = {{ files | tojson }};
-const interval = {{ interval }} * 1000;
-const screen = "{{ screen }}";
+/* -----------------------------
+   Daten vom Server
+----------------------------- */
+const normalFiles = {{ normal_files | tojson }};
+const prioFiles   = {{ prio_files   | tojson }};
+const interval    = {{ interval }} * 1000;
+const screen      = "{{ screen }}";
+
+/* -----------------------------
+   Player State
+----------------------------- */
+let normalIndex = 0;
+let prioIndex   = 0;
+let playPrioNext = false;
+let mode = "normal"; // "normal" oder "prio"

-let index = 0;
-let lastHash = null;

 const img = document.getElementById("image");
-const video = document.getElementById("video");
+const vid = document.getElementById("video");

-function isVideo(name) {
-  return name.toLowerCase().endsWith(".mp4");
+/* -----------------------------
+   Hilfsfunktionen
+----------------------------- */
+function isVideo(file) {
+  return file.toLowerCase().endsWith(".mp4");
 }

-function showNext() {
-  if (files.length === 0) return;

-  const file = files[index];
-  index = (index + 1) % files.length;
+function getNextItem() {

-  if (isVideo(file)) {
-    img.hidden = true;
-    video.hidden = false;
-    video.src = `/media/${screen}/${file}`;
-    video.load();
-    video.play();
+  // ✅ Sonderfall: nur Priority vorhanden
+  if (normalFiles.length === 0 && prioFiles.length > 0) {
+    return {
+      file: prioFiles[prioIndex++ % prioFiles.length],
+      isPrio: true
+    };
+  }
+
+  // ✅ Sonderfall: nur normale Playlist vorhanden
+  if (prioFiles.length === 0 && normalFiles.length > 0) {
+    return {
+      file: normalFiles[normalIndex++ % normalFiles.length],
+      isPrio: false
+    };
+  }
+
+  // ✅ Normal-Phase
+  if (mode === "normal") {
+    const file = normalFiles[normalIndex++];
+    if (normalIndex >= normalFiles.length) {
+      normalIndex = 0;
+      if (prioFiles.length > 0) {
+        mode = "prio"; // ➜ nach kompletter Normal-Playlist wechseln
+      }
+    }
+    return { file, isPrio: false };
+  }
+
+  // ✅ Priority-Phase
+  if (mode === "prio") {
+    const file = prioFiles[prioIndex++];
+    if (prioIndex >= prioFiles.length) {
+      prioIndex = 0;
+      mode = "normal"; // ➜ nach kompletter Priority zurück
+    }
+    return { file, isPrio: true };
+  }
+
+  return null;
+}
+
+
+
+/* -----------------------------
+   Medien abspielen
+----------------------------- */
+function playNext() {
+  const item = getNextItem();
+  if (!item) return;
+
+  const basePath = item.isPrio ? "priority" : screen;
+  const src = `/media/${basePath}/${item.file}`;
+
+  if (isVideo(item.file)) {
+    img.style.display = "none";
+    vid.style.display = "block";
+    vid.src = src;
+    vid.onended = playNext;
+    vid.play();
  } else {
-    video.pause();
-    video.hidden = true;
-    img.hidden = false;
-    img.src = `/media/${screen}/${file}`;
-    setTimeout(showNext, interval);
+    vid.pause();
+    vid.style.display = "none";
+    img.style.display = "block";
+    img.src = src;
+    setTimeout(playNext, interval);
  }
 }

-video.addEventListener("ended", showNext);
+/* -----------------------------
+   Auto-Reload bei Änderungen
+----------------------------- */
+let lastHash = null;

-async function checkForUpdate() {
-  const r = await fetch(`/playlist/${screen}/hash`, { cache: "no-store" });
-  const hash = await r.text();
-  if (lastHash && hash !== lastHash) location.reload();
-  lastHash = hash;
+async function checkForUpdates() {
+  try {
+    const res = await fetch(`/playlist/${screen}/hash`, { cache: "no-store" });
+    const hash = await res.text();
+
+    if (lastHash && lastHash !== hash) {
+      location.reload();
+    }
+    lastHash = hash;
+  } catch (e) {
+    console.warn("Playlist-Check fehlgeschlagen", e);
+  }
 }

-setInterval(checkForUpdate, 5000);
-showNext();
+/* -----------------------------
+   Start
+----------------------------- */
+playNext();
+setInterval(checkForUpdates, 5000);
 </script>

 </body>