dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[downloader/external] Respect --no-check-certificate for curl and aria2c and --proxy for curl

This commit is contained in:
remitamine 2015-09-03 22:25:33 +01:00
parent 725d1c58aa
commit e7a8c3032d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
youtube_dl/downloader/external.py
View File

@ -47,7 +47,7 @@ class ExternalFD(FileDownloader):
def _option(self, command_option, param): def _option(self, command_option, param):
param = self.params.get(param) param = self.params.get(param)
if param is None: if param is None or param is False:
return [] return []
if isinstance(param, bool): if isinstance(param, bool):
return [command_option] return [command_option]
@ -80,6 +80,8 @@ class CurlFD(ExternalFD):
for key, val in info_dict['http_headers'].items(): for key, val in info_dict['http_headers'].items():
cmd += ['--header', '%s: %s' % (key, val)] cmd += ['--header', '%s: %s' % (key, val)]
cmd += self._option('--interface', 'source_address') cmd += self._option('--interface', 'source_address')
cmd += self._option('--proxy', 'proxy')
cmd += self._option('--insecure', 'nocheckcertificate')
cmd += self._configuration_args() cmd += self._configuration_args()
cmd += ['--', info_dict['url']] cmd += ['--', info_dict['url']]
return cmd return cmd
@ -121,6 +123,7 @@ class Aria2cFD(ExternalFD):
cmd += ['--header', '%s: %s' % (key, val)] cmd += ['--header', '%s: %s' % (key, val)]
cmd += self._option('--interface', 'source_address') cmd += self._option('--interface', 'source_address')
cmd += self._option('--all-proxy', 'proxy') cmd += self._option('--all-proxy', 'proxy')
cmd += self._option('--check-certificate=false', 'nocheckcertificate')
cmd += ['--', info_dict['url']] cmd += ['--', info_dict['url']]
return cmd return cmd