projects
/
python_utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a bug in sanity check image.
[python_utils.git]
/
base_presence.py
diff --git
a/base_presence.py
b/base_presence.py
index f18b870daceaa4e97cf47d5c7b68f90da1a2ed24..8be4d936d7a5e1e9be2027e8b3ad5b7ea47b98de 100755
(executable)
--- a/
base_presence.py
+++ b/
base_presence.py
@@
-1,5
+1,10
@@
#!/usr/bin/env python3
#!/usr/bin/env python3
+"""This is a module dealing with trying to guess a person's location
+based on the location of certain devices (e.g. phones, laptops)
+belonging to that person. It works with networks I run that log
+device MAC addresses active."""
+
import datetime
import logging
import re
import datetime
import logging
import re
@@
-38,6
+43,9
@@
cfg.add_argument(
class PresenceDetection(object):
class PresenceDetection(object):
+ """See above. This is a base class for determining a person's
+ location on networks I administer."""
+
def __init__(self) -> None:
# Note: list most important devices first.
self.devices_by_person: Dict[Person, List[str]] = {
def __init__(self) -> None:
# Note: list most important devices first.
self.devices_by_person: Dict[Person, List[str]] = {
@@
-219,17
+227,11
@@
class PresenceDetection(object):
if mac not in self.names_by_mac:
continue
mac_name = self.names_by_mac[mac]
if mac not in self.names_by_mac:
continue
mac_name = self.names_by_mac[mac]
- logger.debug(
- 'Looking for %s... check for mac %s (%s)',
- name, mac, mac_name
- )
+ logger.debug('Looking for %s... check for mac %s (%s)', name, mac, mac_name)
for location in self.location_ts_by_mac:
if mac in self.location_ts_by_mac[location]:
ts = (self.location_ts_by_mac[location])[mac]
for location in self.location_ts_by_mac:
if mac in self.location_ts_by_mac[location]:
ts = (self.location_ts_by_mac[location])[mac]
- logger.debug(
- 'Seen %s (%s) at %s since %s',
- mac, mac_name, location, ts
- )
+ logger.debug('Seen %s (%s) at %s since %s', mac, mac_name, location, ts)
tiebreaks[location] = ts
(
tiebreaks[location] = ts
(
@@
-257,10
+259,8
@@
def main() -> None:
for person in Person:
print(f'{person} => {p.where_is_person_now(person)}')
print()
for person in Person:
print(f'{person} => {p.where_is_person_now(person)}')
print()
-
-
-# for location in Location:
-# print(f'{location} => {p.is_anyone_in_location_now(location)}')
+ for location in Location:
+ print(f'{location} => {p.is_anyone_in_location_now(location)}')
if __name__ == '__main__':
if __name__ == '__main__':