diff --git a/.DS_Store b/.DS_Store
index c865d6f..b1f9290 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/app.py b/app.py
index ddeb534..cb2953e 100755
--- a/app.py
+++ b/app.py
@@ -7,7 +7,7 @@ import generate_welcome_page
from datetime import datetime
from flask import (
- Flask, render_template,
+ Flask, jsonify, render_template,
send_from_directory, redirect,
request, abort
)
@@ -26,7 +26,7 @@ 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 = "4.0.2"
+APP_VERSION = "4.0.4"
UPLOAD_EXTENSIONS = {".jpg", ".jpeg", ".png", ".mp4"}
app = Flask(__name__)
@@ -117,7 +117,7 @@ def add_customer():
if request.method == "POST":
customer_name = request.form.get("customer_name", "").strip()
-
+ print(f"🔍 APP.PY - Suche nach Kunde: '{customer_name}'")
if not customer_name:
error = "Kundenname erforderlich"
else:
diff --git a/config.json b/config.json
index 9648a9a..2b475df 100755
--- a/config.json
+++ b/config.json
@@ -34,7 +34,6 @@
"url": "https://www.meteoblue.com/en/meteotv/d7b0fd",
"zoom": 1.0
},
- "Video_CANCOM_Jahresruckblick_2025.MP4",
"Video_CANCOM_LIVE_2025_Stuttgart.MP4"
],
"newsticker_text": "Herzlich willkommen bei der CANCOM - wir w\u00fcnschen ihnen einen sch\u00f6nen Tag",
diff --git a/docker-compose.yml b/docker-compose.yml
index 3d42083..13a8545 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "3.9"
services:
signage:
diff --git a/generate_welcome_page.py b/generate_welcome_page.py
index d392fef..78f03bf 100644
--- a/generate_welcome_page.py
+++ b/generate_welcome_page.py
@@ -5,6 +5,7 @@ from openai import OpenAI
# -------------------------------------------------
# Customer / Willkommensseite
# -------------------------------------------------
+
WELCOME_DIR = os.path.join(os.path.dirname(__file__), "media", "lobby")
os.makedirs(WELCOME_DIR, exist_ok=True)
@@ -13,25 +14,27 @@ WELCOME_FILENAME = "welcome.html"
def get_openai_client():
"""Initialize OpenAI client from environment variable"""
- api_key = os.getenv("OPENAI_API_KEY")
+ # api_key = os.getenv("OPENAI_API_KEY")
+ api_key = "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"
if not api_key:
raise ValueError("OPENAI_API_KEY environment variable not set")
return OpenAI(api_key=api_key)
def get_brandfetch_logo(domain):
"""Try to fetch a logo URL from Brandfetch CDN."""
- print(f"🔍 Versuche Brandfetch für Domain: {domain}")
+ print(f"🔍 Generate - Versuche Brandfetch für Domain: {domain}")
# Direct CDN URL construction - Brandfetch provides logos via cdn.brandfetch.io
logo_url = f"https://cdn.brandfetch.io/{domain}?c=1idyd4Tpb2nKaXIIc8T"
# if validate_logo_url(logo_url):
- print(f"✅ Brandfetch Logo gefunden: {logo_url}")
+ print(f"✅ Generate - Brandfetch Logo gefunden: {logo_url}")
return logo_url
# return None
def search_customer_logo(customer_name):
+ print(f"✅ Generate - Suche nach Kundenlogo für: {customer_name}")
"""Search for customer logo URL using OpenAI and web search"""
try:
client = get_openai_client()
@@ -71,6 +74,7 @@ def search_customer_logo(customer_name):
def generate_welcome_html(customer_name, logo_url):
+ print(f"✅ Generate - Willkommensseite wird generiert für: {customer_name} mit Logo: {logo_url}")
"""Generate a welcome page HTML with full-screen design"""
# CANCOM SVG logo inline
cancom_svg = ''''''
@@ -209,9 +213,9 @@ def save_welcome_page(customer_name, logo_url):
f.write(html_content)
if os.path.getsize(filepath) == 0:
raise IOError("File not written")
- print(f"✅ Willkommensseite generiert für: {customer_name}")
- print(f"✅ Willkommensseite gespeichert in: {filepath}")
- print(f"✅ Willkommensseite gespeichert: {WELCOME_FILENAME}")
+ print(f"✅ Generate - Willkommensseite generiert für: {customer_name}")
+ print(f"✅ Generate - Willkommensseite gespeichert in: {filepath}")
+ print(f"✅ Generate - Willkommensseite gespeichert: {WELCOME_FILENAME}")
return WELCOME_FILENAME
except Exception as e:
print(f"❌ Error saving welcome page: {e}")
@@ -234,8 +238,8 @@ def add_customer_to_lobby_playlist(html_filename):
playlist.remove(full_filename)
playlist.insert(0, full_filename)
save_config(config)
- print(f"✅ Willkommensseite in Lobby-Playliste platziert")
+ print(f"✅ Generate - Willkommensseite in Lobby-Playliste platziert")
return True
except Exception as e:
- print(f"❌ Error adding to playlist: {e}")
+ print(f"❌ Generate - Error adding to playlist: {e}")
return False
\ No newline at end of file
diff --git a/templates/admin.html b/templates/admin.html
index c7f10e1..a3d33b3 100755
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -168,7 +168,7 @@
- Medien hochladen
+ Medien hochladen - ⚠ PRIORITY Playlist