targetdisk/squid-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't check for and make keys until Linode invocation

Browse source
This commit is contained in:
Andrea Rogers 2022-08-22 18:40:02 -05:00
commit 45622ad491
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
squid_dl/downloader.py
View file

@ -438,12 +438,7 @@ def parse_args(args: list, name: str):
return parser.parse_args(args=args) return parser.parse_args(args=args)
def check_keys():
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
key_path = os.path.abspath("./proxy_key") key_path = os.path.abspath("./proxy_key")
pubkey_path = os.path.abspath(key_path + ".pub") pubkey_path = os.path.abspath(key_path + ".pub")
if not ( if not (
@ -453,6 +448,11 @@ def main(args: [str], name: str) -> int:
print("[INFO]: Creating SSH key for Linode proxying...") print("[INFO]: Creating SSH key for Linode proxying...")
print(runcmd('ssh-keygen -f "{}" -N ""'.format(key_path)).decode()) 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()) info_dict = j.loads(opts.playlist_json.read())
opts.playlist_json.close() opts.playlist_json.close()
@ -498,6 +498,7 @@ def main(args: [str], name: str) -> int:
port = base_port + n port = base_port + n
if opts.linode_proxy: if opts.linode_proxy:
check_keys()
linode_proxies.append( linode_proxies.append(
LinodeProxy(proxy_port=port, pubkey_path=pubkey_path) LinodeProxy(proxy_port=port, pubkey_path=pubkey_path)
) )