From d0b38f0a473bdc52ffeb0f20b697b6e6db77b843 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 29 Jul 2023 20:19:21 +0200 Subject: [PATCH] Reuse CACHE_DIR constant (#7306) --- frigate/http.py | 10 ++++++++-- frigate/record/cleanup.py | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/frigate/http.py b/frigate/http.py index 6cf552c9f..1cce6968e 100644 --- a/frigate/http.py +++ b/frigate/http.py @@ -30,7 +30,13 @@ from playhouse.sqliteq import SqliteQueueDatabase from tzlocal import get_localzone_name from frigate.config import FrigateConfig -from frigate.const import CLIPS_DIR, CONFIG_DIR, MAX_SEGMENT_DURATION, RECORD_DIR +from frigate.const import ( + CACHE_DIR, + CLIPS_DIR, + CONFIG_DIR, + MAX_SEGMENT_DURATION, + RECORD_DIR, +) from frigate.events.external import ExternalEventProcessor from frigate.models import Event, Recordings, Timeline from frigate.object_processing import TrackedObject @@ -1441,7 +1447,7 @@ def recording_clip(camera_name, start_ts, end_ts): playlist_lines.append(f"outpoint {int(end_ts - clip.start_time)}") file_name = f"clip_{camera_name}_{start_ts}-{end_ts}.mp4" - path = f"/tmp/cache/{file_name}" + path = os.path.join(CACHE_DIR, file_name) if not os.path.exists(path): ffmpeg_cmd = [ diff --git a/frigate/record/cleanup.py b/frigate/record/cleanup.py index 33fcbe398..cb312b6fd 100644 --- a/frigate/record/cleanup.py +++ b/frigate/record/cleanup.py @@ -11,7 +11,7 @@ from pathlib import Path from peewee import DatabaseError, chunked from frigate.config import FrigateConfig, RetainModeEnum -from frigate.const import RECORD_DIR +from frigate.const import CACHE_DIR, RECORD_DIR from frigate.models import Event, Recordings, RecordingsToDelete from frigate.record.util import remove_empty_directories @@ -29,7 +29,7 @@ class RecordingCleanup(threading.Thread): def clean_tmp_clips(self) -> None: """delete any clips in the cache that are more than 5 minutes old.""" - for p in Path("/tmp/cache").rglob("clip_*.mp4"): + for p in Path(CACHE_DIR).rglob("clip_*.mp4"): logger.debug(f"Checking tmp clip {p}.") if p.stat().st_mtime < (datetime.datetime.now().timestamp() - 60 * 1): logger.debug("Deleting tmp clip.")