Fix hardcoded camera name (#13520)

* Fix hardcoded camera name

* Simplify logic
This commit is contained in:
Nicolas Mowen 2024-09-03 10:14:30 -06:00 committed by GitHub
parent e66f47bdf6
commit 58a471e466
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -5,11 +5,9 @@ import itertools
import logging import logging
import os import os
import threading import threading
from functools import reduce
from multiprocessing.synchronize import Event as MpEvent from multiprocessing.synchronize import Event as MpEvent
from pathlib import Path from pathlib import Path
from peewee import operator
from playhouse.sqlite_ext import SqliteExtDatabase from playhouse.sqlite_ext import SqliteExtDatabase
from frigate.config import CameraConfig, FrigateConfig, RetainModeEnum from frigate.config import CameraConfig, FrigateConfig, RetainModeEnum
@ -73,26 +71,17 @@ class RecordingCleanup(threading.Thread):
).timestamp() ).timestamp()
expired_reviews: ReviewSegment = ( expired_reviews: ReviewSegment = (
ReviewSegment.select(ReviewSegment.id) ReviewSegment.select(ReviewSegment.id)
.where(ReviewSegment.camera == "front_cam") .where(ReviewSegment.camera == config.name)
.where( .where(
reduce( (
operator.or_, ReviewSegment.severity
[ == "alert" & ReviewSegment.end_time
reduce( < alert_expire_date
operator.and_, )
[ | (
(ReviewSegment.severity == "alert"), ReviewSegment.severity
(ReviewSegment.end_time < alert_expire_date), == "detection" & ReviewSegment.end_time
], < detection_expire_date
),
reduce(
operator.and_,
[
(ReviewSegment.severity == "detection"),
(ReviewSegment.end_time < detection_expire_date),
],
),
],
) )
) )
.namedtuples() .namedtuples()