PublicMirrors/you-get
1
0
Fork 0
mirror of https://github.com/soimort/you-get.git synced 2025-02-11 20:52:31 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Fixed http-proxy with extractor-proxy feature

Browse Source
This commit is contained in:
SeaHOH 2016-12-09 19:08:22 +08:00 committed by GitHub
parent 250672f42d
commit 87482e761c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/you_get/common.py
View File

@ -1305,14 +1305,14 @@ def script_main(script_name, download, download_playlist, **kwargs):
try:
if stream_id:
if not extractor_proxy:
download_main(download, download_playlist, args, playlist, stream_id=stream_id, output_dir=output_dir, merge=merge, info_only=info_only, json_output=json_output, caption=caption)
download_main(download, download_playlist, args, playlist, stream_id=stream_id, proxy=proxy, extractor_proxy=proxy, output_dir=output_dir, merge=merge, info_only=info_only, json_output=json_output, caption=caption)
else:
download_main(download, download_playlist, args, playlist, stream_id=stream_id, extractor_proxy=extractor_proxy, output_dir=output_dir, merge=merge, info_only=info_only, json_output=json_output, caption=caption)
download_main(download, download_playlist, args, playlist, stream_id=stream_id, proxy=proxy, extractor_proxy=extractor_proxy, output_dir=output_dir, merge=merge, info_only=info_only, json_output=json_output, caption=caption)
else:
if not extractor_proxy:
download_main(download, download_playlist, args, playlist, output_dir=output_dir, merge=merge, info_only=info_only, json_output=json_output, caption=caption)
download_main(download, download_playlist, args, playlist, proxy=proxy, extractor_proxy=proxy, output_dir=output_dir, merge=merge, info_only=info_only, json_output=json_output, caption=caption)
else:
download_main(download, download_playlist, args, playlist, extractor_proxy=extractor_proxy, output_dir=output_dir, merge=merge, info_only=info_only, json_output=json_output, caption=caption)
download_main(download, download_playlist, args, playlist, proxy=proxy, extractor_proxy=extractor_proxy, output_dir=output_dir, merge=merge, info_only=info_only, json_output=json_output, caption=caption)
except KeyboardInterrupt:
if traceback:
raise

4
src/you_get/extractor.py
View File

@ -39,7 +39,9 @@ class VideoExtractor():
if 'extractor_proxy' in kwargs and kwargs['extractor_proxy']:
set_proxy(parse_host(kwargs['extractor_proxy']))
self.prepare(**kwargs)
if 'extractor_proxy' in kwargs and kwargs['extractor_proxy']:
if 'proxy' in kwargs and kwargs['proxy']:
set_proxy(parse_host(kwargs['proxy']))
elif 'extractor_proxy' in kwargs and kwargs['extractor_proxy']:
unset_proxy()
try: