Make presence detection work from cabin or house and deal with a

bad VPN link between them better.

1 files changed, 31 insertions, 13 deletions

diff --git a/site_config.py b/site_config.py
index e3b186d..2d0c4c3 100644
--- a/site_config.py
+++ b/site_config.py
@@ -7,9 +7,10 @@ from typing import Callable
 
 # Note: this module is fairly early loaded.  Be aware of dependencies.
 import config
-import presence
+from locations import Location
 
 logger = logging.getLogger(__name__)
+
 args = config.add_commandline_args(
     f'({__file__})',
     'Args related to __file__'
@@ -26,28 +27,43 @@ args.add_argument(
 
 @dataclass
 class SiteConfig(object):
-    location: str
+    location_name: str
+    location: Location
     network: str
     network_netmask: str
     network_router_ip: str
-    presence_location: presence.Location
+    presence_location: Location
     is_anyone_present: Callable[None, bool]
     arper_minimum_device_count: int
 
 
-def get_location():
+def get_location_name():
     """
     Where are we?
 
-    >>> location = get_location()
+    >>> location = get_location_name()
     >>> location == 'HOUSE' or location == 'CABIN'
     True
 
     """
+    return get_config().location_name
+
+
+def get_location():
+    """
+    Returns location as an enum instead of a string.
+
+    >>> from locations import Location
+    >>> location = get_location()
+    >>> location == Location.HOUSE or location == Location.CABIN
+    True
+
+    """
     return get_config().location
 
 
-def is_anyone_present_wrapper(location: presence.Location):
+def is_anyone_present_wrapper(location: Location):
+    import presence
     p = presence.PresenceDetection()
     return p.is_anyone_in_location_now(location)
 
@@ -58,7 +74,7 @@ def get_config():
     site-specific including the current running location.
 
     >>> cfg = get_config()
-    >>> cfg.location == 'HOUSE' or cfg.location == 'CABIN'
+    >>> cfg.location_name == 'HOUSE' or cfg.location_name == 'CABIN'
     True
 
     """
@@ -74,22 +90,24 @@ def get_config():
             location = 'CABIN'
     if location == 'HOUSE':
         return SiteConfig(
-            location = 'HOUSE',
+            location_name = 'HOUSE',
+            location = Location.HOUSE,
             network = '10.0.0.0/24',
             network_netmask = '255.255.255.0',
             network_router_ip = '10.0.0.1',
-            presence_location = presence.Location.HOUSE,
-            is_anyone_present = lambda x=presence.Location.HOUSE: is_anyone_present_wrapper(x),
+            presence_location = Location.HOUSE,
+            is_anyone_present = lambda x=Location.HOUSE: is_anyone_present_wrapper(x),
             arper_minimum_device_count = 50,
         )
     elif location == 'CABIN':
         return SiteConfig(
-            location = 'CABIN',
+            location_name = 'CABIN',
+            location = Location.CABIN,
             network = '192.168.0.0/24',
             network_netmask = '255.255.255.0',
             network_router_ip = '192.168.0.1',
-            presence_location = presence.Location.CABIN,
-            is_anyone_present = lambda x=presence.Location.CABIN: is_anyone_present_wrapper(x),
+            presence_location = Location.CABIN,
+            is_anyone_present = lambda x=Location.CABIN: is_anyone_present_wrapper(x),
             arper_minimum_device_count = 15,
         )
     else: