From d3044c54496141a813a5c2e837fd15508c21ecb5 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Sun, 5 Nov 2023 06:20:58 -0700 Subject: [PATCH] Use different separator due to timezone --- frigate/config.py | 2 +- frigate/record/maintainer.py | 2 +- frigate/video.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frigate/config.py b/frigate/config.py index a09c3b544..777cdc152 100644 --- a/frigate/config.py +++ b/frigate/config.py @@ -866,7 +866,7 @@ class CameraConfig(FrigateBaseModel): ffmpeg_output_args = ( record_args - + [f"{os.path.join(CACHE_DIR, self.name)}-{CACHE_SEGMENT_FORMAT}.mp4"] + + [f"{os.path.join(CACHE_DIR, self.name)}@{CACHE_SEGMENT_FORMAT}.mp4"] + ffmpeg_output_args ) diff --git a/frigate/record/maintainer.py b/frigate/record/maintainer.py index 98aad3c07..8e9f900bb 100644 --- a/frigate/record/maintainer.py +++ b/frigate/record/maintainer.py @@ -105,7 +105,7 @@ class RecordingMaintainer(threading.Thread): cache_path = os.path.join(CACHE_DIR, cache) basename = os.path.splitext(cache)[0] - camera, date = basename.rsplit("-", maxsplit=1) + camera, date = basename.rsplit("@", maxsplit=1) # important that start_time is utc because recordings are stored and compared in utc start_time = datetime.datetime.strptime( diff --git a/frigate/video.py b/frigate/video.py index 0ae3997d9..b5fafec0b 100755 --- a/frigate/video.py +++ b/frigate/video.py @@ -306,7 +306,7 @@ class CameraWatchdog(threading.Thread): for file in cache_files: if self.camera_name in file: basename = os.path.splitext(file)[0] - _, date = basename.rsplit("-", maxsplit=1) + _, date = basename.rsplit("@", maxsplit=1) segment_time = datetime.datetime.strptime( date, CACHE_SEGMENT_FORMAT ).astimezone(datetime.timezone.utc)