X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fdownloader%2Fexternal.py;h=51c41c70462674ee3a07aae6f645c06ae7c88c71;hb=16e7711e22648027739096560914a976b8eea786;hp=af9fdba7500e2cd14d7c571688249cdd8dd5c1a8;hpb=d4f64cabf4ede444b390bb71b90ad4103ce572c0;p=youtube-dl diff --git a/youtube_dl/downloader/external.py b/youtube_dl/downloader/external.py index af9fdba75..51c41c704 100644 --- a/youtube_dl/downloader/external.py +++ b/youtube_dl/downloader/external.py @@ -45,6 +45,12 @@ class ExternalFD(FileDownloader): def supports(cls, info_dict): return info_dict['protocol'] in ('http', 'https', 'ftp', 'ftps') + def _source_address(self, command_option): + source_address = self.params.get('source_address') + if source_address is None: + return [] + return [command_option, source_address] + def _call_downloader(self, tmpfilename, info_dict): """ Either overwrite this or implement _make_cmd """ cmd = self._make_cmd(tmpfilename, info_dict) @@ -69,9 +75,10 @@ class ExternalFD(FileDownloader): class CurlFD(ExternalFD): def _make_cmd(self, tmpfilename, info_dict): - cmd = [self.exe, '-o', tmpfilename] + cmd = [self.exe, '--location', '-o', tmpfilename] for key, val in info_dict['http_headers'].items(): cmd += ['--header', '%s: %s' % (key, val)] + cmd += self._source_address('--interface') cmd += ['--', info_dict['url']] return cmd @@ -81,6 +88,7 @@ class WgetFD(ExternalFD): cmd = [self.exe, '-O', tmpfilename, '-nv', '--no-cookies'] for key, val in info_dict['http_headers'].items(): cmd += ['--header', '%s: %s' % (key, val)] + cmd += self._source_address('--bind-address') cmd += ['--', info_dict['url']] return cmd @@ -96,6 +104,7 @@ class Aria2cFD(ExternalFD): cmd += ['--out', os.path.basename(tmpfilename)] for key, val in info_dict['http_headers'].items(): cmd += ['--header', '%s: %s' % (key, val)] + cmd += self._source_address('--interface') cmd += ['--', info_dict['url']] return cmd