Add default to item_older_than_n_days.

[kiosk.git] / myq_renderer.py

diff --git a/myq_renderer.py b/myq_renderer.py
index 0ee104b55117a002b50476ed6f6d8d196c0b6411..ebfac233927a8038cda3daca83a2fe23fb984d78 100644 (file)
--- a/myq_renderer.py
+++ b/myq_renderer.py
@@ -5,18 +5,19 @@ import asyncio
 import datetime
 from dateutil.parser import parse
 import pymyq  # type: ignore
-from typing import Dict, List, Optional
+from typing import Dict, Optional
 
-import constants
+from pyutils.datetimes import datetime_utils
+
+import kiosk_constants
 import file_writer
 import renderer
-import secrets
-import utils
+import kiosk_secrets as secrets
 
 
-class garage_door_renderer(renderer.debuggable_abstaining_renderer):
+class garage_door_renderer(renderer.abstaining_renderer):
     def __init__(self, name_to_timeout_dict: Dict[str, int]) -> None:
-        super(garage_door_renderer, self).__init__(name_to_timeout_dict, False)
+        super().__init__(name_to_timeout_dict)
         self.doors: Optional[Dict] = None
         self.last_update: Optional[datetime.datetime] = None
 
@@ -42,7 +43,7 @@ class garage_door_renderer(renderer.debuggable_abstaining_renderer):
             return len(self.doors) > 0
 
     def update_page(self) -> bool:
-        with file_writer.file_writer(constants.myq_pagename) as f:
+        with file_writer.file_writer(kiosk_constants.myq_pagename) as f:
             f.write(
                 f"""
 <H1>Garage Door Status</H1>
@@ -70,13 +71,13 @@ class garage_door_renderer(renderer.debuggable_abstaining_renderer):
 
     def get_state_icon(self, state: str) -> str:
         if state == "open":
-            return "/kiosk/pages/images/garage_open.png"
+            return "/kiosk/images/garage_open.png"
         elif state == "closed":
-            return "/kiosk/pages/images/garage_closed.png"
+            return "/kiosk/images/garage_closed.png"
         elif state == "opening":
-            return "/kiosk/pages/images/garage_opening.png"
+            return "/kiosk/images/garage_opening.png"
         elif state == "closing":
-            return "/kiosk/pages/images/garage_closing.png"
+            return "/kiosk/images/garage_closing.png"
         else:
             return str(state) + ", an unknown state for the door."
 
@@ -97,7 +98,7 @@ class garage_door_renderer(renderer.debuggable_abstaining_renderer):
                 delta = (now - ts).total_seconds()
                 now = datetime.datetime.now()
                 is_night = now.hour <= 7 or now.hour >= 21
-                duration = utils.describe_duration_briefly(int(delta))
+                duration = datetime_utils.describe_duration_briefly(int(delta))
                 width = 0
                 if is_night and door.state == "open":
                     color = "border-color: #ff0000;"