From 9137f1594b11a60f9696cc52318862b2c3b08507 Mon Sep 17 00:00:00 2001 From: Nicolas Mowen Date: Fri, 30 Jun 2023 06:13:00 -0600 Subject: [PATCH] Remove legacy recordings file cleanup (#6947) * Remove legacy recordings file cleanup * Remove unused --- frigate/const.py | 1 - frigate/record/cleanup.py | 64 +++++---------------------------------- 2 files changed, 7 insertions(+), 58 deletions(-) diff --git a/frigate/const.py b/frigate/const.py index 28ce766e4..c1524a6a8 100644 --- a/frigate/const.py +++ b/frigate/const.py @@ -38,5 +38,4 @@ DRIVER_INTEL_iHD = "iHD" # Record Values MAX_SEGMENT_DURATION = 600 -SECONDS_IN_DAY = 60 * 60 * 24 MAX_PLAYLIST_SECONDS = 7200 # support 2 hour segments for a single playlist to account for cameras with inconsistent segment times diff --git a/frigate/record/cleanup.py b/frigate/record/cleanup.py index bb5022c93..a48b3fef7 100644 --- a/frigate/record/cleanup.py +++ b/frigate/record/cleanup.py @@ -8,10 +8,10 @@ import threading from multiprocessing.synchronize import Event as MpEvent from pathlib import Path -from peewee import DatabaseError, DoesNotExist, chunked +from peewee import DatabaseError, chunked from frigate.config import FrigateConfig, RetainModeEnum -from frigate.const import RECORD_DIR, SECONDS_IN_DAY +from frigate.const import RECORD_DIR from frigate.models import Event, Recordings, RecordingsToDelete, Timeline from frigate.record.util import remove_empty_directories @@ -28,7 +28,7 @@ class RecordingCleanup(threading.Thread): self.stop_event = stop_event def clean_tmp_clips(self) -> None: - # delete any clips more than 5 minutes old + """delete any clips in the cache that are more than 5 minutes old.""" for p in Path("/tmp/cache").rglob("clip_*.mp4"): logger.debug(f"Checking tmp clip {p}.") if p.stat().st_mtime < (datetime.datetime.now().timestamp() - 60 * 1): @@ -40,8 +40,8 @@ class RecordingCleanup(threading.Thread): p.unlink(missing_ok=True) def expire_recordings(self) -> None: - logger.debug("Start expire recordings (new).") - + """Delete recordings based on retention config.""" + logger.debug("Start expire recordings.") logger.debug("Start deleted cameras.") # Handle deleted cameras expire_days = self.config.record.retain.days @@ -161,59 +161,10 @@ class RecordingCleanup(threading.Thread): logger.debug(f"End camera: {camera}.") logger.debug("End all cameras.") - logger.debug("End expire recordings (new).") - - def expire_files(self) -> None: - logger.debug("Start expire files (legacy).") - - default_expire = ( - datetime.datetime.now().timestamp() - - SECONDS_IN_DAY * self.config.record.retain.days - ) - delete_before = {} - - for name, camera in self.config.cameras.items(): - delete_before[name] = ( - datetime.datetime.now().timestamp() - - SECONDS_IN_DAY * camera.record.retain.days - ) - - # find all the recordings older than the oldest recording in the db - try: - oldest_recording = ( - Recordings.select().order_by(Recordings.start_time).limit(1).get() - ) - - p = Path(oldest_recording.path) - oldest_timestamp = p.stat().st_mtime - 1 - except DoesNotExist: - oldest_timestamp = datetime.datetime.now().timestamp() - except FileNotFoundError: - logger.warning(f"Unable to find file from recordings database: {p}") - Recordings.delete().where(Recordings.id == oldest_recording.id).execute() - return - - logger.debug(f"Oldest recording in the db: {oldest_timestamp}") - - files_to_check = [] - - for root, _, files in os.walk(RECORD_DIR): - for file in files: - file_path = os.path.join(root, file) - if os.path.getmtime(file_path) < oldest_timestamp: - files_to_check.append(file_path) - - for f in files_to_check: - p = Path(f) - try: - if p.stat().st_mtime < delete_before.get(p.parent.name, default_expire): - p.unlink(missing_ok=True) - except FileNotFoundError: - logger.warning(f"Attempted to expire missing file: {f}") - - logger.debug("End expire files (legacy).") + logger.debug("End expire recordings.") def sync_recordings(self) -> None: + """Check the db for stale recordings entries that don't exist in the filesystem.""" logger.debug("Start sync recordings.") # get all recordings in the db @@ -283,5 +234,4 @@ class RecordingCleanup(threading.Thread): if counter == 0: self.expire_recordings() - self.expire_files() remove_empty_directories(RECORD_DIR)