From: Sergey M․ <dstftw@gmail.com>
Date: Tue, 11 Aug 2015 17:00:45 +0000 (+0600)
Subject: [downloader/external] Forward --proxy to wget and aria2c
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=bf812ef71438036c23640f29bd7ae955289720ed;p=youtube-dl

[downloader/external] Forward --proxy to wget and aria2c
---

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 @@ class ExternalFD(FileDownloader):
             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 @@ class WgetFD(ExternalFD):
         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 @@ class Aria2cFD(ExternalFD):
         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