Private GIT

Skip to content
Snippets Groups Projects
Commit 53f6d2a9 authored by miigotu's avatar miigotu
Browse files

Merge pull request #1147 from SickRage/fix-convert-size

Allow sep=None for convert_size
parents 8653510d 39315d93
Branches
No related tags found
No related merge requests found
......@@ -208,9 +208,9 @@ def convert_size(size, default=None, use_decimal=False, **kwargs):
scalar, units = size_tuple[0], size_tuple[1:]
units = units[0].upper() if units else default_units
else:
regex_units = re.search(r'(\w+)', size, re.IGNORECASE)
units = regex_units.group() if regex_units else default_units
scalar = size.strip(units)
regex_scalar = re.search(r'([\d. ]+)', size, re.IGNORECASE)
scalar = regex_scalar.group() if regex_scalar else -1
units = size.strip(scalar) if scalar != -1 else 'B'
scalar = float(scalar)
scalar *= (1024 if not use_decimal else 1000) ** scale.index(units)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment