Exclude historical data

This commit is contained in:
Nicolas Mowen 2024-03-14 09:23:46 -06:00
parent fe38f450df
commit bf92ccb25d
2 changed files with 12 additions and 5 deletions

View File

@ -363,6 +363,7 @@ def motion_activity():
) )
clauses = [(Recordings.start_time > after) & (Recordings.end_time < before)] clauses = [(Recordings.start_time > after) & (Recordings.end_time < before)]
clauses.append((Recordings.motion <= 100))
if cameras != "all": if cameras != "all":
camera_list = cameras.split(",") camera_list = cameras.split(",")

View File

@ -71,7 +71,7 @@ class RecordingMaintainer(threading.Thread):
self.audio_recordings_info: dict[str, list] = defaultdict(list) self.audio_recordings_info: dict[str, list] = defaultdict(list)
self.end_time_cache: dict[str, Tuple[datetime.datetime, float]] = {} self.end_time_cache: dict[str, Tuple[datetime.datetime, float]] = {}
self.camera_frame_area = dict[str, int] self.camera_frame_area: dict[str, int] = {}
for camera in self.config.cameras.values(): for camera in self.config.cameras.values():
self.camera_frame_area[camera.name] = ( self.camera_frame_area[camera.name] = (
@ -318,10 +318,16 @@ class RecordingMaintainer(threading.Thread):
total_motion_area += sum([area(box) for box in frame[2]]) total_motion_area += sum([area(box) for box in frame[2]])
normalized_motion_area = int( if video_frame_count > 0:
(total_motion_area / (self.camera_frame_area[camera] * video_frame_count)) normalized_motion_area = int(
* 100 (
) total_motion_area
/ (self.camera_frame_area[camera] * video_frame_count)
)
* 100
)
else:
normalized_motion_area = 0
audio_values = [] audio_values = []
for frame in self.audio_recordings_info[camera]: for frame in self.audio_recordings_info[camera]: