From bf812ef71438036c23640f29bd7ae955289720ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Tue, 11 Aug 2015 23:00:45 +0600 Subject: [PATCH] [downloader/external] Forward --proxy to wget and aria2c --- youtube_dl/downloader/external.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/youtube_dl/downloader/external.py b/youtube_dl/downloader/external.py index 07ce59f7d..49d806ee4 100644 --- a/youtube_dl/downloader/external.py +++ b/youtube_dl/downloader/external.py @@ -51,6 +51,14 @@ def _source_address(self, command_option): return [] return [command_option, source_address] + def _option(self, command_option, param): + param = self.params.get(param) + if param is None: + return [] + if isinstance(param, bool): + return [command_option] + return [command_option, param] + def _no_check_certificate(self, command_option): return [command_option] if self.params.get('nocheckcertificate', False) else [] @@ -102,6 +110,7 @@ def _make_cmd(self, tmpfilename, info_dict): for key, val in info_dict['http_headers'].items(): cmd += ['--header', '%s: %s' % (key, val)] cmd += self._source_address('--bind-address') + cmd += self._option('--proxy', 'proxy') cmd += self._no_check_certificate('--no-check-certificate') cmd += self._configuration_args() cmd += ['--', info_dict['url']] @@ -120,6 +129,7 @@ def _make_cmd(self, tmpfilename, info_dict): for key, val in info_dict['http_headers'].items(): cmd += ['--header', '%s: %s' % (key, val)] cmd += self._source_address('--interface') + cmd += self._option('--all-proxy', 'proxy') cmd += ['--', info_dict['url']] return cmd