projects
/
kiosk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mypy clean
[kiosk.git]
/
camera_trigger.py
diff --git
a/camera_trigger.py
b/camera_trigger.py
index 620a5b2fd62f27587cac6c096583eb94f42e90a5..b47a26ed4dfd9023ff45de49503808a757b7be4a 100644
(file)
--- a/
camera_trigger.py
+++ b/
camera_trigger.py
@@
-4,7
+4,7
@@
from datetime import datetime
import glob
import os
import time
import glob
import os
import time
-from typing import List, Tuple
+from typing import List, Tuple
, Optional
import trigger
import utils
import trigger
import utils
@@
-39,7
+39,7
@@
class any_camera_trigger(trigger.trigger):
priority += trigger.trigger.PRIORITY_LOW
return priority
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
"""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
):
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(
print(
- f"{
ts}: ****** {camera}[{priority}] CAMERA TRIGGER ***
***"
+ f"{
utils.timestamp()}: *** {camera}[{priority}] CAMERA TRIGGER
***"
)
triggers.append(
(
)
triggers.append(
(
@@
-90,7
+89,7
@@
class any_camera_trigger(trigger.trigger):
)
)
else:
)
)
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
except Exception as e:
print(e)
pass