Remove total from equation

This commit is contained in:
Nick Mowen 2022-10-09 09:54:47 -06:00
parent 167c0d36a7
commit afc7b44700
2 changed files with 1 additions and 7 deletions

View File

@ -694,7 +694,6 @@ def latest_frame(camera_name):
@bp.route("/recordings/storage") @bp.route("/recordings/storage")
def get_recordings_storage_usage(): def get_recordings_storage_usage():
include_total = request.args.get("include_total", True)
recording_stats = stats_snapshot(current_app.stats_tracking)["service"]["storage"][ recording_stats = stats_snapshot(current_app.stats_tracking)["service"]["storage"][
RECORD_DIR RECORD_DIR
] ]
@ -704,9 +703,6 @@ def get_recordings_storage_usage():
str, dict str, dict
] = current_app.storage_maintainer.calculate_camera_usages() ] = current_app.storage_maintainer.calculate_camera_usages()
if not include_total:
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"] = (
camera_usages[camera_name]["usage"] / total_mb camera_usages[camera_name]["usage"] / total_mb

View File

@ -63,7 +63,6 @@ class StorageMaintainer(threading.Thread):
def calculate_camera_usages(self) -> dict[str, dict]: def calculate_camera_usages(self) -> dict[str, dict]:
"""Calculate the storage usage of each camera.""" """Calculate the storage usage of each camera."""
usages: dict[str, dict] = {} usages: dict[str, dict] = {}
total_storage = 0
for camera in self.config.cameras.keys(): for camera in self.config.cameras.keys():
camera_storage = ( camera_storage = (
@ -71,10 +70,9 @@ class StorageMaintainer(threading.Thread):
.where(Recordings.camera == camera, Recordings.segment_size != 0) .where(Recordings.camera == camera, Recordings.segment_size != 0)
.scalar() .scalar()
) )
total_storage += camera_storage
usages[camera] = {"usage": camera_storage} usages[camera] = {"usage": camera_storage}
usages["total"] = {"usage": total_storage}
return usages return usages
def check_storage_needs_cleanup(self) -> bool: def check_storage_needs_cleanup(self) -> bool: