More work on generic RSS renderer base class. Make the kiosk have a countdown

[kiosk.git] / kiosk.py

diff --git a/kiosk.py b/kiosk.py
index f25a659c17bb153a08281b0c5c5743ad59fde0d4..5bc28cda4843aba9428c20bf162109173b8ac1eb 100755 (executable)
--- a/kiosk.py
+++ b/kiosk.py
@@ -190,12 +190,19 @@ def emit_wrapped(f, filename):
         var now = new Date();
         var deltaMs = now.getTime() - loadedDate.getTime();
 
-        // Reload unconditionally after 22 sec.
-        if (deltaMs > %d) {
+        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";
+        } else {
+          // Reload unconditionally after 22 sec.
           window.location.reload();
         }
 
-        // Reload immediately if told.
+        // Also reload immediately if told to do so.
         var xhr = new XMLHttpRequest();
         xhr.open('GET',
                  'http://wannabe.house/kiosk/pages/reload_immediately.html');
@@ -238,6 +245,14 @@ def emit_wrapped(f, filename):
             <P ALIGN="right">
                 <FONT SIZE=2 COLOR=#bbbbbb>%s @ %s ago.</FONT>
             </P>
+            <HR id="countdown" STYLE="width:0px;
+                                      text-align:left;
+                                      border:none;
+                                      margin-top:0;
+                                      margin-left:0;
+                                      margin-bottom:2px;
+                                      height:5px;
+                                      background-color:#ffffff;">
         </TD>
     </TR>
     </TABLE>
@@ -254,7 +269,6 @@ def thread_invoke_renderers():
             utils.timestamp()))
         for r in renderer_catalog.get_renderers():
             now = time.time()
-            print("renderer[%s]: Rendering %s" % (utils.timestamp(), r.get_name()))
             try:
                 r.render()
             except Exception as e:
@@ -266,8 +280,9 @@ def thread_invoke_renderers():
                 print("renderer[%s] unknown error in %s, swallowing it." % (
                     utils.timestamp(), r.get_name()))
             delta = time.time() - now
-            print("renderer[%s]: Back from %s, that took %5.2fs." % (
-                utils.timestamp(), r.get_name(), delta))
+            if (delta > 1.0):
+                print("renderer[%s]: Warning: %s's rendering took %5.2fs." % (
+                    utils.timestamp(), r.get_name(), delta))
         print("renderer[%s]: thread having a little break for %ds..." % (
             utils.timestamp(), constants.render_period_sec))
         time.sleep(constants.render_period_sec)