From 8e3ea2b13f8bed2f942181b38ed786941ea9619d Mon Sep 17 00:00:00 2001 From: Sebastian Goscik Date: Fri, 9 Dec 2022 11:06:34 +0000 Subject: [PATCH] Log buffer size in human readable format --- unifi_protect_backup/unifi_protect_backup.py | 10 ++++++++-- unifi_protect_backup/uploader.py | 6 ++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/unifi_protect_backup/unifi_protect_backup.py b/unifi_protect_backup/unifi_protect_backup.py index 7e7fb83..c5649b1 100644 --- a/unifi_protect_backup/unifi_protect_backup.py +++ b/unifi_protect_backup/unifi_protect_backup.py @@ -14,7 +14,13 @@ from pyunifiprotect import ProtectApiClient from pyunifiprotect.data.types import ModelType from unifi_protect_backup import EventListener, MissingEventChecker, Purge, VideoDownloader, VideoUploader -from unifi_protect_backup.utils import SubprocessException, parse_rclone_retention, run_command, setup_logging +from unifi_protect_backup.utils import ( + SubprocessException, + parse_rclone_retention, + run_command, + setup_logging, + human_readable_size, +) logger = logging.getLogger(__name__) @@ -99,7 +105,7 @@ class UnifiProtectBackup: logger.debug(f" {detection_types=}") logger.debug(f" {file_structure_format=}") logger.debug(f" {sqlite_path=}") - logger.debug(f" {download_buffer_size=}") + logger.debug(f" download_buffer_size={human_readable_size(download_buffer_size)}") self.rclone_destination = rclone_destination self.retention = parse_rclone_retention(retention) diff --git a/unifi_protect_backup/uploader.py b/unifi_protect_backup/uploader.py index 1b3649a..42f868c 100644 --- a/unifi_protect_backup/uploader.py +++ b/unifi_protect_backup/uploader.py @@ -8,7 +8,7 @@ import aiosqlite from pyunifiprotect.data.nvr import Event from pyunifiprotect import ProtectApiClient -from unifi_protect_backup.utils import get_camera_name, VideoQueue, run_command, setup_event_logger +from unifi_protect_backup.utils import get_camera_name, VideoQueue, run_command, setup_event_logger, human_readable_size logger = logging.getLogger(__name__) setup_event_logger(logger) @@ -50,7 +50,9 @@ class VideoUploader: self.logger = logging.LoggerAdapter(logger, {'event': f' [{event.id}]'}) self.logger.info(f"Uploading event: {event.id}") - self.logger.debug(f" Remaining Upload Queue: {self._video_queue.qsize_files()}") + self.logger.debug( + f" Remaining Upload Queue: {self.upload_queue.qsize_files()} ({human_readable_size(self.upload_queue.qsize())})" + ) destination = await self._generate_file_path(event) self.logger.debug(f" Destination: {destination}")