projects
/
kiosk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various changes including adding new stevens renderer.
[kiosk.git]
/
camera_trigger.py
diff --git
a/camera_trigger.py
b/camera_trigger.py
index 0e9ac6d8752860b8b5a22a3278749b33feda336d..8582889d285ab49750299facf60ab242a793effd 100644
(file)
--- a/
camera_trigger.py
+++ b/
camera_trigger.py
@@
-1,13
+1,14
@@
#!/usr/bin/env python3
#!/usr/bin/env python3
-from datetime import datetime
-import glob
+import logging
import os
import time
from typing import List, Tuple, Optional
import trigger
import os
import time
from typing import List, Tuple, Optional
import trigger
-import utils
+
+
+logger = logging.getLogger(__file__)
class any_camera_trigger(trigger.trigger):
class any_camera_trigger(trigger.trigger):
@@
-56,16
+57,18
@@
class any_camera_trigger(trigger.trigger):
for camera in camera_list:
filename = f"/timestamps/last_camera_motion_{camera}"
ts = os.stat(filename).st_ctime
for camera in camera_list:
filename = f"/timestamps/last_camera_motion_{camera}"
ts = os.stat(filename).st_ctime
- if ts != self.last_trigger_timestamp[camera] and (now - ts) < 10:
- print("Camera: %s, age %s" % (camera, (now - ts)))
+ age = now - ts
+ if ts != self.last_trigger_timestamp[camera] and age < 10:
+ logger.info(f'{camera} is triggered; {filename} touched {age}s ago (@{ts}')
self.last_trigger_timestamp[camera] = ts
num_cameras_with_recent_triggers += 1
self.last_trigger_timestamp[camera] = ts
num_cameras_with_recent_triggers += 1
+
self.triggers_in_the_past_seven_min[camera] = 0
filename = f"/timestamps/camera_motion_history_{camera}"
with open(filename, "r") as f:
contents = f.readlines()
for x in contents:
self.triggers_in_the_past_seven_min[camera] = 0
filename = f"/timestamps/camera_motion_history_{camera}"
with open(filename, "r") as f:
contents = f.readlines()
for x in contents:
- x.strip()
+ x
= x
.strip()
age = now - int(x)
if age < (60 * 7):
self.triggers_in_the_past_seven_min[camera] += 1
age = now - int(x)
if age < (60 * 7):
self.triggers_in_the_past_seven_min[camera] += 1
@@
-81,25
+84,27
@@
class any_camera_trigger(trigger.trigger):
self.triggers_in_the_past_seven_min[camera] <= 4
or num_cameras_with_recent_triggers > 1
):
self.triggers_in_the_past_seven_min[camera] <= 4
or num_cameras_with_recent_triggers > 1
):
+ logger.info(f'{camera} has {self.triggers_in_the_past_seven_min[camera]} triggers in the past 7d.')
+ logger.info(f'{num_cameras_with_recent_triggers} cameras are triggered right now.')
+
+ age = now - self.last_trigger_timestamp[camera]
priority = self.choose_priority(camera, int(age))
priority = self.choose_priority(camera, int(age))
- print(
- f"{utils.timestamp()}: *** {camera}[{priority}] CAMERA TRIGGER ***"
- )
+ logger.info(f'*** CAMERA TRIGGER (hidden/{camera}.html @ {priority}) ***')
triggers.append(
(
triggers.append(
(
- f"hidden/{camera}.html",
+ f"hidden/
unwrapped_
{camera}.html",
priority,
)
)
else:
priority,
)
)
else:
-
print(f"{utils.timestamp()}: Camera {camera} too spammy, squelching it"
)
+
logger.info(f'{camera} is too spammy; {self.triggers_in_the_past_seven_min[camera]} events in the past 7m. Ignoring it.'
)
except Exception as e:
except Exception as e:
- print(e)
- pass
+ logger.exception(e)
if len(triggers) == 0:
return None
else:
if len(triggers) == 0:
return None
else:
+ logger.info('There are active camera triggers!')
return triggers
return triggers