Browse Source
[utils] Recognize lowercase units in parse_filesize
master
Sergey M․
8 years ago
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
2 changed files with
10 additions and
0 deletions
-
test/test_utils.py
-
youtube_dl/utils.py
|
|
|
@ -817,7 +817,9 @@ class TestUtil(unittest.TestCase): |
|
|
|
self.assertEqual(parse_filesize('2 MiB'), 2097152) |
|
|
|
self.assertEqual(parse_filesize('5 GB'), 5000000000) |
|
|
|
self.assertEqual(parse_filesize('1.2Tb'), 1200000000000) |
|
|
|
self.assertEqual(parse_filesize('1.2tb'), 1200000000000) |
|
|
|
self.assertEqual(parse_filesize('1,24 KB'), 1240) |
|
|
|
self.assertEqual(parse_filesize('1,24 kb'), 1240) |
|
|
|
|
|
|
|
def test_parse_count(self): |
|
|
|
self.assertEqual(parse_count(None), None) |
|
|
|
|
|
|
|
@ -1508,34 +1508,42 @@ def parse_filesize(s): |
|
|
|
'KB': 1000, |
|
|
|
'kB': 1024, |
|
|
|
'Kb': 1000, |
|
|
|
'kb': 1000, |
|
|
|
'MiB': 1024 ** 2, |
|
|
|
'MB': 1000 ** 2, |
|
|
|
'mB': 1024 ** 2, |
|
|
|
'Mb': 1000 ** 2, |
|
|
|
'mb': 1000 ** 2, |
|
|
|
'GiB': 1024 ** 3, |
|
|
|
'GB': 1000 ** 3, |
|
|
|
'gB': 1024 ** 3, |
|
|
|
'Gb': 1000 ** 3, |
|
|
|
'gb': 1000 ** 3, |
|
|
|
'TiB': 1024 ** 4, |
|
|
|
'TB': 1000 ** 4, |
|
|
|
'tB': 1024 ** 4, |
|
|
|
'Tb': 1000 ** 4, |
|
|
|
'tb': 1000 ** 4, |
|
|
|
'PiB': 1024 ** 5, |
|
|
|
'PB': 1000 ** 5, |
|
|
|
'pB': 1024 ** 5, |
|
|
|
'Pb': 1000 ** 5, |
|
|
|
'pb': 1000 ** 5, |
|
|
|
'EiB': 1024 ** 6, |
|
|
|
'EB': 1000 ** 6, |
|
|
|
'eB': 1024 ** 6, |
|
|
|
'Eb': 1000 ** 6, |
|
|
|
'eb': 1000 ** 6, |
|
|
|
'ZiB': 1024 ** 7, |
|
|
|
'ZB': 1000 ** 7, |
|
|
|
'zB': 1024 ** 7, |
|
|
|
'Zb': 1000 ** 7, |
|
|
|
'zb': 1000 ** 7, |
|
|
|
'YiB': 1024 ** 8, |
|
|
|
'YB': 1000 ** 8, |
|
|
|
'yB': 1024 ** 8, |
|
|
|
'Yb': 1000 ** 8, |
|
|
|
'yb': 1000 ** 8, |
|
|
|
} |
|
|
|
|
|
|
|
return lookup_unit_table(_UNIT_TABLE, s) |
|
|
|
|
