xevion/phototag
1
0
Fork 0
mirror of https://github.com/Xevion/phototag.git synced 2025-12-06 01:15:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix byte magnitude generation, fix ebibyte constraint, harsher constraints for byte conversion RegEx

Browse Source
This commit is contained in:
Xevion
2023-05-12 00:03:58 -05:00
parent 99ed82dedb
commit 60abf999e0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phototag/helpers.py
View File

@@ -25,7 +25,7 @@ byte_magnitudes = {
}
# Generate every variation of byte suffixes
for magnitude, suffix_kibi in enumerate(["K", "M", "G", "T", "P", "E", "Z", "Y"], start=0):
for magnitude, suffix_kibi in enumerate(["K", "M", "G", "T", "P", "E", "Z", "Y"], start=1):
suffix_kilo = suffix_kibi.lower()
values: List[Tuple[str, int]] = [
# Kibi (1024)
@@ -95,7 +95,7 @@ def convert_to_bytes(size_string: str) -> int:
:param size_string: A string representation of data size, a integer followed by 1-2 letters indicating unit.
:return: The number of bytes the given string is equivalent to.
"""
match = re.match(r"(\d+)\s*(\w{1,2})", size_string)
match = re.match(r"\s*(\d+)\s*(\wi?[Bb])\s*", size_string)
return int(match.group(1)) * byte_magnitudes.get(match.group(2), 0)