mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-02-07 03:35:26 +03:00
Use different separator due to timezone
This commit is contained in:
parent
eae73950dc
commit
d3044c5449
@ -866,7 +866,7 @@ class CameraConfig(FrigateBaseModel):
|
|||||||
|
|
||||||
ffmpeg_output_args = (
|
ffmpeg_output_args = (
|
||||||
record_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
|
+ ffmpeg_output_args
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -105,7 +105,7 @@ class RecordingMaintainer(threading.Thread):
|
|||||||
|
|
||||||
cache_path = os.path.join(CACHE_DIR, cache)
|
cache_path = os.path.join(CACHE_DIR, cache)
|
||||||
basename = os.path.splitext(cache)[0]
|
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
|
# important that start_time is utc because recordings are stored and compared in utc
|
||||||
start_time = datetime.datetime.strptime(
|
start_time = datetime.datetime.strptime(
|
||||||
|
|||||||
@ -306,7 +306,7 @@ class CameraWatchdog(threading.Thread):
|
|||||||
for file in cache_files:
|
for file in cache_files:
|
||||||
if self.camera_name in file:
|
if self.camera_name in file:
|
||||||
basename = os.path.splitext(file)[0]
|
basename = os.path.splitext(file)[0]
|
||||||
_, date = basename.rsplit("-", maxsplit=1)
|
_, date = basename.rsplit("@", maxsplit=1)
|
||||||
segment_time = datetime.datetime.strptime(
|
segment_time = datetime.datetime.strptime(
|
||||||
date, CACHE_SEGMENT_FORMAT
|
date, CACHE_SEGMENT_FORMAT
|
||||||
).astimezone(datetime.timezone.utc)
|
).astimezone(datetime.timezone.utc)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user