salfter/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-10-29 09:26:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

[downloader/external] change _argless_option function to _valueless_option

Browse Source
This commit is contained in:
remitamine
2015-09-04 21:12:13 +01:00
parent f30c2e8e98
commit dc534b674f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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 or param is False: if param is None:
return [] return []
return [command_option, param] return [command_option, param]
@@ -59,7 +59,7 @@ class ExternalFD(FileDownloader):
return [command_option + separator + (true_value if param else false_value)] return [command_option + separator + (true_value if param else false_value)]
return [command_option, true_value if param else false_value] return [command_option, true_value if param else false_value]
def _argless_option(self, command_option, param, expected_value=True): def _valueless_option(self, command_option, param, expected_value=True):
param = self.params.get(param) param = self.params.get(param)
return [command_option] if param == expected_value else [] return [command_option] if param == expected_value else []
@@ -91,7 +91,7 @@ class CurlFD(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('--proxy', 'proxy') cmd += self._option('--proxy', 'proxy')
cmd += self._argless_option('--insecure', 'nocheckcertificate') cmd += self._valueless_option('--insecure', 'nocheckcertificate')
cmd += self._configuration_args() cmd += self._configuration_args()
cmd += ['--', info_dict['url']] cmd += ['--', info_dict['url']]
return cmd return cmd
@@ -114,7 +114,7 @@ class WgetFD(ExternalFD):
cmd += ['--header', '%s: %s' % (key, val)] cmd += ['--header', '%s: %s' % (key, val)]
cmd += self._option('--bind-address', 'source_address') cmd += self._option('--bind-address', 'source_address')
cmd += self._option('--proxy', 'proxy') cmd += self._option('--proxy', 'proxy')
cmd += self._argless_option('--no-check-certificate', 'nocheckcertificate') cmd += self._valueless_option('--no-check-certificate', 'nocheckcertificate')
cmd += self._configuration_args() cmd += self._configuration_args()
cmd += ['--', info_dict['url']] cmd += ['--', info_dict['url']]
return cmd return cmd