diff --git a/frigate/app.py b/frigate/app.py index f62d4a78a..e1cbef35a 100644 --- a/frigate/app.py +++ b/frigate/app.py @@ -163,6 +163,7 @@ class FrigateApp: self.db, self.stats_tracking, self.detected_frames_processor, + self.storage_maintainer, self.plus_api, ) @@ -362,13 +363,13 @@ class FrigateApp: self.start_detected_frames_processor() self.start_camera_processors() self.start_camera_capture_processes() + self.start_storage_maintainer() self.init_stats() self.init_web_server() self.start_event_processor() self.start_event_cleanup() self.start_recording_maintainer() self.start_recording_cleanup() - self.start_storage_maintainer() self.start_stats_emitter() self.start_watchdog() # self.zeroconf = broadcast_zeroconf(self.config.mqtt.client_id) diff --git a/frigate/http.py b/frigate/http.py index 233afb2d0..f0fa32dc7 100644 --- a/frigate/http.py +++ b/frigate/http.py @@ -32,6 +32,7 @@ from frigate.models import Event, Recordings from frigate.object_processing import TrackedObject from frigate.stats import stats_snapshot from frigate.util import clean_camera_user_pass, ffprobe_stream, vainfo_hwaccel +from frigate.storage import StorageMaintainer from frigate.version import VERSION logger = logging.getLogger(__name__) @@ -44,6 +45,7 @@ def create_app( database: SqliteDatabase, stats_tracking, detected_frames_processor, + storage_maintainer: StorageMaintainer, plus_api, ): app = Flask(__name__) @@ -61,6 +63,7 @@ def create_app( app.frigate_config = frigate_config app.stats_tracking = stats_tracking app.detected_frames_processor = detected_frames_processor + app.storage_maintainer = storage_maintainer app.plus_api = plus_api app.camera_error_image = None @@ -699,7 +702,7 @@ def get_recordings_storage_usage(): camera_usages: dict[ str, dict ] = current_app.storage_maintainer.calculate_camera_usages() - camera_usages["max"] = total_mb + del camera_usages["total"] for camera_name in camera_usages.keys(): camera_usages[camera_name]["usage_percent"] = (