projects
/
python_utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5724b9e
)
Detect unknown persons at the cabin.
author
Scott Gasch
<
[email protected]
>
Sat, 24 Apr 2021 00:15:05 +0000
(17:15 -0700)
committer
Scott Gasch
<
[email protected]
>
Sat, 24 Apr 2021 00:15:05 +0000
(17:15 -0700)
presence.py
patch
|
blob
|
history
diff --git
a/presence.py
b/presence.py
index bd931f63933c553a67fc970da6478cb19e03eff9..02f85d6bde44013260f791491e63b6e5981a10d6 100644
(file)
--- a/
presence.py
+++ b/
presence.py
@@
-77,6
+77,7
@@
class PresenceDetection(object):
"96:69:2C:88:7A:C3",
],
}
"96:69:2C:88:7A:C3",
],
}
+ self.weird_mac_at_cabin = False
self.location_ts_by_mac: Dict[
Location, Dict[str, datetime.datetime]
] = defaultdict(dict)
self.location_ts_by_mac: Dict[
Location, Dict[str, datetime.datetime]
] = defaultdict(dict)
@@
-87,7
+88,6
@@
class PresenceDetection(object):
"ssh
[email protected]
'cat /home/scott/cron/persisted_mac_addresses.txt'"
)
self.parse_raw_macs_file(raw, Location.CABIN)
"ssh
[email protected]
'cat /home/scott/cron/persisted_mac_addresses.txt'"
)
self.parse_raw_macs_file(raw, Location.CABIN)
- # os.remove(filename)
def read_persisted_macs_file(
self, filename: str, location: Location
def read_persisted_macs_file(
self, filename: str, location: Location
@@
-102,11
+102,16
@@
class PresenceDetection(object):
lines = raw.split("\n")
# CC:F4:11:D7:FA:EE, 2240, 10.0.0.22 (side_deck_high_home), Google, 1611681990
lines = raw.split("\n")
# CC:F4:11:D7:FA:EE, 2240, 10.0.0.22 (side_deck_high_home), Google, 1611681990
+ cabin_count = 0
for line in lines:
line = line.strip()
if len(line) == 0:
continue
logger.debug(f'{location}> {line}')
for line in lines:
line = line.strip()
if len(line) == 0:
continue
logger.debug(f'{location}> {line}')
+ if "cabin_" in line:
+ continue
+ if location == Location.CABIN:
+ cabin_count += 1
try:
(mac, count, ip_name, mfg, ts) = line.split(",")
except Exception as e:
try:
(mac, count, ip_name, mfg, ts) = line.split(",")
except Exception as e:
@@
-122,6
+127,8
@@
class PresenceDetection(object):
if match is not None:
name = match.group(2)
self.names_by_mac[mac] = name
if match is not None:
name = match.group(2)
self.names_by_mac[mac] = name
+ if cabin_count > 0:
+ self.weird_mac_at_cabin = True
def is_anyone_in_location_now(self, location: Location) -> bool:
for person in Person:
def is_anyone_in_location_now(self, location: Location) -> bool:
for person in Person:
@@
-129,11
+136,16
@@
class PresenceDetection(object):
loc = self.where_is_person_now(person)
if location == loc:
return True
loc = self.where_is_person_now(person)
if location == loc:
return True
+ if location == location.CABIN and self.weird_mac_at_cabin:
+ return True
return False
def where_is_person_now(self, name: Person) -> Location:
if name is Person.UNKNOWN:
return False
def where_is_person_now(self, name: Person) -> Location:
if name is Person.UNKNOWN:
- return Location.UNKNOWN
+ if self.weird_mac_at_cabin:
+ return Location.CABIN
+ else:
+ return Location.UNKNOWN
votes: Dict[Location, int] = {}
tiebreaks: Dict[Location, datetime.datetime] = {}
credit = 10000
votes: Dict[Location, int] = {}
tiebreaks: Dict[Location, datetime.datetime] = {}
credit = 10000
@@
-150,7
+162,7
@@
class PresenceDetection(object):
credit = int(
credit * 0.667
) # Note: list most important devices first
credit = int(
credit * 0.667
) # Note: list most important devices first
- if credit
=
= 0:
+ if credit
<
= 0:
credit = 1
if len(votes) > 0:
item = dict_utils.item_with_max_value(votes)
credit = 1
if len(votes) > 0:
item = dict_utils.item_with_max_value(votes)