Just change

This commit is contained in:
SeaHOH 2016-12-10 03:07:12 +08:00 committed by GitHub
parent 87482e761c
commit 253e1eb454

View File

@ -1303,16 +1303,7 @@ def script_main(script_name, download, download_playlist, **kwargs):
socket.setdefaulttimeout(timeout) socket.setdefaulttimeout(timeout)
try: try:
if stream_id: download_main(download, download_playlist, args, playlist, stream_id=stream_id, proxy=proxy, extractor_proxy=extractor_proxy or proxy, output_dir=output_dir, merge=merge, info_only=info_only, json_output=json_output, caption=caption)
if not extractor_proxy:
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, 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, 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, proxy=proxy, extractor_proxy=extractor_proxy, output_dir=output_dir, merge=merge, info_only=info_only, json_output=json_output, caption=caption)
except KeyboardInterrupt: except KeyboardInterrupt:
if traceback: if traceback:
raise raise