X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=camera_trigger.py;h=b47a26ed4dfd9023ff45de49503808a757b7be4a;hb=e4dca16bbd329afdb587e8488767d88e17777254;hp=620a5b2fd62f27587cac6c096583eb94f42e90a5;hpb=ba913d3c5ec6fd5e229398ebfe9e073aaae7d73c;p=kiosk.git

diff --git a/camera_trigger.py b/camera_trigger.py
index 620a5b2..b47a26e 100644
--- a/camera_trigger.py
+++ b/camera_trigger.py
@@ -4,7 +4,7 @@ from datetime import datetime
 import glob
 import os
 import time
-from typing import List, Tuple
+from typing import List, Tuple, Optional
 
 import trigger
 import utils
@@ -39,7 +39,7 @@ class any_camera_trigger(trigger.trigger):
             priority += trigger.trigger.PRIORITY_LOW
         return priority
 
-    def get_triggered_page_list(self) -> List[Tuple[str, int]]:
+    def get_triggered_page_list(self) -> Optional[List[Tuple[str, int]]]:
         """Return a list of triggered pages with priorities."""
         triggers = []
         num_cameras_with_recent_triggers = 0
@@ -78,10 +78,9 @@ class any_camera_trigger(trigger.trigger):
                         self.triggers_in_the_past_seven_min[camera] <= 4
                         or num_cameras_with_recent_triggers > 1
                     ):
-                        ts = utils.timestamp()
-                        priority = self.choose_priority(camera, age)
+                        priority = self.choose_priority(camera, int(age))
                         print(
-                            f"{ts}: ****** {camera}[{priority}] CAMERA TRIGGER ******"
+                            f"{utils.timestamp()}: *** {camera}[{priority}] CAMERA TRIGGER ***"
                         )
                         triggers.append(
                             (
@@ -90,7 +89,7 @@ class any_camera_trigger(trigger.trigger):
                             )
                         )
                     else:
-                        print(f"{ts}: Camera {camera} too spammy, squelching it")
+                        print(f"{utils.timestamp()}: Camera {camera} too spammy, squelching it")
         except Exception as e:
             print(e)
             pass