mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-04 18:09:36 +02:00
Fix --flat-playlist
when entry has no ie_key
This commit is contained in:
parent
bd4d1ea398
commit
6033d9808d
@ -104,6 +104,7 @@
|
|||||||
ThrottledDownload,
|
ThrottledDownload,
|
||||||
to_high_limit_path,
|
to_high_limit_path,
|
||||||
traverse_obj,
|
traverse_obj,
|
||||||
|
try_get,
|
||||||
UnavailableVideoError,
|
UnavailableVideoError,
|
||||||
url_basename,
|
url_basename,
|
||||||
version_tuple,
|
version_tuple,
|
||||||
@ -1176,13 +1177,17 @@ def __extract_info(self, url, ie, download, extra_info, process):
|
|||||||
return ie_result
|
return ie_result
|
||||||
|
|
||||||
def add_default_extra_info(self, ie_result, ie, url):
|
def add_default_extra_info(self, ie_result, ie, url):
|
||||||
self.add_extra_info(ie_result, {
|
if url is not None:
|
||||||
'extractor': ie.IE_NAME,
|
self.add_extra_info(ie_result, {
|
||||||
'webpage_url': url,
|
'webpage_url': url,
|
||||||
'original_url': url,
|
'original_url': url,
|
||||||
'webpage_url_basename': url_basename(url),
|
'webpage_url_basename': url_basename(url),
|
||||||
'extractor_key': ie.ie_key(),
|
})
|
||||||
})
|
if ie is not None:
|
||||||
|
self.add_extra_info(ie_result, {
|
||||||
|
'extractor': ie.IE_NAME,
|
||||||
|
'extractor_key': ie.ie_key(),
|
||||||
|
})
|
||||||
|
|
||||||
def process_ie_result(self, ie_result, download=True, extra_info={}):
|
def process_ie_result(self, ie_result, download=True, extra_info={}):
|
||||||
"""
|
"""
|
||||||
@ -1201,8 +1206,8 @@ def process_ie_result(self, ie_result, download=True, extra_info={}):
|
|||||||
or extract_flat is True):
|
or extract_flat is True):
|
||||||
info_copy = ie_result.copy()
|
info_copy = ie_result.copy()
|
||||||
self.add_extra_info(info_copy, extra_info)
|
self.add_extra_info(info_copy, extra_info)
|
||||||
self.add_default_extra_info(
|
ie = try_get(ie_result.get('ie_key'), self.get_info_extractor)
|
||||||
info_copy, self.get_info_extractor(ie_result.get('ie_key')), ie_result['url'])
|
self.add_default_extra_info(info_copy, ie, ie_result['url'])
|
||||||
self.__forced_printings(info_copy, self.prepare_filename(info_copy), incomplete=True)
|
self.__forced_printings(info_copy, self.prepare_filename(info_copy), incomplete=True)
|
||||||
return ie_result
|
return ie_result
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user