Logic fixes

This commit is contained in:
Nicolas Mowen 2024-02-20 05:55:06 -07:00
parent dcdecee564
commit 1fb943ac47

View File

@ -100,7 +100,7 @@ class ReviewSegmentMaintainer(threading.Thread):
active_objects = [ active_objects = [
o o
for o in objects for o in objects
if o["motionless_count"] > camera_config.detect.stationary.threshold if o["motionless_count"] < camera_config.detect.stationary.threshold
] ]
if len(active_objects) > 0: if len(active_objects) > 0:
@ -114,7 +114,8 @@ class ReviewSegmentMaintainer(threading.Thread):
segment.objects.add(object["label"]) segment.objects.add(object["label"])
if ( if (
object["has_clip"] segment.severity == SeverityEnum.detection
and object["has_clip"]
and object["label"] in camera_config.objects.alert and object["label"] in camera_config.objects.alert
): ):
segment.severity = SeverityEnum.alert segment.severity = SeverityEnum.alert
@ -125,11 +126,13 @@ class ReviewSegmentMaintainer(threading.Thread):
segment.severity == SeverityEnum.signification_motion and len(motion) >= 20 segment.severity == SeverityEnum.signification_motion and len(motion) >= 20
): ):
segment.last_update = frame_time segment.last_update = frame_time
elif frame_time > ( else:
segment.last_update if segment.severity == SeverityEnum.alert and frame_time > (
+ (camera_config.detect.max_disappeared / camera_config.detect.fps) segment.last_update + 60
): ):
self.end_segment(segment) self.end_segment(segment)
elif frame_time > (segment.last_update + 10):
self.end_segment(segment)
def check_if_new_segment( def check_if_new_segment(
self, self,
@ -143,7 +146,7 @@ class ReviewSegmentMaintainer(threading.Thread):
active_objects = [ active_objects = [
o o
for o in objects for o in objects
if o["motionless_count"] > camera_config.detect.stationary.threshold if o["motionless_count"] < camera_config.detect.stationary.threshold
] ]
if len(active_objects) > 0: if len(active_objects) > 0: