projects
/
kiosk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mypy clean
[kiosk.git]
/
kiosk.py
diff --git
a/kiosk.py
b/kiosk.py
index d9f607e3447b08e7616cfe66ef94e6793ce78d55..ffcd7863d1a75f0a9bb67cacc3b0ace27a083322 100755
(executable)
--- a/
kiosk.py
+++ b/
kiosk.py
@@
-1,11
+1,13
@@
#!/usr/bin/env python3
#!/usr/bin/env python3
-import sys
-import traceback
+from datetime import datetime
import os
import os
+import sys
from threading import Thread
import time
from threading import Thread
import time
-from datetime import datetime
+import traceback
+from typing import Optional
+
import constants
import renderer
import renderer
import constants
import renderer
import renderer
@@
-15,50
+17,52
@@
import logging
import trigger_catalog
import utils
import trigger_catalog
import utils
-def filter_news_during_dinnertime(page):
+
+def filter_news_during_dinnertime(page: str) -> bool:
now = datetime.now()
is_dinnertime = now.hour >= 17 and now.hour <= 20
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))
+ 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():
+def thread_change_current()
-> None
:
page_chooser = chooser.weighted_random_chooser_with_triggers(
page_chooser = chooser.weighted_random_chooser_with_triggers(
- trigger_catalog.get_triggers(),
-
[ filter_news_during_dinnertime ]
)
- 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:
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:
if page != last_page:
- print('chooser[%s] - EMERGENCY PAGE %s LOAD NEEDED' % (
- utils.timestamp(), page))
+ print(
+ "chooser[%s] - EMERGENCY PAGE %s LOAD NEEDED"
+ % (utils.timestamp(), page)
+ )
try:
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()
except:
emit_wrapped(f, page)
f.close()
except:
- print('chooser[%s] - page does not exist?!' % (
- utils.timestamp()))
+ print("chooser[%s] - page does not exist?!" % (utils.timestamp()))
continue
last_page = page
swap_page_target = now + constants.refresh_period_sec
# Also notify XMLHTTP clients that they need to refresh now.
continue
last_page = page
swap_page_target = now + constants.refresh_period_sec
# 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!')
+ 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
f.close()
# Fix this hack... maybe read the webserver logs and see if it
@@
-67,36
+71,41
@@
def thread_change_current():
os.remove(path)
elif now >= swap_page_target:
os.remove(path)
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
continue
- print(
'chooser[%s] - nominal choice of %s'
% (utils.timestamp(), page))
+ print(
"chooser[%s] - nominal choice of %s"
% (utils.timestamp(), page))
try:
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()
except:
emit_wrapped(f, page)
f.close()
except:
- print(
'chooser[%s] - page does not exist?!'
% (utils.timestamp()))
+ print(
"chooser[%s] - page does not exist?!"
% (utils.timestamp()))
continue
last_page = page
swap_page_target = now + constants.refresh_period_sec
time.sleep(1)
continue
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()
bgcolor = pick_background_color()
- f.write("""
+ f.write(
+ """
<HEAD>
<TITLE>Kitchen Kiosk</TITLE>
<LINK rel="stylesheet" type="text/css" href="style.css">
<HEAD>
<TITLE>Kitchen Kiosk</TITLE>
<LINK rel="stylesheet" type="text/css" href="style.css">
@@
-280,53
+289,56
@@
def emit_wrapped(f, filename):
</TD>
</TR>
</TABLE>
</TD>
</TR>
</TABLE>
-</BODY>""" % (bgcolor,
- constants.refresh_period_sec * 1000,
- bgcolor,
- filename,
- filename,
- age))
+</BODY>"""
+ % (
+ bgcolor,
+ constants.refresh_period_sec * 1000,
+ bgcolor,
+ filename,
+ filename,
+ age,
+ )
+ )
-def thread_invoke_renderers():
+
+def thread_invoke_renderers() -> None:
while True:
while True:
- print("renderer[%s]: invoking all renderers in catalog..." % (
- utils.timestamp()))
+ print(f"renderer[{utils.timestamp()}]: invoking all renderers in catalog...")
for r in renderer_catalog.get_renderers():
now = time.time()
try:
r.render()
except Exception as e:
traceback.print_exc()
for r in renderer_catalog.get_renderers():
now = time.time()
try:
r.render()
except Exception as e:
traceback.print_exc()
- print("renderer[%s] unknown exception in %s, swallowing it." % (
- utils.timestamp(), r.get_name()))
- except Error as e:
- traceback.print_exc()
- print("renderer[%s] unknown error in %s, swallowing it." % (
- utils.timestamp(), r.get_name()))
+ print(
+ f"renderer[{utils.timestamp()}] unknown exception in {r.get_name()}, swallowing it."
+ )
delta = time.time() - now
delta = time.time() - now
- 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))
+ if delta > 1.0:
+ print(
+ f"renderer[{utils.timestamp()}]: Warning: {r.get_name()}'s rendering took {delta:%5.2f}s."
+ )
+ print(
+ f"renderer[{utils.timestamp()}]: thread having a little break for {constants.render_period_sec}s..."
+ )
time.sleep(constants.render_period_sec)
time.sleep(constants.render_period_sec)
+
if __name__ == "__main__":
logging.basicConfig()
if __name__ == "__main__":
logging.basicConfig()
- changer_thread = None
- renderer_thread = None
+ changer_thread
: Optional[Thread]
= None
+ renderer_thread
: Optional[Thread]
= None
while True:
while True:
- if
(changer_thread == None or
- not changer_thread.is_alive()):
- print("MAIN[%s] - (Re?)initializing chooser thread..." % (
-
utils.timestamp())
)
- changer_thread = Thread(target
=
thread_change_current, args=())
+ if
changer_thread is None or not changer_thread.is_alive():
+ print(
+ f"MAIN[{utils.timestamp()}] - (Re?)initializing chooser thread... (wtf?!)"
+ )
+ changer_thread = Thread(target
=
thread_change_current, args=())
changer_thread.start()
changer_thread.start()
- if
(renderer_thread == None or
- not renderer_thread.is_alive()):
- print("MAIN[%s] - (Re?)initializing render thread..." % (
-
utils.timestamp())
)
- renderer_thread = Thread(target
=
thread_invoke_renderers, args=())
+ if
renderer_thread is None or not renderer_thread.is_alive():
+ print(
+ f"MAIN[{utils.timestamp()}] - (Re?)initializing render thread... (wtf?!)"
+ )
+ renderer_thread = Thread(target
=
thread_invoke_renderers, args=())
renderer_thread.start()
time.sleep(60)
renderer_thread.start()
time.sleep(60)
- print("Should never get here.")