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

Ensure event image cleanup doesn't fail

Browse Source
This commit is contained in:
Nicolas Mowen 2024-04-18 09:35:39 -06:00
parent bff3643c07
commit e229685c70
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
frigate/events/cleanup.py
View File

@ -83,7 +83,7 @@ class EventCleanup(threading.Thread):
datetime.datetime.now() - datetime.timedelta(days=expire_days) datetime.datetime.now() - datetime.timedelta(days=expire_days)
).timestamp() ).timestamp()
# grab all events after specific time # grab all events after specific time
expired_events = ( expired_events: list[Event] = (
Event.select( Event.select(
Event.id, Event.id,
Event.camera, Event.camera,
@ -103,12 +103,16 @@ class EventCleanup(threading.Thread):
media_path = Path( media_path = Path(
f"{os.path.join(CLIPS_DIR, media_name)}.{file_extension}" f"{os.path.join(CLIPS_DIR, media_name)}.{file_extension}"
) )
media_path.unlink(missing_ok=True)
if file_extension == "jpg": try:
media_path = Path(
f"{os.path.join(CLIPS_DIR, media_name)}-clean.png"
)
media_path.unlink(missing_ok=True) media_path.unlink(missing_ok=True)
if file_extension == "jpg":
media_path = Path(
f"{os.path.join(CLIPS_DIR, media_name)}-clean.png"
)
media_path.unlink(missing_ok=True)
except OSError as e:
logger.warning(f"Unable to delete event images: {e}")
# update the clips attribute for the db entry # update the clips attribute for the db entry
update_query = Event.update(update_params).where( update_query = Event.update(update_params).where(
@ -163,15 +167,18 @@ class EventCleanup(threading.Thread):
events_to_update.append(event.id) events_to_update.append(event.id)
if media_type == EventCleanupType.snapshots: if media_type == EventCleanupType.snapshots:
media_name = f"{event.camera}-{event.id}" try:
media_path = Path( media_name = f"{event.camera}-{event.id}"
f"{os.path.join(CLIPS_DIR, media_name)}.{file_extension}" media_path = Path(
) f"{os.path.join(CLIPS_DIR, media_name)}.{file_extension}"
media_path.unlink(missing_ok=True) )
media_path = Path( media_path.unlink(missing_ok=True)
f"{os.path.join(CLIPS_DIR, media_name)}-clean.png" media_path = Path(
) f"{os.path.join(CLIPS_DIR, media_name)}-clean.png"
media_path.unlink(missing_ok=True) )
media_path.unlink(missing_ok=True)
except OSError as e:
logger.warning(f"Unable to delete event images: {e}")
# update the clips attribute for the db entry # update the clips attribute for the db entry
Event.update(update_params).where(Event.id << events_to_update).execute() Event.update(update_params).where(Event.id << events_to_update).execute()
@ -195,14 +202,18 @@ class EventCleanup(threading.Thread):
select distinct id, camera, has_snapshot, has_clip from grouped_events select distinct id, camera, has_snapshot, has_clip from grouped_events
where copy_number > 1 and end_time not null;""" where copy_number > 1 and end_time not null;"""
duplicate_events = Event.raw(duplicate_query) duplicate_events: list[Event] = Event.raw(duplicate_query)
for event in duplicate_events: for event in duplicate_events:
logger.debug(f"Removing duplicate: {event.id}") logger.debug(f"Removing duplicate: {event.id}")
media_name = f"{event.camera}-{event.id}"
media_path = Path(f"{os.path.join(CLIPS_DIR, media_name)}.jpg") try:
media_path.unlink(missing_ok=True) media_name = f"{event.camera}-{event.id}"
media_path = Path(f"{os.path.join(CLIPS_DIR, media_name)}-clean.png") media_path = Path(f"{os.path.join(CLIPS_DIR, media_name)}.jpg")
media_path.unlink(missing_ok=True) media_path.unlink(missing_ok=True)
media_path = Path(f"{os.path.join(CLIPS_DIR, media_name)}-clean.png")
media_path.unlink(missing_ok=True)
except OSError as e:
logger.warning(f"Unable to delete event images: {e}")
( (
Event.delete() Event.delete()