R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[YoutubeDL] Print alternative proxy map in debug info

Browse Source
This commit is contained in:
Yen Chi Hsuan 2015-02-27 21:45:46 +08:00
parent 9dadd38c22
commit 5c9a26dae5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
youtube_dl/YoutubeDL.py
View File

@ -1713,11 +1713,8 @@ class YoutubeDL(object):
exe_str = 'none' exe_str = 'none'
self._write_string('[debug] exe versions: %s\n' % exe_str) self._write_string('[debug] exe versions: %s\n' % exe_str)
proxy_map = {} self.dump_proxy_map('default', 'Proxy map')
for handler in self._opener.handlers: self.dump_proxy_map('alternative', 'Alternative proxy map')
if hasattr(handler, 'proxies'):
proxy_map.update(handler.proxies)
self._write_string('[debug] Proxy map: ' + compat_str(proxy_map) + '\n')
if self.params.get('call_home', False): if self.params.get('call_home', False):
ipaddr = self.urlopen('https://yt-dl.org/ip').read().decode('utf-8') ipaddr = self.urlopen('https://yt-dl.org/ip').read().decode('utf-8')
@ -1730,6 +1727,13 @@ class YoutubeDL(object):
'See https://yt-dl.org/update if you need help updating.' % 'See https://yt-dl.org/update if you need help updating.' %
latest_version) latest_version)
def dump_proxy_map(self, opener_name, prefix):
proxy_map = {}
for handler in self._openers_pool[opener_name].handlers:
if hasattr(handler, 'proxies'):
proxy_map.update(handler.proxies)
self._write_string('[debug] %s: %s\n' % (prefix, compat_str(proxy_map)))
def _setup_openers(self): def _setup_openers(self):
default_proxy = self.params.get('proxy') default_proxy = self.params.get('proxy')
alternative_proxy = self.params.get('alternative_proxy') alternative_proxy = self.params.get('alternative_proxy')