From 87482e761cb8023db73e936807900039c4bc3809 Mon Sep 17 00:00:00 2001 From: SeaHOH Date: Fri, 9 Dec 2016 19:08:22 +0800 Subject: [PATCH] Fixed http-proxy with extractor-proxy feature --- src/you_get/common.py | 8 ++++---- src/you_get/extractor.py | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/you_get/common.py b/src/you_get/common.py index b6f2d399..1a595423 100755 --- a/src/you_get/common.py +++ b/src/you_get/common.py @@ -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 diff --git a/src/you_get/extractor.py b/src/you_get/extractor.py index 594b908e..05ae2ee8 100644 --- a/src/you_get/extractor.py +++ b/src/you_get/extractor.py @@ -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: