From a6dc5bd13fff79f7ba55a170f784c047e15c09d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Mon, 18 Mar 2024 14:56:29 -0300 Subject: [PATCH] Make `get_file_size` robust against typing errors --- bookwyrm/templatetags/utilities.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index df5b5ab30..fb2113de4 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -130,10 +130,14 @@ def id_to_username(user_id): @register.filter(name="get_file_size") -def get_file_size(raw_size): +def get_file_size(nbytes): """display the size of a file in human readable terms""" try: + raw_size = float(nbytes) + except (ValueError, TypeError): + return repr(nbytes) + else: if raw_size < 1024: return f"{raw_size} bytes" if raw_size < 1024**2: @@ -142,10 +146,6 @@ def get_file_size(raw_size): return f"{raw_size/1024**2:.2f} MB" return f"{raw_size/1024**3:.2f} GB" - except Exception as error: # pylint: disable=broad-except - print(error) - return "" - @register.filter(name="get_user_permission") def get_user_permission(user):