Reuse CACHE_DIR constant (#7306)

This commit is contained in:
Martin Weinelt 2023-07-29 20:19:21 +02:00 committed by GitHub
parent b79b1d9443
commit d0b38f0a47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions

View File

@ -30,7 +30,13 @@ from playhouse.sqliteq import SqliteQueueDatabase
from tzlocal import get_localzone_name from tzlocal import get_localzone_name
from frigate.config import FrigateConfig 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.events.external import ExternalEventProcessor
from frigate.models import Event, Recordings, Timeline from frigate.models import Event, Recordings, Timeline
from frigate.object_processing import TrackedObject 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)}") playlist_lines.append(f"outpoint {int(end_ts - clip.start_time)}")
file_name = f"clip_{camera_name}_{start_ts}-{end_ts}.mp4" 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): if not os.path.exists(path):
ffmpeg_cmd = [ ffmpeg_cmd = [

View File

@ -11,7 +11,7 @@ from pathlib import Path
from peewee import DatabaseError, chunked from peewee import DatabaseError, chunked
from frigate.config import FrigateConfig, RetainModeEnum 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.models import Event, Recordings, RecordingsToDelete
from frigate.record.util import remove_empty_directories from frigate.record.util import remove_empty_directories
@ -29,7 +29,7 @@ class RecordingCleanup(threading.Thread):
def clean_tmp_clips(self) -> None: def clean_tmp_clips(self) -> None:
"""delete any clips in the cache that are 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"): for p in Path(CACHE_DIR).rglob("clip_*.mp4"):
logger.debug(f"Checking tmp clip {p}.") logger.debug(f"Checking tmp clip {p}.")
if p.stat().st_mtime < (datetime.datetime.now().timestamp() - 60 * 1): if p.stat().st_mtime < (datetime.datetime.now().timestamp() - 60 * 1):
logger.debug("Deleting tmp clip.") logger.debug("Deleting tmp clip.")