administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-07 11:45:24 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Improve recordings sync reliability

Browse Source
This commit is contained in:
Nick Mowen 2023-11-17 09:51:22 -07:00
parent 7b520e8a9d
commit de4c6e2760
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frigate/record/util.py
View File

@ -31,13 +31,12 @@ def remove_empty_directories(directory: str) -> None:
def sync_recordings(limited: bool) -> None: def sync_recordings(limited: bool) -> None:
"""Check the db for stale recordings entries that don't exist in the filesystem.""" """Check the db for stale recordings entries that don't exist in the filesystem."""
def delete_db_entries_without_file(files_on_disk: list[str]) -> bool: def delete_db_entries_without_file(check_timestamp: float) -> bool:
"""Delete db entries where file was deleted outside of frigate.""" """Delete db entries where file was deleted outside of frigate."""
if limited: if limited:
recordings = Recordings.select(Recordings.id, Recordings.path).where( recordings = Recordings.select(Recordings.id, Recordings.path).where(
Recordings.start_time Recordings.start_time >= check_timestamp
>= (datetime.datetime.now() - datetime.timedelta(hours=36)).timestamp()
) )
else: else:
# get all recordings in the db # get all recordings in the db
@ -50,7 +49,7 @@ def sync_recordings(limited: bool) -> None:
for page in range(num_pages): for page in range(num_pages):
for recording in recordings.paginate(page, page_size): for recording in recordings.paginate(page, page_size):
if recording.path not in files_on_disk: if not os.path.exists(recording.path):
recordings_to_delete.add(recording.id) recordings_to_delete.add(recording.id)
# convert back to list of dictionaries for insertion # convert back to list of dictionaries for insertion
@ -106,9 +105,17 @@ def sync_recordings(limited: bool) -> None:
logger.debug("Start sync recordings.") logger.debug("Start sync recordings.")
# start checking on the hour 36 hours ago
check_point = datetime.datetime.now().replace(
minute=0, second=0, microsecond=0
).astimezone(datetime.timezone.utc) - datetime.timedelta(hours=36)
db_success = delete_db_entries_without_file(check_point.timestamp())
# only try to cleanup files if db cleanup was successful
if db_success:
if limited: if limited:
# get recording files from last 36 hours # get recording files from last 36 hours
hour_check = f"{RECORD_DIR}/{(datetime.datetime.now().astimezone(datetime.timezone.utc) - datetime.timedelta(hours=36)).strftime('%Y-%m-%d/%H')}" hour_check = f"{RECORD_DIR}/{check_point.strftime('%Y-%m-%d/%H')}"
files_on_disk = { files_on_disk = {
os.path.join(root, file) os.path.join(root, file)
for root, _, files in os.walk(RECORD_DIR) for root, _, files in os.walk(RECORD_DIR)
@ -123,10 +130,6 @@ def sync_recordings(limited: bool) -> None:
for file in files for file in files
} }
db_success = delete_db_entries_without_file(files_on_disk)
# only try to cleanup files if db cleanup was successful
if db_success:
delete_files_without_db_entry(files_on_disk) delete_files_without_db_entry(files_on_disk)
logger.debug("End sync recordings.") logger.debug("End sync recordings.")