projects
/
python_utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various changes.
[python_utils.git]
/
presence.py
diff --git
a/presence.py
b/presence.py
old mode 100644
(file)
new mode 100755
(executable)
index
682855d
..
947ff08
--- a/
presence.py
+++ b/
presence.py
@@
-8,6
+8,7
@@
import re
from typing import Dict, List
import argparse_utils
from typing import Dict, List
import argparse_utils
+import bootstrap
import config
logger = logging.getLogger(__name__)
import config
logger = logging.getLogger(__name__)
@@
-47,10
+48,10
@@
class PresenceDetection(object):
# Note: list most important devices first.
self.devices_by_person: Dict[Person, List[str]] = {
Person.SCOTT: [
# Note: list most important devices first.
self.devices_by_person: Dict[Person, List[str]] = {
Person.SCOTT: [
- "3C:28:6D:10:6D:41",
- "
D4:61:2E:88:18:09",
- "6C:40:08:AE:DC:2E",
- "14:7D:DA:6A:20:D7",
+ "3C:28:6D:10:6D:41",
# pixel3
+ "
6C:40:08:AE:DC:2E", # laptop
+# "D4:61:2E:88:18:09", # watch
+# "14:7D:DA:6A:20:D7", # work laptop
],
Person.LYNN: [
"08:CC:27:63:26:14",
],
Person.LYNN: [
"08:CC:27:63:26:14",
@@
-111,6
+112,7
@@
class PresenceDetection(object):
if "cabin_" in line:
continue
if location == Location.CABIN:
if "cabin_" in line:
continue
if location == Location.CABIN:
+ logger.debug('Cabin count: {cabin_count}')
cabin_count += 1
try:
(mac, count, ip_name, mfg, ts) = line.split(",")
cabin_count += 1
try:
(mac, count, ip_name, mfg, ts) = line.split(",")
@@
-128,6
+130,7
@@
class PresenceDetection(object):
name = match.group(2)
self.names_by_mac[mac] = name
if cabin_count > 0:
name = match.group(2)
self.names_by_mac[mac] = name
if cabin_count > 0:
+ logger.debug('Weird MAC at the cabin')
self.weird_mac_at_cabin = True
def is_anyone_in_location_now(self, location: Location) -> bool:
self.weird_mac_at_cabin = True
def is_anyone_in_location_now(self, location: Location) -> bool:
@@
-152,15
+155,18
@@
class PresenceDetection(object):
tiebreaks: Dict[Location, datetime.datetime] = {}
credit = 10000
for mac in self.devices_by_person[name]:
tiebreaks: Dict[Location, datetime.datetime] = {}
credit = 10000
for mac in self.devices_by_person[name]:
+ logger.debug(f'Looking for {name}... check for mac {mac}')
if mac not in self.names_by_mac:
continue
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]
if mac not in self.names_by_mac:
continue
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(f'I saw {mac} at {location} at {ts}')
tiebreaks[location] = ts
location = dict_utils.key_with_min_value(tiebreaks)
v = votes.get(location, 0)
votes[location] = v + credit
tiebreaks[location] = ts
location = dict_utils.key_with_min_value(tiebreaks)
v = votes.get(location, 0)
votes[location] = v + credit
+ logger.debug('{name}: {location} gets {credit} votes.')
credit = int(
credit * 0.667
) # Note: list most important devices first
credit = int(
credit * 0.667
) # Note: list most important devices first
@@
-170,3
+176,17
@@
class PresenceDetection(object):
item = dict_utils.item_with_max_value(votes)
return item[0]
return Location.UNKNOWN
item = dict_utils.item_with_max_value(votes)
return item[0]
return Location.UNKNOWN
+
+
[email protected]
+def main() -> None:
+ p = PresenceDetection()
+ 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)}')
+
+
+if __name__ == '__main__':
+ main()