fenix/ytdl-nightly
1
0
Fork 0
mirror of https://github.com/ytdl-org/ytdl-nightly.git synced 2024-12-22 13:05:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ignore --external-downloader-args if --external-downloader was rejected

Browse Source 
... and generate warning
This commit is contained in:
dirkf 2022-02-22 11:24:06 +00:00
parent 6508688e88
commit 49c5293014
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/YoutubeDL.py
View File

@ -1906,8 +1906,17 @@ class YoutubeDL(object):
if not self.params.get('skip_download', False):
try:
def checked_get_suitable_downloader(info_dict, params):
ed_args = params.get('external_downloader_args')
dler = get_suitable_downloader(info_dict, params)
if ed_args and not params.get('external_downloader_args'):
# external_downloader_args was cleared because external_downloader was rejected
self.report_warning('Requested external downloader cannot be used: '
'ignoring --external-downloader-args.')
return dler
def dl(name, info):
fd = get_suitable_downloader(info, self.params)(self, self.params)
fd = checked_get_suitable_downloader(info, self.params)(self, self.params)
for ph in self._progress_hooks:
fd.add_progress_hook(ph)
if self.params.get('verbose'):

3
youtube_dl/downloader/__init__.py
View File

@ -50,6 +50,9 @@ def _get_suitable_downloader(info_dict, params={}):
ed = get_external_downloader(external_downloader)
if ed.can_download(info_dict):
return ed
# Avoid using unwanted args since external_downloader was rejected
if params.get('external_downloader_args'):
params['external_downloader_args'] = None
protocol = info_dict['protocol']
if protocol.startswith('m3u8') and info_dict.get('is_live'):