More cleanup.

[kiosk.git] / camera_trigger.py

diff --git a/camera_trigger.py b/camera_trigger.py
index 0e9ac6d8752860b8b5a22a3278749b33feda336d..41dc809c300b844b4289acabc2ed3cbe1638e845 100644 (file)
--- a/camera_trigger.py
+++ b/camera_trigger.py
@@ -56,16 +56,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
-                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:
+                    print(f'Camera: {camera}, age {age}')
                     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:
-                        x.strip()
+                        x = x.strip()
                         age = now - int(x)
                         if age < (60 * 7):
                             self.triggers_in_the_past_seven_min[camera] += 1
@@ -81,6 +83,7 @@ class any_camera_trigger(trigger.trigger):
                         self.triggers_in_the_past_seven_min[camera] <= 4
                         or num_cameras_with_recent_triggers > 1
                     ):
+                        age = now - self.last_trigger_timestamp[camera]
                         priority = self.choose_priority(camera, int(age))
                         print(
                             f"{utils.timestamp()}: *** {camera}[{priority}] CAMERA TRIGGER ***"