X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=waitable_presence.py;h=6473add5b2f7f4fb023e03a71342c93a4b2aacd5;hb=532df2c5b57c7517dfb3dddd8c1358fbadf8baf3;hp=cd5501da59fc3e3ddd1022f8fd87cfba756aeffc;hpb=36fea7f15ed17150691b5b3ead75450e575229ef;p=python_utils.git

diff --git a/waitable_presence.py b/waitable_presence.py
index cd5501d..6473add 100644
--- a/waitable_presence.py
+++ b/waitable_presence.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 
+# © Copyright 2021-2022, Scott Gasch
+
 """A PresenceDetector that is waitable.  This is not part of
 base_presence.py because I do not want to bring these dependencies
 into that lower-level module (especially state_tracker).
@@ -13,16 +15,14 @@ from typing import Optional, Tuple
 from overrides import overrides
 
 import base_presence
-from type.locations import Location
 import site_config
 import state_tracker
+from type.locations import Location
 
 logger = logging.getLogger(__name__)
 
 
-class WaitablePresenceDetectorWithMemory(
-    state_tracker.WaitableAutomaticStateTracker
-):
+class WaitablePresenceDetectorWithMemory(state_tracker.WaitableAutomaticStateTracker):
     """
     This is a waitable class that keeps a PresenceDetector internally
     and periodically polls it to detect changes in presence in a
@@ -43,15 +43,17 @@ class WaitablePresenceDetectorWithMemory(
         self,
         override_update_interval_sec: float = 60.0,
         override_location: Location = site_config.get_location(),
+        injected_presence_detector: Optional[base_presence.PresenceDetection] = None,
     ) -> None:
         self.last_someone_is_home: Optional[bool] = None
         self.someone_is_home: Optional[bool] = None
         self.everyone_gone_since: Optional[datetime.datetime] = None
         self.someone_home_since: Optional[datetime.datetime] = None
         self.location = override_location
-        self.detector: base_presence.PresenceDetection = (
-            base_presence.PresenceDetection()
-        )
+        if injected_presence_detector is not None:
+            self.detector: base_presence.PresenceDetection = injected_presence_detector
+        else:
+            self.detector = base_presence.PresenceDetection()
         super().__init__(
             {
                 'poll_presence': override_update_interval_sec,
@@ -74,7 +76,7 @@ class WaitablePresenceDetectorWithMemory(
             raise Exception(f'Unknown update type {update_id} in {__file__}')
 
     def poll_presence(self, now: datetime.datetime) -> None:
-        logger.debug(f'Checking presence in {self.location} now...')
+        logger.debug('Checking presence in %s now...', self.location)
         self.detector.update()
         if self.detector.is_anyone_in_location_now(self.location):
             self.someone_is_home = True
@@ -88,20 +90,20 @@ class WaitablePresenceDetectorWithMemory(
 
     def check_detector(self) -> None:
         if len(self.detector.dark_locations) > 0:
-            logger.debug(
-                'PresenceDetector is incomplete; trying to reinitialize...'
-            )
+            logger.debug('PresenceDetector is incomplete; trying to reinitialize...')
             self.detector = base_presence.PresenceDetection()
 
-    def is_someone_home(self) -> Tuple[bool, datetime.datetime]:
+    def is_someone_home(self) -> Optional[Tuple[bool, datetime.datetime]]:
         """Returns a tuple of a bool that indicates whether someone is home
         and a datetime that indicates how long either someone has been
         home or no one has been home.
 
         """
         if self.someone_is_home is None:
-            raise Exception("Too Soon!")
+            return None  # checked too soon, wait a bit.
         if self.someone_is_home:
+            assert self.someone_home_since is not None
             return (True, self.someone_home_since)
         else:
+            assert self.everyone_gone_since is not None
             return (False, self.everyone_gone_since)