mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-09-08 21:45:05 +00:00
[external/curl] respect more downloader options and display progress
This commit is contained in:
parent
3cddb8d6a7
commit
98e698f1ff
|
@ -96,6 +96,12 @@ class CurlFD(ExternalFD):
|
||||||
cmd = [self.exe, '--location', '-o', tmpfilename]
|
cmd = [self.exe, '--location', '-o', tmpfilename]
|
||||||
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._bool_option('--continue-at', 'continuedl', '-', '0')
|
||||||
|
cmd += self._valueless_option('--silent', 'noprogress')
|
||||||
|
cmd += self._valueless_option('--verbose', 'verbose')
|
||||||
|
cmd += self._option('--limit-rate', 'ratelimit')
|
||||||
|
cmd += self._option('--retry', 'retries')
|
||||||
|
cmd += self._option('--max-filesize', 'max_filesize')
|
||||||
cmd += self._option('--interface', 'source_address')
|
cmd += self._option('--interface', 'source_address')
|
||||||
cmd += self._option('--proxy', 'proxy')
|
cmd += self._option('--proxy', 'proxy')
|
||||||
cmd += self._valueless_option('--insecure', 'nocheckcertificate')
|
cmd += self._valueless_option('--insecure', 'nocheckcertificate')
|
||||||
|
@ -103,6 +109,15 @@ class CurlFD(ExternalFD):
|
||||||
cmd += ['--', info_dict['url']]
|
cmd += ['--', info_dict['url']]
|
||||||
return cmd
|
return cmd
|
||||||
|
|
||||||
|
def _call_downloader(self, tmpfilename, info_dict):
|
||||||
|
cmd = [encodeArgument(a) for a in self._make_cmd(tmpfilename, info_dict)]
|
||||||
|
|
||||||
|
self._debug_cmd(cmd)
|
||||||
|
|
||||||
|
p = subprocess.Popen(cmd)
|
||||||
|
p.communicate()
|
||||||
|
return p.returncode
|
||||||
|
|
||||||
|
|
||||||
class AxelFD(ExternalFD):
|
class AxelFD(ExternalFD):
|
||||||
AVAILABLE_OPT = '-V'
|
AVAILABLE_OPT = '-V'
|
||||||
|
|
|
@ -2410,6 +2410,8 @@ def dfxp2srt(dfxp_data):
|
||||||
|
|
||||||
def cli_option(params, command_option, param):
|
def cli_option(params, command_option, param):
|
||||||
param = params.get(param)
|
param = params.get(param)
|
||||||
|
if param:
|
||||||
|
param = compat_str(param)
|
||||||
return [command_option, param] if param is not None else []
|
return [command_option, param] if param is not None else []
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue