Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

simplify logic and fix wrong segments expiring (fixes #1779)

Browse Source
This commit is contained in:
Blake Blackshear 2021-09-17 17:15:02 -05:00
parent bc350644bd
commit 5a8016de87
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
frigate/record.py
View File

@ -196,7 +196,7 @@ class RecordingCleanup(threading.Thread):
Recordings.camera == camera, Recordings.camera == camera,
Recordings.end_time < expire_date, Recordings.end_time < expire_date,
) )
.order_by(Recordings.start_time.desc()) .order_by(Recordings.start_time)
) )
# Get all the events to check against # Get all the events to check against
@ -205,7 +205,7 @@ class RecordingCleanup(threading.Thread):
.where( .where(
Event.camera == camera, Event.end_time < expire_date, Event.has_clip Event.camera == camera, Event.end_time < expire_date, Event.has_clip
) )
.order_by(Event.start_time.desc()) .order_by(Event.start_time)
.objects() .objects()
) )
@ -214,21 +214,28 @@ class RecordingCleanup(threading.Thread):
deleted_recordings = set() deleted_recordings = set()
for recording in recordings.objects().iterator(): for recording in recordings.objects().iterator():
keep = False keep = False
# since the events and recordings are sorted, we can skip events # Now look for a reason to keep this recording segment
# that start after the previous recording segment ended
for idx in range(event_start, len(events)): for idx in range(event_start, len(events)):
event = events[idx] event = events[idx]
# if the next event ends before this segment starts, break # if the event starts in the future, stop checking events
if event.end_time < recording.start_time: # and let this recording segment expire
if event.start_time > recording.end_time:
keep = False
break break
# if the next event starts after the current segment ends, skip it # if the event ends after the recording starts, keep it
if event.start_time > recording.end_time: # and stop looking at events
event_start = idx if event.end_time >= recording.start_time:
continue keep = True
break
keep = True # if the event ends before this recording segment starts, skip
# this event and check the next event for an overlap.
# since the events and recordings are sorted, we can skip events
# that end before the previous recording segment started on future segments
if event.end_time < recording.start_time:
event_start = idx
# Delete recordings outside of the retention window # Delete recordings outside of the retention window
if not keep: if not keep:
@ -236,7 +243,7 @@ class RecordingCleanup(threading.Thread):
deleted_recordings.add(recording.id) deleted_recordings.add(recording.id)
logger.debug(f"Expiring {len(deleted_recordings)} recordings") logger.debug(f"Expiring {len(deleted_recordings)} recordings")
(Recordings.delete().where(Recordings.id << deleted_recordings).execute()) Recordings.delete().where(Recordings.id << deleted_recordings).execute()
logger.debug(f"End camera: {camera}.") logger.debug(f"End camera: {camera}.")