X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=myq_renderer.py;h=4be8deeb28f59f5a8e219463f20134ed42d07b9a;hb=c06bfef53f70551e7920bc4facce27f47b89e2ba;hp=1e666489e66cf0366532e3658a6f9a6bc2763a01;hpb=6cc940e0df9b8ea937fb955f959fa878c80f0d7c;p=kiosk.git

diff --git a/myq_renderer.py b/myq_renderer.py
index 1e66648..4be8dee 100644
--- a/myq_renderer.py
+++ b/myq_renderer.py
@@ -1,24 +1,29 @@
-import pymyq
+#!/usr/bin/env python3
+
 from aiohttp import ClientSession
 import asyncio
-import constants
 import datetime
 from dateutil.parser import parse
+import pymyq
+from typing import Dict, List
+
+import constants
 import file_writer
 import renderer
 import secrets
+import utils
 
 
 class garage_door_renderer(renderer.debuggable_abstaining_renderer):
-    def __init__(self, name_to_timeout_dict):
+    def __init__(self, name_to_timeout_dict: Dict[str, int]) -> None:
         super(garage_door_renderer, self).__init__(name_to_timeout_dict, False)
         self.doors = None
         self.last_update = None
 
-    def debug_prefix(self):
+    def debug_prefix(self) -> str:
         return "myq"
 
-    def periodic_render(self, key):
+    def periodic_render(self, key: str) -> bool:
         if key == "Poll MyQ":
             self.last_update = datetime.datetime.now()
             return asyncio.run(self.poll_myq())
@@ -27,7 +32,7 @@ class garage_door_renderer(renderer.debuggable_abstaining_renderer):
         else:
             raise error("Unknown operaiton")
 
-    async def poll_myq(self):
+    async def poll_myq(self) -> bool:
         async with ClientSession() as websession:
             myq = await pymyq.login(
                 secrets.myq_username, secrets.myq_password, websession
@@ -35,36 +40,34 @@ class garage_door_renderer(renderer.debuggable_abstaining_renderer):
             self.doors = myq.devices
             return len(self.doors) > 0
 
-    def update_page(self):
-        f = file_writer.file_writer(constants.myq_pagename)
-        f.write(
-            """
+    def update_page(self) -> bool:
+        with file_writer.file_writer(constants.myq_pagename) as f:
+            f.write(
+                f"""
 <H1>Garage Door Status</H1>
-<!-- Last updated at %s -->
+<!-- Last updated at {self.last_update} -->
 <HR>
-<TABLE BORDER=0 WIDTH=99%%>
-  <TR>
+<TABLE BORDER=0 WIDTH=99%>
+    <TR>
 """
-            % self.last_update
-        )
-        html = self.do_door("Near House")
-        if html == None:
-            return False
-        f.write(html)
+            )
+            html = self.do_door("Near House")
+            if html == None:
+                return False
+            f.write(html)
 
-        html = self.do_door("Middle Door")
-        if html == None:
-            return False
-        f.write(html)
-        f.write(
-            """
-  </TR>
+            html = self.do_door("Middle Door")
+            if html == None:
+                return False
+            f.write(html)
+            f.write(
+                """
+    </TR>
 </TABLE>"""
-        )
-        f.close()
+            )
         return True
 
-    def get_state_icon(self, state):
+    def get_state_icon(self, state: str) -> str:
         if state == "open":
             return "/icons/garage_open.png"
         elif state == "closed":
@@ -76,11 +79,11 @@ class garage_door_renderer(renderer.debuggable_abstaining_renderer):
         else:
             return str(state) + ", an unknown state for the door."
 
-    def do_door(self, name):
+    def do_door(self, name: str) -> str:
         for key in self.doors:
             door = self.doors[key]
             if door.name == name:
-                j = self.doors[key].json
+                j = self.doors[key].device_json
                 state = j["state"]["door_state"]
 
                 # "last_update": "2020-07-04T18:11:34.2981419Z"
@@ -91,9 +94,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
-                days = divmod(delta, constants.seconds_per_day)
-                hours = divmod(days[1], constants.seconds_per_hour)
-                minutes = divmod(hours[1], constants.seconds_per_minute)
+                duration = utils.describe_duration_briefly(delta)
                 width = 0
                 if is_night and door.state == "open":
                     color = "border-color: #ff0000;"
@@ -101,31 +102,22 @@ class garage_door_renderer(renderer.debuggable_abstaining_renderer):
                 else:
                     color = ""
                     width = 0
-                return """
-<TD WIDTH=49%%>
+                return f"""
+<TD WIDTH=49%>
   <CENTER>
-  <FONT STYLE="font-size:26pt">%s<BR>
-  <IMG SRC="%s"
+  <FONT STYLE="font-size:26pt">{name}<BR>
+  <IMG SRC="{self.get_state_icon(state)}"
        HEIGHT=250
-       STYLE="border-style: solid; border-width: %dpx; %s">
+       STYLE="border-style: solid; border-width: {width}px; {color}">
   <BR>
-  <B>%s</B></FONT><BR>
-  for %d day(s), %02d:%02d.
+  <B>{state}</B></FONT><BR>
+  for {duration}
   </CENTER>
-</TD>""" % (
-                    name,
-                    self.get_state_icon(state),
-                    width,
-                    color,
-                    state,
-                    days[0],
-                    hours[0],
-                    minutes[0],
-                )
+</TD>"""
         return None
 
 
 # Test
-x = garage_door_renderer({"Test": 1})
-x.periodic_render("Poll MyQ")
-x.periodic_render("Update Page")
+#x = garage_door_renderer({"Test": 1})
+#x.periodic_render("Poll MyQ")
+#x.periodic_render("Update Page")