From 73ca03da8e4288ee8cd8184cb8d88bdf5df5ce8b Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Thu, 16 May 2019 16:29:06 -0600 Subject: [PATCH] Adjusted human_readable_size * Now supports petabytes? --- .bin/Scripts/functions/common.py | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/.bin/Scripts/functions/common.py b/.bin/Scripts/functions/common.py index 81b3654e..bc5ed3f3 100644 --- a/.bin/Scripts/functions/common.py +++ b/.bin/Scripts/functions/common.py @@ -307,20 +307,24 @@ def human_readable_size(size, decimals=0): return '{size:>{width}} b'.format(size='???', width=width) # Convert to sensible units - if size >= 1099511627776: - size /= 1099511627776 - units = 'Tb' - elif size >= 1073741824: - size /= 1073741824 - units = 'Gb' - elif size >= 1048576: - size /= 1048576 - units = 'Mb' - elif size >= 1024: - size /= 1024 - units = 'Kb' + if size >= 1024 ** 5: + size /= 1024 ** 5 + units = 'PB' + elif size >= 1024 ** 4: + size /= 1024 ** 4 + units = 'TB' + elif size >= 1024 ** 3: + size /= 1024 ** 3 + units = 'GB' + elif size >= 1024 ** 2: + size /= 1024 ** 2 + units = 'MB' + elif size >= 1024 ** 1: + size /= 1024 ** 1 + units = 'KB' else: - units = ' b' + size /= 1024 ** 0 + units = ' B' # Return return '{size:>{width}.{decimals}f} {units}'.format(