X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;ds=inline;f=kiosk.py;h=ffcd7863d1a75f0a9bb67cacc3b0ace27a083322;hb=e4dca16bbd329afdb587e8488767d88e17777254;hp=b7fb9d96cc728625cfe635bf242d075979397be0;hpb=75b27cc68871343681f01e3f5b04cae84b1b7b2a;p=kiosk.git diff --git a/kiosk.py b/kiosk.py index b7fb9d9..ffcd786 100755 --- a/kiosk.py +++ b/kiosk.py @@ -1,11 +1,13 @@ -#!/usr/local/bin/python3.7 +#!/usr/bin/env python3 -import sys -import traceback +from datetime import datetime import os +import sys from threading import Thread import time -from datetime import datetime +import traceback +from typing import Optional + import constants import renderer import renderer @@ -15,67 +17,95 @@ import logging import trigger_catalog import utils -def thread_change_current(): + +def filter_news_during_dinnertime(page: str) -> bool: + 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() -> None: page_chooser = chooser.weighted_random_chooser_with_triggers( - trigger_catalog.get_triggers()) - swap_page_target = 0 + trigger_catalog.get_triggers(), [filter_news_during_dinnertime] + ) + swap_page_target = 0.0 last_page = "" while True: now = time.time() (page, triggered) = page_chooser.choose_next_page() if triggered: - print(('chooser[%s] - WE ARE TRIGGERED.' % utils.timestamp())) + print("chooser[%s] - WE ARE TRIGGERED." % utils.timestamp()) if page != last_page: - print(('chooser[%s] - EMERGENCY PAGE %s LOAD NEEDED' % ( - utils.timestamp(), page))) - f = open(os.path.join(constants.pages_dir, - "current.shtml"), "w") - emit_wrapped(f, page) - f.close() + print( + "chooser[%s] - EMERGENCY PAGE %s LOAD NEEDED" + % (utils.timestamp(), page) + ) + try: + f = open(os.path.join(constants.pages_dir, "current.shtml"), "w") + emit_wrapped(f, page) + f.close() + except: + print("chooser[%s] - page does not exist?!" % (utils.timestamp())) + continue + last_page = page + swap_page_target = now + constants.refresh_period_sec - # Notify XMLHTTP clients that they need to refresh now. - path = os.path.join(constants.pages_dir, - "reload_immediately.html") - f = open(path, 'w') + # Also notify XMLHTTP clients that they need to refresh now. + path = os.path.join(constants.pages_dir, "reload_immediately.html") + f = open(path, "w") f.write("Reload, suckers!") f.close() + + # Fix this hack... maybe read the webserver logs and see if it + # actually was picked up? time.sleep(0.750) os.remove(path) - last_page = page - swap_page_target = now + constants.refresh_period_sec elif now >= swap_page_target: - if (page == last_page): - print(('chooser[%s] - nominal choice got the same page...' % ( - utils.timestamp()))) + if page == last_page: + print( + ( + "chooser[%s] - nominal choice got the same page..." + % (utils.timestamp()) + ) + ) continue - print(('chooser[%s] - nominal choice of %s' % (utils.timestamp(), page))) + print("chooser[%s] - nominal choice of %s" % (utils.timestamp(), page)) try: - f = open(os.path.join(constants.pages_dir, - "current.shtml"), "w") + f = open(os.path.join(constants.pages_dir, "current.shtml"), "w") emit_wrapped(f, page) f.close() - last_page = page - swap_page_target = now + constants.refresh_period_sec except: - print(('chooser[%s] - page does not exist?!' % (utils.timestamp()))) + print("chooser[%s] - page does not exist?!" % (utils.timestamp())) continue - time.sleep(1.0) + last_page = page + swap_page_target = now + constants.refresh_period_sec + time.sleep(1) -def pick_background_color(): - now = datetime.now() - if now.hour <= 6 or now.hour >= 21: - return "E6B8B8" - elif now.hour == 7 or now.hour == 20: - return "EECDCD" - else: - return "FFFFFF" -def emit_wrapped(f, filename): - age = utils.describe_age_of_file_briefly("pages/%s" % filename) +def emit_wrapped(f, filename) -> None: + def pick_background_color() -> str: + now = datetime.now() + if now.hour <= 6 or now.hour >= 21: + return "E6B8B8" + elif now.hour == 7 or now.hour == 20: + return "EECDCD" + else: + return "FFFFFF" + + age = utils.describe_age_of_file_briefly(f"pages/{filename}") bgcolor = pick_background_color() - f.write(""" + f.write( + """
- %s @ %s ago. + %s @ %s ago.
+