X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=kiosk.py;fp=kiosk.py;h=b1bdb1c7c7e9b6f8319b46288c5995fac95c95f2;hb=477c84bcdefc573278ec8ed8974d5be8baac562d;hp=13fb2c95e824abb9dd8ca2839e5fdcd66ac04b74;hpb=55bcd1ba1b9d481e0d0dc604932bcc0f7f4fa127;p=kiosk.git

diff --git a/kiosk.py b/kiosk.py
index 13fb2c9..b1bdb1c 100755
--- a/kiosk.py
+++ b/kiosk.py
@@ -22,6 +22,7 @@ import pytz
 import bootstrap
 import config
 import datetime_utils
+import file_utils
 
 import constants
 import file_writer
@@ -29,7 +30,6 @@ import renderer_catalog
 import chooser
 import listen
 import trigger_catalog
-import utils
 
 
 cfg = config.add_commandline_args(
@@ -331,9 +331,9 @@ def emit_wrapped(f,
             "Bellevue", "USA", "US/Pacific", 47.610, -122.201
         )
         s = sun(city.observer, date=now, tzinfo=pytz.timezone("US/Pacific"))
-        sunrise_mod = utils.minute_number(s["sunrise"].hour, s["sunrise"].minute)
-        sunset_mod = utils.minute_number(s["sunset"].hour, s["sunset"].minute)
-        now_mod = utils.minute_number(now.hour, now.minute)
+        sunrise_mod = datetime_utils.minute_number(s["sunrise"].hour, s["sunrise"].minute)
+        sunset_mod = datetime_utils.minute_number(s["sunset"].hour, s["sunset"].minute)
+        now_mod = datetime_utils.minute_number(now.hour, now.minute)
         if now_mod < sunrise_mod or now_mod > (sunset_mod + 45):
             return "E6B8B8"
         elif now_mod < (sunrise_mod + 45) or now_mod > (sunset_mod + 120):
@@ -350,7 +350,7 @@ def emit_wrapped(f,
         else:
             return float(constants.refresh_period_sec * 1000.0)
 
-    age = utils.describe_age_of_file_briefly(f"pages/{filename}")
+    age = file_utils.describe_file_ctime(f"pages/{filename}")
     bgcolor = pick_background_color()
     if command is None:
         pageid = filename