heckyel/yt-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix fmt extraction mime_type regex failure as well as exceptions

Browse Source
This commit is contained in:
Jesus E 2023-05-28 20:44:30 -04:00
parent beca545951
commit 9890617098
No known key found for this signature in database
GPG Key ID: 159C8F8BC9AED8B6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
youtube/yt_data_extract/watch_extraction.py
View File

@ -400,14 +400,16 @@ def update_format_with_codec_info(fmt, codec):
print('Warning: unrecognized codec: ' + codec) print('Warning: unrecognized codec: ' + codec)
fmt_type_re = re.compile( fmt_type_re = re.compile(
r'(text|audio|video)/([\w0-9]+); codecs="([\w0-9\.]+(?:, [\w0-9\.]+)*)"') r'(text|audio|video)/([\w0-9]+); codecs="([^"]+)"')
def update_format_with_type_info(fmt, yt_fmt): def update_format_with_type_info(fmt, yt_fmt):
# 'type' for invidious api format # 'type' for invidious api format
mime_type = multi_get(yt_fmt, 'mimeType', 'type') mime_type = multi_get(yt_fmt, 'mimeType', 'type')
if mime_type is None: if mime_type is None:
return return
match = re.fullmatch(fmt_type_re, mime_type) match = re.fullmatch(fmt_type_re, mime_type)
if match is None:
print('Warning: Could not read mimetype', mime_type)
return
type, fmt['ext'], codecs = match.groups() type, fmt['ext'], codecs = match.groups()
codecs = codecs.split(', ') codecs = codecs.split(', ')
for codec in codecs: for codec in codecs: