mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2025-07-18 03:08:31 +00:00
Merge ad2fddfcb4
into c1ac543c81
This commit is contained in:
commit
652540fcd6
@ -3105,19 +3105,16 @@ def get_compatible_ext(*, vcodecs, acodecs, vexts, aexts, preferences=None):
|
|||||||
def urlhandle_detect_ext(url_handle, default=NO_DEFAULT):
|
def urlhandle_detect_ext(url_handle, default=NO_DEFAULT):
|
||||||
getheader = url_handle.headers.get
|
getheader = url_handle.headers.get
|
||||||
|
|
||||||
cd = getheader('Content-Disposition')
|
if cd := getheader('Content-Disposition'):
|
||||||
if cd:
|
if m := re.match(r'attachment;\s*filename="(?P<filename>[^"]+)"', cd):
|
||||||
m = re.match(r'attachment;\s*filename="(?P<filename>[^"]+)"', cd)
|
if ext := determine_ext(m.group('filename'), default_ext=None):
|
||||||
if m:
|
return ext
|
||||||
e = determine_ext(m.group('filename'), default_ext=None)
|
|
||||||
if e:
|
|
||||||
return e
|
|
||||||
|
|
||||||
meta_ext = getheader('x-amz-meta-name')
|
if ext := determine_ext(getheader('x-amz-meta-name'), default_ext=None):
|
||||||
if meta_ext:
|
return ext
|
||||||
e = meta_ext.rpartition('.')[2]
|
|
||||||
if e:
|
if ext := getheader('x-amz-meta-file-type'):
|
||||||
return e
|
return ext
|
||||||
|
|
||||||
return mimetype2ext(getheader('Content-Type'), default=default)
|
return mimetype2ext(getheader('Content-Type'), default=default)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user