administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-12 22:25:24 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Show correct previous state when updating for end

Browse Source
This commit is contained in:
Nicolas Mowen 2024-06-23 06:32:05 -06:00
parent 9bbb88cdcb
commit 71a209ea7b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frigate/review/maintainer.py
View File

@ -201,6 +201,7 @@ class ReviewSegmentMaintainer(threading.Thread):
segment.update_frame(camera_config, frame, objects) segment.update_frame(camera_config, frame, objects)
new_data = segment.get_data(ended=False) new_data = segment.get_data(ended=False)
logger.error(f"comparing prev {prev_data} to new {new_data}")
self.requestor.send_data(UPSERT_REVIEW_SEGMENT, new_data) self.requestor.send_data(UPSERT_REVIEW_SEGMENT, new_data)
self.requestor.send_data( self.requestor.send_data(
"reviews", "reviews",
@ -213,7 +214,7 @@ class ReviewSegmentMaintainer(threading.Thread):
), ),
) )
def end_segment(self, segment: PendingReviewSegment) -> None: def end_segment(self, segment: PendingReviewSegment, prev_data: dict[str, any],) -> None:
"""End segment.""" """End segment."""
final_data = segment.get_data(ended=True) final_data = segment.get_data(ended=True)
self.requestor.send_data(UPSERT_REVIEW_SEGMENT, final_data) self.requestor.send_data(UPSERT_REVIEW_SEGMENT, final_data)
@ -223,7 +224,7 @@ class ReviewSegmentMaintainer(threading.Thread):
json.dumps( json.dumps(
{ {
"type": "end", "type": "end",
"before": end_data, "before": prev_data,
"after": end_data, "after": end_data,
} }
), ),
@ -309,9 +310,9 @@ class ReviewSegmentMaintainer(threading.Thread):
if segment.severity == SeverityEnum.alert and frame_time > ( if segment.severity == SeverityEnum.alert and frame_time > (
segment.last_update + THRESHOLD_ALERT_ACTIVITY segment.last_update + THRESHOLD_ALERT_ACTIVITY
): ):
self.end_segment(segment) self.end_segment(segment, prev_data)
elif frame_time > (segment.last_update + THRESHOLD_DETECTION_ACTIVITY): elif frame_time > (segment.last_update + THRESHOLD_DETECTION_ACTIVITY):
self.end_segment(segment) self.end_segment(segment, prev_data)
def check_if_new_segment( def check_if_new_segment(
self, self,