Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-22 15:37:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4731 from aaron-tan/improve-render-size

Browse Source 
Improve rendering of size column
This commit is contained in:
Maximilian Hils 2021-08-04 17:26:20 +02:00 committed by GitHub
commit 4abd00afab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
mitmproxy/utils/human.py
View File

@ -1,30 +1,34 @@
import datetime import datetime
import functools
import ipaddress import ipaddress
import time import time
import functools
import typing import typing
SIZE_TABLE = [
("b", 1024 ** 0),
("k", 1024 ** 1),
("m", 1024 ** 2),
("g", 1024 ** 3),
("t", 1024 ** 4),
]
SIZE_UNITS = dict(SIZE_TABLE) SIZE_UNITS = {
"b": 1024 ** 0,
"k": 1024 ** 1,
"m": 1024 ** 2,
"g": 1024 ** 3,
"t": 1024 ** 4,
}
def pretty_size(size): def pretty_size(size: int) -> str:
for bottom, top in zip(SIZE_TABLE, SIZE_TABLE[1:]): """Convert a number of bytes into a human-readable string.
if bottom[1] <= size < top[1]:
suf = bottom[0] len(return value) <= 5 always holds true.
lim = bottom[1] """
x = round(size / lim, 2) s: float = size # type cast for mypy
if x == int(x): if s < 1024:
x = int(x) return f"{s}b"
return str(x) + suf for suffix in ["k", "m", "g", "t"]:
return "{}{}".format(size, SIZE_TABLE[0][0]) s /= 1024
if s < 99.95:
return f"{s:.1f}{suffix}"
if s < 1024 or suffix == "t":
return f"{s:.0f}{suffix}"
raise AssertionError
@functools.lru_cache() @functools.lru_cache()

9
test/mitmproxy/utils/test_human.py
View File

@ -28,10 +28,11 @@ def test_parse_size():
def test_pretty_size(): def test_pretty_size():
assert human.pretty_size(0) == "0b" assert human.pretty_size(0) == "0b"
assert human.pretty_size(100) == "100b" assert human.pretty_size(100) == "100b"
assert human.pretty_size(1024) == "1k" assert human.pretty_size(1024) == "1.0k"
assert human.pretty_size(1024 + (1024 / 2.0)) == "1.5k" assert human.pretty_size(1024 + 512) == "1.5k"
assert human.pretty_size(1024 * 1024) == "1m" assert human.pretty_size(1024 * 1024) == "1.0m"
assert human.pretty_size(10 * 1024 * 1024) == "10m" assert human.pretty_size(10 * 1024 * 1024) == "10.0m"
assert human.pretty_size(100 * 1024 * 1024) == "100m"
def test_pretty_duration(): def test_pretty_duration():