From 9790d8be36887e49bbc55724daa6911d1a772b46 Mon Sep 17 00:00:00 2001
From: Scheianu Ionut <scheianuionut@gmail.com>
Date: Sun, 11 May 2025 19:18:28 +0300
Subject: [PATCH] almost final app

---
 app/__pycache__/app.cpython-312.pyc | Bin 12058 -> 13046 bytes
 app/app.py                          |  22 ++++++
 app/run_app.sh                      |  21 ++++++
 app/static/index.html               | 112 ++++++++++++++++++++--------
 4 files changed, 122 insertions(+), 33 deletions(-)
 mode change 100755 => 100644 app/__pycache__/app.cpython-312.pyc
 create mode 100644 app/run_app.sh

diff --git a/app/__pycache__/app.cpython-312.pyc b/app/__pycache__/app.cpython-312.pyc
old mode 100755
new mode 100644
index e22e1ee6244267f9516606c21519029bcac84f6e..d4b45bdf1163c667c88c7c2b5edc8e737b06b650
GIT binary patch
delta 1489
zcmZ8gZ%kWN6u<ZNz0$tE{((|jN=qM<e~%U_BPtG9V9Q40kcdGOnmDZ7=V*a}ua6)&
z1f0r<EQ8#TC7T#c_F)FTn3tGkiALflB{6KN4muL|VTs1XgdqNje(}7rmf>yQ@15T{
zzjJ!;x#wL!_or;zuv&QptNxZa5Gz}<dGJR|)u+P*5oU;w@|m|KYGIIUPIz?T(FI=b
z(&gZDzN2oP$@W!z;Eg&U9m{sYu5qi(V_!b_xI_i5_j!#`r|e8fx_K_@BF1PD$&0#)
zDe3`@F>&l5<4Ke~#Jt95Yhgqz@1dxd2!JKT3g{y?KtHhqmJ$bGK+aFJ)BJ)$x`<s|
zS%zU}A^i%MaOF9+2P~Lj4Gt%*WPDsjj`aeo%&{xLs&Z@{Sapv50jws+BtucRL@Hnp
zwWJa-M5+M8q#Cdex>7S(gODP@SwpLj4~Y@5+9Ry)kU`~FDeTWBk=nJ;VHYNt2}TNQ
z9~<srS0FMlGAu`ugYr{N&qheHZgeO%L8rI?_G>HLNsKGBhsIwqmb4AiD;PhcmGj*!
zZq`)W^*r3A*^4v=kJE2F5Aj9qX0e3vyW02O*BLyoHTX|qyiCVRzr#0ZTVNl5sy!{v
zVf-2WvaFI*;RLs|pUWi7jf45Q<_Zq8_-*Y{^=p`$1J4)QFEt-9+&q}uG#QGB{b1!5
z2bKYz-+7pwYsd^g+E5UnBSC?B9r-LqY975)+ajpeY)-<a_d;Z|(}vN)%R!`?vhfO}
zlusd*S}p!*Vz`KIpcUp&+lvUALhqo3mV@^=9!GB(deJzRxUNa@)PUSS7{72{d}Blr
z^%f4rld3p2N@A*<tgo-1^t_mL_Ulrye`I)cNLJ<gN&jg@fh01f==qu4X+1fkJ1)k<
za6-wX=+mt<>hOXNdW)1db!Y}ivub=;PIJj2SsqoA;7RJ=l&BQxLHDSv#79WHzc0J9
zzD#lD3PgX>#e)DdXp6V)GA8qhooS)q>e>0To1Wt-q4|*zNeK;)gkVaj+{p%xrG&<P
zBQjgB^7H&+<AQzHg)H{J_Z`SlyoWH<0A=TV=VnRM?flz@&El5(LhD_j_1|3s1pi68
z;SVpJXm_J^xA`PvSQkC*t%mhh4s5t*s+2oTQIK3iDyFjmpGReZWfs9}Om>u~5bbsp
z(Ka7HJ%J=cSC7P`jcQCeFRN)IiOItw7bG@qRtFS0MxeWCV^7A+92~j@QdPo`lJP#-
zvXV^ffBot^&?(EXk>B7+mIBP69c$5jkJW$I>Q7a+eBG0>K0kA2i{<A!XFK2TqAQ^g
zj?iyIO}w%Ma^*t+io<uj`WK++vwv`x`k-g_r7Y8pa5;YyxPFJp2KranZ+w6p50FJG
ztosqS?Fkm_+4C{jxobkKaC!2cp?I5hr&z#}6zkt+11Yv_i_M$snC)0B{-kiG;|I2C
M*Nj-N@)DH%4?5&<+W-In

delta 660
zcmZXSKWGzC9LMi>c`s>W@6u{alU!obOYf3r!OI|62L~0&;-b_JH`Jo<Fr*aWf<o)k
zf;2%K3~x~Dpo?`#py1P`P-n4&P-@k!vx62<H^JYXl~Vi-Up~LT@ArfE%Uhn(H#9A-
zpw*ug>l^uwo(8{DzK~NDufLHD5(f>Vsm`NPXEAAMUHF@Gb*u(Y<D^Hs>Rv2?G1@4K
z>0CDI4tYZjE5IrD2#>l+9&?ZKJ~xFm(Z-2`F9e>K;{Cn&zgeL0Lw6N7%?D63Ttm%r
z9o66o)Epl~&3lQ)8F3#NErhfN4lRcC6=@_SQ+22r(j-zTq<cuCA-zGeLi&zmhh#_C
z)iNK&`4w)VGQ85BsVItX;_j@ww>l{3RrWpXz4HH6yv!>-wtv-}I;XPZ@@-@jv|*=y
zbJla3GhTK4lvt$&FywoB4#1R$V_yKu@^{}Pz)3j~zeM1)T+x?fa8aI3NfmC1pXnW#
zm)jWzu<+8jrb0_z&z}bn;>EFd@L2eTAMjM(D7FBY_%>qECT_PPGbRIi8*x?EO0xt<
zye>}zUBbvKnPp2VZ6kgZ&&M1w;n*-H?l|LO-B}w9`u(8O4~qS^=v2-4L&V@qG!3y{
y&C8wYHdJ@x3K?k6Z$>ho$?z6IHMU6p6N$BIi?s)tXUT=y2V(EW6q5BXWA7g!-kJyi

diff --git a/app/app.py b/app/app.py
index 4fe6c75..a1e1979 100755
--- a/app/app.py
+++ b/app/app.py
@@ -4,6 +4,8 @@ import os
 import json
 import requests
 import logging
+import threading
+import time
 
 # Configure logging
 logging.basicConfig(level=logging.INFO)
@@ -217,7 +219,27 @@ def initialize_playlist():
     download_playlist_files_from_server()
     Logger.info("Playlist initialization complete.")
 
+# Function to check for playlist updates every 5 minutes
+def periodic_playlist_check():
+    while True:
+        try:
+            Logger.info("Checking for playlist updates...")
+            # Download the playlist files from the server
+            download_playlist_files_from_server()
+            # Create the updated playlist with local file paths
+            create_updated_playlist()
+            Logger.info("Playlist check complete.")
+        except Exception as e:
+            Logger.error(f"Error during playlist check: {e}")
+        time.sleep(300)  # Wait for 5 minutes (300 seconds) before checking again
+
+# Start the periodic playlist check in a background thread
+def start_playlist_check_thread():
+    thread = threading.Thread(target=periodic_playlist_check, daemon=True)
+    thread.start()
+
 if __name__ == '__main__':
     initialize_playlist()  # Check and download playlist on startup
     create_updated_playlist()  # Create the updated playlist
+    start_playlist_check_thread()  # Start the background thread for periodic checks
     app.run(host='0.0.0.0', port=1025)
\ No newline at end of file
diff --git a/app/run_app.sh b/app/run_app.sh
new file mode 100644
index 0000000..c1196f9
--- /dev/null
+++ b/app/run_app.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Exit immediately if a command exits with a non-zero status
+set -e
+
+# Activate the virtual environment
+source venv/bin/activate
+
+# Run the Gunicorn server
+echo "Starting Gunicorn server..."
+python3 run_gunicorn.py &
+
+# Wait for 5 seconds to ensure the server is up
+sleep 5
+
+# Launch Chromium in fullscreen and kiosk mode
+echo "Launching Chromium in fullscreen and kiosk mode..."
+chromium-browser --kiosk --start-fullscreen http://localhost:1025
+
+# Deactivate the virtual environment when done
+deactivate
\ No newline at end of file
diff --git a/app/static/index.html b/app/static/index.html
index f152b7b..a836514 100755
--- a/app/static/index.html
+++ b/app/static/index.html
@@ -14,6 +14,7 @@
             display: flex; 
             flex-direction: column; 
             height: 100vh; 
+            overflow: hidden; /* Prevent scrolling */
         }
         .playlist-container { 
             flex: 1; 
@@ -22,30 +23,32 @@
             justify-content: center; 
             align-items: center; 
             background-color: black; 
+            position: relative; /* Enable positioning of child elements */
         }
-        ul { 
-            list-style-type: none; 
-            padding: 0; 
-            display: none; /* Hide the playlist list */
+        .playlist-container img, 
+        .playlist-container video { 
+            max-width: 100%; 
+            max-height: 100%; 
+            object-fit: contain; /* Ensure content fits within the container */
         }
         .controls-wrapper {
+            position: fixed; /* Fix the controls at the bottom of the page */
+            bottom: 0; /* Align to the bottom */
+            left: 0; /* Align to the left */
+            width: 100%; /* Full width */
             display: flex;
             justify-content: center;
-            width: 33.33%; /* 1/3 of the page width */
-            margin: 0 auto;
+            gap: 15px; /* Space between buttons */
+            padding: 10px; 
+            background-color: rgba(0, 0, 0, 0.5); /* Increased transparency */
+            border-top: 2px solid #444; /* Add a border at the top */
+            z-index: 100; /* Ensure buttons are above the media */
             transition: opacity 0.5s ease; /* Smooth fade effect */
         }
         .controls-wrapper.hidden {
             opacity: 0; /* Hide the buttons */
             pointer-events: none; /* Disable interaction when hidden */
         }
-        .controls { 
-            display: flex; 
-            justify-content: center; 
-            gap: 15px; /* Space between buttons */
-            padding: 10px; 
-            background-color: #222; 
-        }
         button { 
             margin: 5px; 
             padding: 10px; 
@@ -62,10 +65,6 @@
         button i { 
             pointer-events: none; 
         }
-        img, video {
-            max-width: 100%;
-            max-height: 100%;
-        }
     </style>
     <!-- Add Font Awesome for icons -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
@@ -75,22 +74,24 @@
         <!-- Content will be dynamically added here -->
     </div>
     <div class="controls-wrapper" id="controls-wrapper">
-        <div class="controls">
-            <button onclick="previousMedia()"><i class="fas fa-step-backward"></i></button> <!-- Previous -->
-            <button onclick="loadPlaylist()"><i class="fas fa-sync-alt"></i></button> <!-- Refresh Playlist -->
-            <button onclick="playMedia()"><i class="fas fa-play"></i></button> <!-- Play -->
-            <button onclick="nextMedia()"><i class="fas fa-step-forward"></i></button> <!-- Next -->
-            <button onclick="stopMedia()"><i class="fas fa-stop"></i></button> <!-- Stop -->
-            <button onclick="goToSettings()"><i class="fas fa-cog"></i></button> <!-- Settings -->
-        </div>
+        <button onclick="previousMedia()"><i class="fas fa-step-backward"></i></button> <!-- Previous -->
+        <button onclick="refreshPlaylist()"><i class="fas fa-sync-alt"></i></button> <!-- Refresh Playlist -->
+        <button id="playPauseButton" onclick="togglePlayPause()"><i class="fas fa-play"></i></button> <!-- Play/Pause -->
+        <button onclick="nextMedia()"><i class="fas fa-step-forward"></i></button> <!-- Next -->
+        <button onclick="stopMedia()"><i class="fas fa-stop"></i></button> <!-- Stop -->
+        <button onclick="goToSettings()"><i class="fas fa-cog"></i></button> <!-- Settings -->
     </div>
 
     <script>
         const apiBase = 'http://localhost:1025'; // Update to match your Flask app's port
         const playlistContainer = document.getElementById('playlist-container');
+        const controlsWrapper = document.getElementById('controls-wrapper');
+        const playPauseButton = document.getElementById('playPauseButton');
         let playlist = [];
         let currentIndex = 0;
         let playbackInterval;
+        let inactivityTimer;
+        let isPaused = false;
 
         // Function to load the playlist from updated_playlist.json
         async function loadPlaylist() {
@@ -100,9 +101,12 @@
                     throw new Error(`Failed to load playlist: ${response.statusText}`);
                 }
                 const data = await response.json();
-                playlist = data; // Use the updated playlist
-                console.log("Loaded playlist:", playlist); // Debug log
-                startPlaylist(); // Start playing the playlist after loading
+                if (JSON.stringify(data) !== JSON.stringify(playlist)) {
+                    playlist = data; // Update the playlist only if it has changed
+                    console.log("Playlist updated:", playlist); // Debug log
+                    currentIndex = 0; // Reset to the first item
+                    startPlaylist(); // Restart the playlist
+                }
             } catch (error) {
                 console.error("Error loading playlist:", error);
             }
@@ -133,9 +137,11 @@
 
                 // Display the image for the specified duration
                 playbackInterval = setTimeout(() => {
-                    currentIndex++;
-                    playCurrentItem();
-                }, currentItem.duration * 1000);
+                    if (!isPaused) {
+                        currentIndex++;
+                        playCurrentItem();
+                    }
+                }, currentItem.duration * 1000 + (isPaused ? 10000 : 0)); // Add 10 seconds if paused
             } else if (currentItem.type === 'video') {
                 const video = document.createElement('video');
                 video.src = currentItem.url;
@@ -145,8 +151,10 @@
 
                 // Play the video and move to the next item after it ends
                 video.onended = () => {
-                    currentIndex++;
-                    playCurrentItem();
+                    if (!isPaused) {
+                        currentIndex++;
+                        playCurrentItem();
+                    }
                 };
             }
         }
@@ -164,6 +172,22 @@
             playCurrentItem();
         }
 
+        // Function to refresh the playlist
+        function refreshPlaylist() {
+            loadPlaylist(); // Reload the playlist
+        }
+
+        // Function to toggle play/pause
+        function togglePlayPause() {
+            isPaused = !isPaused;
+            if (isPaused) {
+                playPauseButton.innerHTML = '<i class="fas fa-pause"></i>'; // Change to pause icon
+            } else {
+                playPauseButton.innerHTML = '<i class="fas fa-play"></i>'; // Change to play icon
+                playCurrentItem(); // Resume playback
+            }
+        }
+
         // Function to play the next item
         function nextMedia() {
             stopMedia();
@@ -175,8 +199,30 @@
             window.location.href = '/static/settings.html';
         }
 
+        // Function to hide controls after inactivity
+        function hideControls() {
+            controlsWrapper.classList.add('hidden');
+        }
+
+        // Function to reset inactivity timer
+        function resetInactivityTimer() {
+            controlsWrapper.classList.remove('hidden'); // Show controls
+            clearTimeout(inactivityTimer); // Clear the previous timer
+            inactivityTimer = setTimeout(hideControls, 10000); // Set a new timer for 10 seconds
+        }
+
+        // Add event listeners for mouse movement
+        document.addEventListener('mousemove', resetInactivityTimer);
+        document.addEventListener('keydown', resetInactivityTimer);
+
+        // Initialize inactivity timer on page load
+        resetInactivityTimer();
+
         // Load playlist on page load
         loadPlaylist();
+
+        // Start periodic playlist reload
+        setInterval(loadPlaylist, 300000); // Check every 5 minutes (300,000 ms)
     </script>
 </body>
 </html>
\ No newline at end of file