mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-07-02 19:38:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge a2fca0bcf6 into 73bf102116

Browse Source
This commit is contained in:
doe1080 2025-06-20 21:48:29 +02:00 committed by GitHub
commit d97bcc1431
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/test_utils.py
View File

@ -604,6 +604,7 @@ def test_str_to_int(self):
self.assertEqual(str_to_int(523), 523)
self.assertEqual(str_to_int('noninteger'), None)
self.assertEqual(str_to_int([]), None)
self.assertEqual(str_to_int('123.456', dot_decimal=True), 123)
def test_url_basename(self):
self.assertEqual(url_basename('http://foo.de/'), '')

13
yt_dlp/utils/_utils.py
View File

@ -2010,13 +2010,18 @@ def str_or_none(v, default=None):
return default if v is None else str(v)
def str_to_int(int_str):
def str_to_int(int_str, *, dot_decimal=False):
""" A more relaxed version of int_or_none """
if isinstance(int_str, int):
return int_str
elif isinstance(int_str, str):
int_str = re.sub(r'[,\.\+]', '', int_str)
return int_or_none(int_str)
if not isinstance(int_str, str):
return None
int_str = re.sub(r'[,+]', '', int_str)
if dot_decimal:
f = float_or_none(int_str)
return int(f) if f is not None else None
return int_or_none(int_str.replace('.', ''))
@partial_application