Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-11-26 02:14:32 +01:00
Code Issues Releases Wiki Activity

adds support for socks protocols and --geo-veryfication-proxy

Browse Source
This commit is contained in:
bato3 2018-07-28 00:47:34 +02:00
parent be477061e8
commit 17acc34e46
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/YoutubeDL.py
View File

@ -2274,7 +2274,7 @@ class YoutubeDL(object):
if hasattr(handler, 'proxies'): if hasattr(handler, 'proxies'):
proxy_map.update(handler.proxies) proxy_map.update(handler.proxies)
self._write_string('[debug] Proxy map: ' + re.sub( self._write_string('[debug] Proxy map: ' + re.sub(
r'(https?://)(?:(?:[^:/\'"@]+:)?[^@]+)(@)', r'((?:http|socks5)s?://)(?:(?:[^:@]+:)?[^@]+)(@)',
r'\1PRIVATE\2', r'\1PRIVATE\2',
compat_str(proxy_map)) + '\n') compat_str(proxy_map)) + '\n')

2
youtube_dl/options.py
View File

@ -21,7 +21,7 @@ from .version import __version__
def _hide_login_info(opts): def _hide_login_info(opts):
PRIVATE_OPTS = set(['-p', '--password', '-u', '--username', '--video-password', '--ap-password', '--ap-username', '--proxy']) PRIVATE_OPTS = set(['-p', '--password', '-u', '--username', '--video-password', '--ap-password', '--ap-username', '--proxy', '--geo-verification-proxy'])
eqre = re.compile('^(?P<key>' + ('|'.join(re.escape(po) for po in PRIVATE_OPTS)) + ')=.+$') eqre = re.compile('^(?P<key>' + ('|'.join(re.escape(po) for po in PRIVATE_OPTS)) + ')=.+$')
def _scrub_eq(o): def _scrub_eq(o):