Merge pull request #58 from TimUx/copilot/remove-diagnostics-and-text-warnings

Remove additional diagnostic procedures and relocate hint texts

Author: TimUx

app.py

@@ -150,10 +150,6 @@ def send_notification(title: str, message: str, action_type: str = "info", extra
     if not NOTIFY_ENABLED:
         return
 
-    # Debug logging
-    logger.info(f"send_notification called: title='{title}', action_type='{action_type}'")
-    logger.info(f"  NOTIFY_NTFY_ENABLED={NOTIFY_NTFY_ENABLED}, NOTIFY_NTFY_TOPIC='{NOTIFY_NTFY_TOPIC}'")
-    
     timestamp = dt_datetime.now().isoformat()
     payload = {
         "title": title,
@@ -196,9 +192,6 @@ def send_notification(title: str, message: str, action_type: str = "info", extra
             if NOTIFY_NTFY_TOKEN:
                 headers["Authorization"] = f"Bearer {NOTIFY_NTFY_TOKEN}"
 
-            # Debug logging
-            logger.info(f"Sending to ntfy.sh: URL={url}, topic='{NOTIFY_NTFY_TOPIC}', title='{title}'")
-            
             # Send as JSON with proper UTF-8 encoding
             response = requests.post(
                 url, 
@@ -207,10 +200,7 @@ def send_notification(title: str, message: str, action_type: str = "info", extra
                 timeout=5
             )
 
-            # Log response for debugging
-            if response.status_code == 200:
-                logger.info(f"ntfy.sh notification sent successfully to {url}")
-            else:
+            if response.status_code != 200:
                 logger.error(f"ntfy.sh notification failed: HTTP {response.status_code} - {response.text}")
         except requests.exceptions.Timeout:
             logger.error(f"Failed to send ntfy notification: Timeout after 5 seconds")
@@ -1014,7 +1004,6 @@ def api_requests():
                 state["current_request"] = entry
         except requests.RequestException as exc:
             return jsonify({"ok": False, "message": str(exc)}), 502
-    mark_note(f"Wunsch '{title}' wurde hinzugefügt. Position {position}.")
 
     return jsonify({"ok": True, "position": position, "message": f"Wunsch '{title}' wurde hinzugefügt."})
 
@@ -1025,19 +1014,6 @@ def health():
 
 
 def boot_threads():
-    # Log notification configuration on worker startup
-    logger.info("=" * 60)
-    logger.info("FPP Web Control - Notification Configuration")
-    logger.info("=" * 60)
-    logger.info(f"NOTIFY_ENABLED: {NOTIFY_ENABLED}")
-    logger.info(f"NOTIFY_NTFY_ENABLED: {NOTIFY_NTFY_ENABLED}")
-    logger.info(f"NOTIFY_NTFY_TOPIC: {NOTIFY_NTFY_TOPIC}")
-    logger.info(f"NOTIFY_NTFY_URL: {NOTIFY_NTFY_URL}")
-    logger.info(f"NOTIFY_MQTT_ENABLED: {NOTIFY_MQTT_ENABLED}")
-    logger.info(f"NOTIFY_HOMEASSISTANT_ENABLED: {NOTIFY_HOMEASSISTANT_ENABLED}")
-    logger.info(f"NOTIFY_WEBHOOK_ENABLED: {NOTIFY_WEBHOOK_ENABLED}")
-    logger.info("=" * 60)
-    
     threading.Thread(target=status_worker, daemon=True).start()
     threading.Thread(target=scheduler_worker, daemon=True).start()
 

diagnose-ntfy.sh

@@ -32,6 +32,8 @@ <h1 id="headline"></h1>
     </div>
 
     <div id="main-content" class="hidden">
+      <p class="quiet-banner hidden" id="preview-banner"></p>
+      <p class="quiet-banner hidden" id="show-running-banner"></p>
       <p class="quiet-banner hidden" id="quiet-banner"></p>
       <p class="quiet-banner hidden" id="outside-window-banner"></p>
       <div class="buttons">
@@ -74,6 +76,8 @@ <h3 class="social-footer-title">Unsere Kanäle:</h3>
     const btnKids = document.getElementById('btn-kids');
     const btnRequest = document.getElementById('btn-request');
     const btnDonate = document.getElementById('btn-donate');
+    const previewBanner = document.getElementById('preview-banner');
+    const showRunningBanner = document.getElementById('show-running-banner');
     const quietBanner = document.getElementById('quiet-banner');
     const outsideWindowBanner = document.getElementById('outside-window-banner');
     const statusBox = document.getElementById('status');
@@ -246,7 +250,8 @@ <h3 class="social-footer-title">Unsere Kanäle:</h3>
       markStatus('', 'Bereit (Vorschau).');
       setStatusDetails('player', 'Show 1', 'Jingle Bells');
       updateCountdown({ time: next.toISOString(), label: 'Show' });
-      note.textContent = 'Dies ist eine Vorschau ohne Verbindung zum FPP.';
+      previewBanner.textContent = 'Dies ist eine Vorschau ohne Verbindung zum FPP.';
+      previewBanner.classList.remove('hidden');
       applyLocks({ disableAllButtons: false, disableShowButtons: false });
       renderQueue(queue[0], queue);
     }
@@ -271,14 +276,16 @@ <h3 class="social-footer-title">Unsere Kanäle:</h3>
 
         markStatus(isRunning ? 'running' : '', isRunning ? 'Show läuft gerade.' : 'Bereit.');
         setStatusDetails(modeName, playlistLabel, currentSequence);
-        note.textContent = data.note || '';
         updateCountdown(data.nextShow, data.scheduledShowsEnabled !== false);
 
         const lockReason = applyLocks(data.locks);
         const isQuiet = Boolean(data.locks && data.locks.quiet);
         const isOutsideWindow = Boolean(data.locks && data.locks.outsideShowWindow);
         const showPeriod = data.locks && data.locks.showPeriod;
 
+        // Hide preview banner in normal mode
+        previewBanner.classList.add('hidden');
+
         if (isOutsideWindow && showPeriod) {
           const dateRange = showPeriod.startDate && showPeriod.endDate 
             ? `${showPeriod.startDate} - ${showPeriod.endDate}` : '';
@@ -300,19 +307,29 @@ <h3 class="social-footer-title">Unsere Kanäle:</h3>
           outsideWindowBanner.appendChild(line3);
           outsideWindowBanner.classList.remove('hidden');
           quietBanner.classList.add('hidden');
+          showRunningBanner.classList.add('hidden');
+          note.textContent = data.note || '';
         } else if (isQuiet && showPeriod) {
           quietBanner.textContent = `Ruhezeit ${showPeriod.endTime}–${showPeriod.startTime} – keine Wiedergabe möglich.`;
           quietBanner.classList.remove('hidden');
           outsideWindowBanner.classList.add('hidden');
+          showRunningBanner.classList.add('hidden');
+          note.textContent = data.note || '';
+        } else if (lockReason && !isQuiet && !isOutsideWindow) {
+          // Show the lock reason in the banner instead of the note section
+          showRunningBanner.textContent = lockReason;
+          showRunningBanner.classList.remove('hidden');
+          quietBanner.classList.add('hidden');
+          outsideWindowBanner.classList.add('hidden');
+          note.textContent = data.note || '';
         } else {
           quietBanner.classList.add('hidden');
           outsideWindowBanner.classList.add('hidden');
+          showRunningBanner.classList.add('hidden');
+          note.textContent = data.note || '';
         }
 
         renderQueue(data.currentRequest, data.queue || []);
-        if (!note.textContent && lockReason && !isQuiet && !isOutsideWindow) {
-          note.textContent = lockReason;
-        }
       } catch (err) {
         console.error('Statusfehler', err);
         markStatus('error', 'Status konnte nicht geladen werden.');