X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=camera_trigger.py;h=3eebe2a092947f32ab4204dd4b5f653ca13c71d7;hb=09215cf1a1498c99ee75a7cbef3ea62f58a56f0d;hp=0e9ac6d8752860b8b5a22a3278749b33feda336d;hpb=5c39d86ebc075ccb7be98b1dfab8040b72ff9134;p=kiosk.git

diff --git a/camera_trigger.py b/camera_trigger.py
index 0e9ac6d..3eebe2a 100644
--- a/camera_trigger.py
+++ b/camera_trigger.py
@@ -1,13 +1,14 @@
 #!/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 utils
+
+
+logger = logging.getLogger(__name__)
 
 
 class any_camera_trigger(trigger.trigger):
@@ -56,50 +57,70 @@ 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
+                print(f"{camera} => {age}")
+                if ts != self.last_trigger_timestamp[camera]:
                     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()
-                        age = now - int(x)
-                        if age < (60 * 7):
-                            self.triggers_in_the_past_seven_min[camera] += 1
+                    if age < 15:
+                        logger.info(
+                            f"{camera} is triggered; {filename} touched {age}s ago (@{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 = x.strip()
+                            age = now - int(x)
+                            if age < (60 * 7):
+                                self.triggers_in_the_past_seven_min[camera] += 1
+                                print(
+                                    f"{camera} past 7m: {self.triggers_in_the_past_seven_min[camera]}"
+                                )
 
             # Second pass, see whether we want to trigger due to
             # camera activity we found.  All cameras timestamps were
             # just considered and should be up-to-date.  Some logic to
             # squelch spammy cameras unless more than one is triggered
             # at the same time.
+            print(f"{num_cameras_with_recent_triggers}")
             for camera in camera_list:
-                if (now - self.last_trigger_timestamp[camera]) < 10:
+                if (now - self.last_trigger_timestamp[camera]) < 15:
                     if (
                         self.triggers_in_the_past_seven_min[camera] <= 4
                         or num_cameras_with_recent_triggers > 1
                     ):
+                        print(
+                            f"{camera} has {self.triggers_in_the_past_seven_min[camera]} triggers in the past 7d."
+                        )
+                        print(
+                            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))
                         print(
-                            f"{utils.timestamp()}: *** {camera}[{priority}] CAMERA TRIGGER ***"
+                            f"*** CAMERA TRIGGER (hidden/{camera}.html @ {priority}) ***"
                         )
                         triggers.append(
                             (
-                                f"hidden/{camera}.html",
+                                f"hidden/unwrapped_{camera}.html",
                                 priority,
                             )
                         )
                     else:
-                        print(f"{utils.timestamp()}: Camera {camera} too spammy, squelching it")
-        except Exception as e:
-            print(e)
-            pass
+                        logger.info(
+                            f"{camera} is too spammy; {self.triggers_in_the_past_seven_min[camera]} events in the past 7m.  Ignoring it."
+                        )
+        except Exception:
+            logger.exception()
 
         if len(triggers) == 0:
             return None
         else:
+            logger.info("There are active camera triggers!")
             return triggers