spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-07 01:14:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

[commons] fix: get_human_size_str for negative numbers

Browse Source
This commit is contained in:
Vinicius Moreira
2022-03-14 09:33:50 -03:00
parent 3e13b64e4c
commit 5538a52442
2 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
bauh/commons/system.py
View File

@@ -22,6 +22,9 @@ if GLOBAL_PY_LIBS not in PATH:
USE_GLOBAL_INTERPRETER = bool(os.getenv('VIRTUAL_ENV')) USE_GLOBAL_INTERPRETER = bool(os.getenv('VIRTUAL_ENV'))
SIZE_UNITS = ((1, 'B'), (1024, 'Kb'), (1048576, 'Mb'), (1073741824, 'Gb'),
(1099511627776, 'Tb'), (1125899906842624, 'Pb'))
def gen_env(global_interpreter: bool, lang: str = DEFAULT_LANG, extra_paths: Optional[Set[str]] = None) -> dict: def gen_env(global_interpreter: bool, lang: str = DEFAULT_LANG, extra_paths: Optional[Set[str]] = None) -> dict:
custom_env = dict(os.environ) custom_env = dict(os.environ)
@@ -313,40 +316,18 @@ def get_dir_size(start_path='.'):
def get_human_size_str(size) -> Optional[str]: def get_human_size_str(size) -> Optional[str]:
if type(size) in (int, float, str): if type(size) in (int, float, str):
int_size = int(size) int_size = abs(int(size))
if int_size == 0: if int_size == 0:
return '0' return '0'
if size < 1024: for div, unit in SIZE_UNITS:
return f'{size} B'
size_unit = size / 1024 size_unit = int_size / div
if size_unit < 1024: if size_unit < 1024:
return f'{size_unit:.2f} Kb' size_unit = size_unit if size > 0 else size_unit * -1
return f'{int(size_unit)} {unit}' if unit == 'B' else f'{size_unit:.2f} {unit}'
size_unit = size / 1048576
if size_unit < 1024:
return f'{size_unit:.2f} Mb'
size_unit = size / 1073741824
if size_unit < 1024:
return f'{size_unit:.2f} Gb'
size_unit = size / 1099511627776
if size_unit < 1024:
return f'{size_unit:.2f} Tb'
size_unit = size / 1125899906842624
if size_unit < 1024:
return f'{size_unit:.2f} Pb'
return str(int_size)
def run(cmd: List[str], success_code: int = 0, custom_user: Optional[str] = None) -> Tuple[bool, str]: def run(cmd: List[str], success_code: int = 0, custom_user: Optional[str] = None) -> Tuple[bool, str]:

7
tests/common/test_system.py
View File

@@ -3,13 +3,18 @@ from unittest import TestCase
from bauh.commons import system from bauh.commons import system
class GetHumanSizeStr(TestCase): class GetHumanSizeStrTest(TestCase):
def test__must_properly_display_B(self):
self.assertEqual('1023 B', system.get_human_size_str(1023))
self.assertEqual('-1023 B', system.get_human_size_str(-1023))
def test__must_properly_convert_to_Kb(self): def test__must_properly_convert_to_Kb(self):
self.assertEqual('1.00 Kb', system.get_human_size_str(1024)) self.assertEqual('1.00 Kb', system.get_human_size_str(1024))
self.assertEqual('1.50 Kb', system.get_human_size_str(1536)) self.assertEqual('1.50 Kb', system.get_human_size_str(1536))
self.assertEqual('1.75 Kb', system.get_human_size_str(1792)) self.assertEqual('1.75 Kb', system.get_human_size_str(1792))
self.assertEqual('57.30 Kb', system.get_human_size_str(58675.2)) self.assertEqual('57.30 Kb', system.get_human_size_str(58675.2))
self.assertEqual('-1.00 Kb', system.get_human_size_str(-1024))
def test__must_properly_convert_to_Mb(self): def test__must_properly_convert_to_Mb(self):
self.assertEqual('1.00 Mb', system.get_human_size_str(1048576)) self.assertEqual('1.00 Mb', system.get_human_size_str(1048576))