X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=site_config.py;h=eb7d8845639a6b81b73c22425c90fbc52eb8d5c9;hb=36be25ae450f455cc6c798df44e5af038f068c41;hp=7f6410d39356c1d0d8f910cfcece67eaf4cff29e;hpb=e8fbbb7306430478dec55d2c963eed116d8330cc;p=python_utils.git

diff --git a/site_config.py b/site_config.py
index 7f6410d..eb7d884 100644
--- a/site_config.py
+++ b/site_config.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 
+# © Copyright 2021-2022, Scott Gasch
+
 """Location/site dependent data."""
 
 import logging
@@ -32,17 +34,36 @@ class SiteConfig(object):
     """The set of information specific to where the program is running."""
 
     location_name: str
+    """Either "HOUSE" or "CABIN" depending on where we're running"""
+
     location: Location
+    """Same as above but as an enum value instead of a string"""
+
     network: str
+    """The local network specification, e.g. 192.168.0.0/24."""
+
     network_netmask: str
+    """The netmask of the local network, e.g. 255.255.255.0."""
+
     network_router_ip: str
+    """The IP address of the local router, e.g. 192.168.0.1."""
+
     presence_location: Location
+    """Same as location, above."""
+
     is_anyone_present: Callable
+    """Returns a callable which, when invoked, will tell you if it detects
+    any person in your location by auditing network device MAC addresses."""
+
     arper_minimum_device_count: int
+    """How many MAC addresses do we need to see for it to be considered a
+    successful scan?"""
+
     arper_cache_file: str
+    """The location of the persisted IP-MAC address mappings."""
 
 
-def get_location_name():
+def get_location_name() -> str:
     """
     Where are we?
 
@@ -54,7 +75,7 @@ def get_location_name():
     return get_config().location_name
 
 
-def get_location():
+def get_location() -> Location:
     """
     Returns location as an enum instead of a string.
 
@@ -67,7 +88,7 @@ def get_location():
     return get_config().location
 
 
-def is_anyone_present_wrapper(location: Location):
+def _is_anyone_present_wrapper(location: Location):
     import base_presence
 
     p = base_presence.PresenceDetection()
@@ -82,15 +103,18 @@ def other_location() -> str:
     >>> x in set(['HOUSE', 'CABIN'])
     True
 
+    >>> y = this_location()
+    >>> x == y
+    False
+
     """
-    hostname = platform.node()
-    if '.house' in hostname:
-        location = 'CABIN'
-    elif '.cabin' in hostname:
-        location = 'HOUSE'
+    this = this_location()
+    if this == 'HOUSE':
+        return 'CABIN'
+    elif this == 'CABIN':
+        return 'HOUSE'
     else:
-        raise Exception(f"{hostname} doesn't help me know where I'm running?!")
-    return location
+        raise Exception(f"{this} doesn't tell me where I'm running?!")
 
 
 def this_location() -> str:
@@ -107,6 +131,8 @@ def this_location() -> str:
         location = 'HOUSE'
     elif '.cabin' in hostname:
         location = 'CABIN'
+    elif '.local' in hostname:
+        location = 'HOUSE'
     else:
         raise Exception(f"{hostname} doesn't help me know where I'm running?!")
     return location
@@ -157,7 +183,7 @@ def get_config(location_override: Optional[str] = None):
             network_netmask='255.255.255.0',
             network_router_ip='10.0.0.1',
             presence_location=Location.HOUSE,
-            is_anyone_present=lambda x=Location.HOUSE: is_anyone_present_wrapper(x),
+            is_anyone_present=lambda x=Location.HOUSE: _is_anyone_present_wrapper(x),
             arper_minimum_device_count=50,
             arper_cache_file='/home/scott/cache/.arp_table_cache_house',
         )
@@ -169,7 +195,7 @@ def get_config(location_override: Optional[str] = None):
             network_netmask='255.255.255.0',
             network_router_ip='192.168.0.1',
             presence_location=Location.CABIN,
-            is_anyone_present=lambda x=Location.CABIN: is_anyone_present_wrapper(x),
+            is_anyone_present=lambda x=Location.CABIN: _is_anyone_present_wrapper(x),
             arper_minimum_device_count=15,
             arper_cache_file='/home/scott/cache/.arp_table_cache_cabin',
         )