1
0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-08-16 01:18:29 +00:00

Merge branch 'yt-dlp:master' into generic_tests

This commit is contained in:
doe1080 2025-07-19 04:53:00 +09:00 committed by GitHub
commit 1477bcdd62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -2961,6 +2961,7 @@ def mimetype2ext(mt, default=NO_DEFAULT):
'audio/x-matroska': 'mka',
'audio/x-mpegurl': 'm3u',
'aacp': 'aac',
'flac': 'flac',
'midi': 'mid',
'ogg': 'ogg',
'wav': 'wav',
@ -3105,21 +3106,15 @@ def get_compatible_ext(*, vcodecs, acodecs, vexts, aexts, preferences=None):
def urlhandle_detect_ext(url_handle, default=NO_DEFAULT):
getheader = url_handle.headers.get
cd = getheader('Content-Disposition')
if cd:
m = re.match(r'attachment;\s*filename="(?P<filename>[^"]+)"', cd)
if m:
e = determine_ext(m.group('filename'), default_ext=None)
if e:
return e
if cd := getheader('Content-Disposition'):
if m := re.match(r'attachment;\s*filename="(?P<filename>[^"]+)"', cd):
if ext := determine_ext(m.group('filename'), default_ext=None):
return ext
meta_ext = getheader('x-amz-meta-name')
if meta_ext:
e = meta_ext.rpartition('.')[2]
if e:
return e
return mimetype2ext(getheader('Content-Type'), default=default)
return (
determine_ext(getheader('x-amz-meta-name'), default_ext=None)
or getheader('x-amz-meta-file-type')
or mimetype2ext(getheader('Content-Type'), default=default))
def encode_data_uri(data, mime_type):