Include storage maintainer for http

This commit is contained in:
Nick Mowen 2022-10-09 09:27:05 -06:00
parent c9eeb714ce
commit aa87d0b2a7
2 changed files with 6 additions and 2 deletions

View File

@ -163,6 +163,7 @@ class FrigateApp:
self.db, self.db,
self.stats_tracking, self.stats_tracking,
self.detected_frames_processor, self.detected_frames_processor,
self.storage_maintainer,
self.plus_api, self.plus_api,
) )
@ -362,13 +363,13 @@ class FrigateApp:
self.start_detected_frames_processor() self.start_detected_frames_processor()
self.start_camera_processors() self.start_camera_processors()
self.start_camera_capture_processes() self.start_camera_capture_processes()
self.start_storage_maintainer()
self.init_stats() self.init_stats()
self.init_web_server() self.init_web_server()
self.start_event_processor() self.start_event_processor()
self.start_event_cleanup() self.start_event_cleanup()
self.start_recording_maintainer() self.start_recording_maintainer()
self.start_recording_cleanup() self.start_recording_cleanup()
self.start_storage_maintainer()
self.start_stats_emitter() self.start_stats_emitter()
self.start_watchdog() self.start_watchdog()
# self.zeroconf = broadcast_zeroconf(self.config.mqtt.client_id) # self.zeroconf = broadcast_zeroconf(self.config.mqtt.client_id)

View File

@ -32,6 +32,7 @@ from frigate.models import Event, Recordings
from frigate.object_processing import TrackedObject from frigate.object_processing import TrackedObject
from frigate.stats import stats_snapshot from frigate.stats import stats_snapshot
from frigate.util import clean_camera_user_pass, ffprobe_stream, vainfo_hwaccel from frigate.util import clean_camera_user_pass, ffprobe_stream, vainfo_hwaccel
from frigate.storage import StorageMaintainer
from frigate.version import VERSION from frigate.version import VERSION
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -44,6 +45,7 @@ def create_app(
database: SqliteDatabase, database: SqliteDatabase,
stats_tracking, stats_tracking,
detected_frames_processor, detected_frames_processor,
storage_maintainer: StorageMaintainer,
plus_api, plus_api,
): ):
app = Flask(__name__) app = Flask(__name__)
@ -61,6 +63,7 @@ def create_app(
app.frigate_config = frigate_config app.frigate_config = frigate_config
app.stats_tracking = stats_tracking app.stats_tracking = stats_tracking
app.detected_frames_processor = detected_frames_processor app.detected_frames_processor = detected_frames_processor
app.storage_maintainer = storage_maintainer
app.plus_api = plus_api app.plus_api = plus_api
app.camera_error_image = None app.camera_error_image = None
@ -699,7 +702,7 @@ def get_recordings_storage_usage():
camera_usages: dict[ camera_usages: dict[
str, dict str, dict
] = current_app.storage_maintainer.calculate_camera_usages() ] = current_app.storage_maintainer.calculate_camera_usages()
camera_usages["max"] = total_mb del camera_usages["total"]
for camera_name in camera_usages.keys(): for camera_name in camera_usages.keys():
camera_usages[camera_name]["usage_percent"] = ( camera_usages[camera_name]["usage_percent"] = (