administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-04-15 11:32:09 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Cleanup ending

Browse Source
This commit is contained in:
Nicolas Mowen 2025-08-31 07:28:11 -06:00
parent 8efdcb89a0
commit 13fad9706d
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
frigate/review/maintainer.py
View File

@ -346,9 +346,10 @@ class ReviewSegmentMaintainer(threading.Thread):
self, self,
segment: PendingReviewSegment, segment: PendingReviewSegment,
prev_data: dict[str, Any], prev_data: dict[str, Any],
) -> None: ) -> float:
"""End segment.""" """End segment."""
final_data = segment.get_data(ended=True) final_data = segment.get_data(ended=True)
end_time = final_data[ReviewSegment.end_time.name]
self.requestor.send_data(UPSERT_REVIEW_SEGMENT, final_data) self.requestor.send_data(UPSERT_REVIEW_SEGMENT, final_data)
review_update = { review_update = {
"type": "end", "type": "end",
@ -362,13 +363,14 @@ class ReviewSegmentMaintainer(threading.Thread):
self.review_publisher.publish(review_update, segment.camera) self.review_publisher.publish(review_update, segment.camera)
self.requestor.send_data(f"{segment.camera}/review_status", "NONE") self.requestor.send_data(f"{segment.camera}/review_status", "NONE")
self.active_review_segments[segment.camera] = None self.active_review_segments[segment.camera] = None
return end_time
def end_segment(self, camera: str) -> None: def forcibly_end_segment(self, camera: str) -> float:
"""End the pending segment for a camera.""" """Forcibly end the pending segment for a camera."""
segment = self.active_review_segments.get(camera) segment = self.active_review_segments.get(camera)
if segment: if segment:
prev_data = segment.get_data(False) prev_data = segment.get_data(False)
self._publish_segment_end(segment, prev_data) return self._publish_segment_end(segment, prev_data)
def update_existing_segment( def update_existing_segment(
self, self,
@ -478,7 +480,7 @@ class ReviewSegmentMaintainer(threading.Thread):
> frame_time > frame_time
) )
self._publish_segment_end(segment, prev_data) end_time = self._publish_segment_end(segment, prev_data)
if needs_new_detection: if needs_new_detection:
new_detections = {} new_detections = {}
@ -491,7 +493,7 @@ class ReviewSegmentMaintainer(threading.Thread):
self.active_review_segments[activity.camera_config.name] = ( self.active_review_segments[activity.camera_config.name] = (
PendingReviewSegment( PendingReviewSegment(
activity.camera_config.name, activity.camera_config.name,
frame_time, end_time,
SeverityEnum.detection, SeverityEnum.detection,
new_detections, new_detections,
sub_labels={}, sub_labels={},
@ -583,11 +585,11 @@ class ReviewSegmentMaintainer(threading.Thread):
if "record" in updated_topics: if "record" in updated_topics:
for camera in updated_topics["record"]: for camera in updated_topics["record"]:
self.end_segment(camera) self.forcibly_end_segment(camera)
if "enabled" in updated_topics: if "enabled" in updated_topics:
for camera in updated_topics["enabled"]: for camera in updated_topics["enabled"]:
self.end_segment(camera) self.forcibly_end_segment(camera)
(topic, data) = self.detection_subscriber.check_for_update(timeout=1) (topic, data) = self.detection_subscriber.check_for_update(timeout=1)
@ -637,7 +639,7 @@ class ReviewSegmentMaintainer(threading.Thread):
current_segment.severity == SeverityEnum.detection current_segment.severity == SeverityEnum.detection
and not self.config.cameras[camera].review.detections.enabled and not self.config.cameras[camera].review.detections.enabled
): ):
self.end_segment(camera) self.forcibly_end_segment(camera)
continue continue
# If we reach here, the segment can be processed (if it exists) # If we reach here, the segment can be processed (if it exists)