More fuckery with indented sublists in gkeep and with the countdown line.

[kiosk.git] / kiosk.py

diff --git a/kiosk.py b/kiosk.py
index 5bc28cda4843aba9428c20bf162109173b8ac1eb..6003165a674e1f2ed76f18f8ffe8812f7c67b6e5 100755 (executable)
--- a/kiosk.py
+++ b/kiosk.py
@@ -172,37 +172,46 @@ def emit_wrapped(f, filename):
     return new Promise(resolve => setTimeout(resolve, milliseconds))
   }
 
-  var loaded = false;
   var loadedDate = new Date();
 
   addLoadEvent(zoomScreen);
   addLoadEvent(runClock);
   addLoadEvent(lateLoadImages);
-  addLoadEvent(function() {
-    loaded = true;
-  });
 
-  // Reload the page after a certain amount of time has passed or
-  // immediately if told to do so.
-  (function poll() {
+  // Runs the countdown line at the bottom and is responsible for
+  // normal page reloads caused by the expiration of a timer.
+  (function countdown() {
     setTimeout(
       function() {
         var now = new Date();
         var deltaMs = now.getTime() - loadedDate.getTime();
-
         var totalMs = %d;
         var remainingMs = (totalMs - deltaMs);
+
         if (remainingMs > 0) {
           var hr = document.getElementById("countdown");
-          var width = (remainingMs / totalMs) * 100.0;
-          hr.style.width = " ".concat(width, "%%");
-          hr.style.backgroundColor = "maroon";
+          var width = (remainingMs / (totalMs - 5000)) * 100.0;
+          if (width <= 100) {
+            hr.style.visibility = "visible";
+            hr.style.width = " ".concat(width, "%%");
+            hr.style.backgroundColor = "maroon";
+          }
         } else {
           // Reload unconditionally after 22 sec.
           window.location.reload();
         }
 
-        // Also reload immediately if told to do so.
+        // Brief sleep before doing it all over again.
+        sleep(50).then(() => {
+          countdown();
+        });
+      }, 50)
+  })();
+
+  // Periodically checks for emergency reload events.
+  (function poll() {
+    setTimeout(
+      function() {
         var xhr = new XMLHttpRequest();
         xhr.open('GET',
                  'http://wannabe.house/kiosk/pages/reload_immediately.html');
@@ -247,11 +256,11 @@ def emit_wrapped(f, filename):
             </P>
             <HR id="countdown" STYLE="width:0px;
                                       text-align:left;
+                                      margin:0;
                                       border:none;
-                                      margin-top:0;
-                                      margin-left:0;
-                                      margin-bottom:2px;
+                                      border-width:0;
                                       height:5px;
+                                      visibility:hidden;
                                       background-color:#ffffff;">
         </TD>
     </TR>