Various changes

[kiosk.git] / kiosk.py

diff --git a/kiosk.py b/kiosk.py
index 6003165a674e1f2ed76f18f8ffe8812f7c67b6e5..d9f607e3447b08e7616cfe66ef94e6793ce78d55 100755 (executable)
--- a/kiosk.py
+++ b/kiosk.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python3.7
+#!/usr/bin/env python3
 
 import sys
 import traceback
@@ -15,9 +15,22 @@ import logging
 import trigger_catalog
 import utils
 
+def filter_news_during_dinnertime(page):
+    now = datetime.now()
+    is_dinnertime = now.hour >= 17 and now.hour <= 20
+    return (not is_dinnertime or
+            not ("cnn" in page or
+                 "news" in page or
+                 "mynorthwest" in page or
+                 "seattle" in page or
+                 "stranger" in page or
+                 "twitter" in page or
+                 "wsj" in page))
+
 def thread_change_current():
     page_chooser = chooser.weighted_random_chooser_with_triggers(
-        trigger_catalog.get_triggers())
+        trigger_catalog.get_triggers(),
+        [ filter_news_during_dinnertime ])
     swap_page_target = 0
     last_page = ""
     while True:
@@ -246,13 +259,14 @@ def emit_wrapped(f, filename):
     <TR STYLE="vertical-align:top">
         <TD COLSPAN=3>
             <DIV ID="content" STYLE="zoom: 1; visibility: hidden;">
-                <!-- BEGIN main page contents. -->
+              <!-- BEGIN main page contents. -->
 <!--#include virtual=\"%s\"-->
-                <!-- END main page contents. -->
+              <!-- END main page contents. -->
             </DIV>
             <BR>
+            <DIV STYLE="position: absolute; top:1030px; width:99%%">
             <P ALIGN="right">
-                <FONT SIZE=2 COLOR=#bbbbbb>%s @ %s ago.</FONT>
+              <FONT SIZE=2 COLOR=#bbbbbb>%s @ %s ago.</FONT>
             </P>
             <HR id="countdown" STYLE="width:0px;
                                       text-align:left;
@@ -262,6 +276,7 @@ def emit_wrapped(f, filename):
                                       height:5px;
                                       visibility:hidden;
                                       background-color:#ffffff;">
+            </DIV>
         </TD>
     </TR>
     </TABLE>