mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 10:46:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Allow numeric types

Browse source 
The canonical type for `size_string` is `str`. However numeric types are also accepted in order
to accommodate poorly written plugins.

PR #20976.
This commit is contained in:
Chocobo1 2024-06-23 12:43:35 +08:00 committed by sledgehammer999
parent cea20141a9
commit e8b585acd8
No known key found for this signature in database
GPG key ID: 6E4A2D025B7CC9A2
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/searchengine/nova3/novaprinter.py
View file

@ -1,4 +1,4 @@
#VERSION: 1.49 #VERSION: 1.50
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met: # modification, are permitted provided that the following conditions are met:
@ -26,18 +26,18 @@
import re import re
from collections.abc import Mapping from collections.abc import Mapping
from typing import Any from typing import Any, Union
# TODO: enable this when using Python >= 3.8 # TODO: enable the following when using Python >= 3.8
#SearchResults = TypedDict('SearchResults', { #SearchResults = TypedDict('SearchResults', {
# 'link': str, # 'link': str,
# 'name': str, # 'name': str,
# 'size': str, # 'size': Union[float, int, str],
# 'seeds': int, # 'seeds': int,
# 'leech': int, # 'leech': int,
# 'engine_url': str, # 'engine_url': str,
# 'desc_link': str, # Optional # 'desc_link': str, # Optional # TODO: use `NotRequired[str]` when using Python >= 3.11
# 'pub_date': int # Optional # 'pub_date': int # Optional # TODO: use `NotRequired[int]` when using Python >= 3.11
#}) #})
SearchResults = Mapping[str, Any] SearchResults = Mapping[str, Any]
@ -62,11 +62,19 @@ def prettyPrinter(dictionary: SearchResults) -> None:
sizeUnitRegex: re.Pattern[str] = re.compile(r"^(?P<size>\d*\.?\d+) *(?P<unit>[a-z]+)?", re.IGNORECASE) sizeUnitRegex: re.Pattern[str] = re.compile(r"^(?P<size>\d*\.?\d+) *(?P<unit>[a-z]+)?", re.IGNORECASE)
def anySizeToBytes(size_string: str) -> int: def anySizeToBytes(size_string: Union[float, int, str]) -> int:
""" """
Convert a string like '1 KB' to '1024' (bytes) Convert a string like '1 KB' to '1024' (bytes)
The canonical type for `size_string` is `str`. However numeric types are also accepted in order to
accommodate poorly written plugins.
""" """
if isinstance(size_string, int):
return size_string
if isinstance(size_string, float):
return round(size_string)
match = sizeUnitRegex.match(size_string.strip()) match = sizeUnitRegex.match(size_string.strip())
if match is None: if match is None:
return -1 return -1