From 45622ad491e71205662d772b0a2a80218d00047f Mon Sep 17 00:00:00 2001 From: Andrea Rogers Date: Mon, 22 Aug 2022 18:40:02 -0500 Subject: [PATCH] don't check for and make keys until Linode invocation --- squid_dl/downloader.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/squid_dl/downloader.py b/squid_dl/downloader.py index 4af1693..a4d8278 100644 --- a/squid_dl/downloader.py +++ b/squid_dl/downloader.py @@ -438,12 +438,7 @@ def parse_args(args: list, name: str): return parser.parse_args(args=args) - -def main(args: [str], name: str) -> int: - opts = parse_args(args=args, name=name) - sub_langs = opts.subtitle_langs.split(",") - n_workers = opts.n_workers - +def check_keys(): key_path = os.path.abspath("./proxy_key") pubkey_path = os.path.abspath(key_path + ".pub") if not ( @@ -453,6 +448,11 @@ def main(args: [str], name: str) -> int: print("[INFO]: Creating SSH key for Linode proxying...") print(runcmd('ssh-keygen -f "{}" -N ""'.format(key_path)).decode()) +def main(args: [str], name: str) -> int: + opts = parse_args(args=args, name=name) + sub_langs = opts.subtitle_langs.split(",") + n_workers = opts.n_workers + info_dict = j.loads(opts.playlist_json.read()) opts.playlist_json.close() @@ -498,6 +498,7 @@ def main(args: [str], name: str) -> int: port = base_port + n if opts.linode_proxy: + check_keys() linode_proxies.append( LinodeProxy(proxy_port=port, pubkey_path=pubkey_path) )