From b1ec5b081660c63e696454b63dd2f3c2b93a85d9 Mon Sep 17 00:00:00 2001 From: ZhaoYangyang0403 <112544421+ZhaoYangyang0403@users.noreply.github.com> Date: Wed, 23 Aug 2023 18:04:00 +0800 Subject: [PATCH] fix convert error when threshold is none (#780) --- lyrebird/db/database_server.py | 14 +++++++++----- lyrebird/utils.py | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lyrebird/db/database_server.py b/lyrebird/db/database_server.py index 9a28cd7f1..3f3e597d1 100644 --- a/lyrebird/db/database_server.py +++ b/lyrebird/db/database_server.py @@ -222,17 +222,21 @@ def get_page_count(self, channel_rules, page_size=20, search_str=''): def get_database_info(self): database_path = str(self.database_uri) - threshold_str = application._cm.config.get('event.file_size_threshold') - threshold_byte = convert_size_to_byte(threshold_str) size = self.database_uri.stat().st_size readable_size = convert_size(size) - oversized = threshold_byte and size > threshold_byte database_info = { 'path': database_path, - 'threshold': threshold_str, 'size': readable_size, - 'oversized': oversized + 'oversized': False } + + threshold_str = application._cm.config.get('event.file_size_threshold') + if threshold_str is not None: + threshold_byte = convert_size_to_byte(threshold_str) + oversized = threshold_byte and size > threshold_byte + database_info['threshold'] = threshold_str + database_info['oversized'] = oversized + return database_info def reset(self): diff --git a/lyrebird/utils.py b/lyrebird/utils.py index bddf85235..c85c61ae3 100644 --- a/lyrebird/utils.py +++ b/lyrebird/utils.py @@ -29,7 +29,7 @@ def convert_size(size_bytes): return "%s %s" % (s, size_name[i]) -def convert_size_to_byte(size_str): +def convert_size_to_byte(size_str: str): size_str = size_str.strip().upper() match = re.match(r'^(\d+\.?\d*)\s*([KMGTPEZY]?[B])$', size_str) if not match: