From 14e12a59db0341106fb515fcf19d30d5d940d386 Mon Sep 17 00:00:00 2001 From: rootzoll Date: Mon, 13 Jul 2020 12:53:54 +0200 Subject: [PATCH] fix create section --- .../config.scripts/blitz.subscriptions.ip2tor.py | 10 ++-------- .../config.scripts/blitz.subscriptions.letsencrypt.py | 6 +----- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/home.admin/config.scripts/blitz.subscriptions.ip2tor.py b/home.admin/config.scripts/blitz.subscriptions.ip2tor.py index 2c6514ae1..c64471c76 100644 --- a/home.admin/config.scripts/blitz.subscriptions.ip2tor.py +++ b/home.admin/config.scripts/blitz.subscriptions.ip2tor.py @@ -417,12 +417,8 @@ def shopOrder(shopUrl, hostid, servicename, torTarget, duration, msatsFirst, msa else: print("# new toml file") subscriptions = {} - try: - subscriptions['subscriptions_ip2tor'] - print("# section exists") - except IndexError: + if "subscriptions_ip2tor" not in subs: subscriptions['subscriptions_ip2tor'] = [] - print("# section created") subscriptions['subscriptions_ip2tor'].append(subscription) subscriptions['shop_ip2tor'] = shopUrl with open(SUBSCRIPTIONS_FILE, 'w') as writer: @@ -821,9 +817,7 @@ if sys.argv[1] == "subscriptions-list": subs = toml.load(SUBSCRIPTIONS_FILE) else: subs = {} - try: - subs['subscriptions_ip2tor'] - except IndexError: + if "subscriptions_ip2tor" not in subs: subs['subscriptions_ip2tor'] = [] print(json.dumps(subs['subscriptions_ip2tor'], indent=2)) diff --git a/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py b/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py index a97a0eb41..249fd3b82 100644 --- a/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py +++ b/home.admin/config.scripts/blitz.subscriptions.letsencrypt.py @@ -113,12 +113,8 @@ def subscriptionsNew(ip, dnsservice, id, token): else: print("# new toml file") subscriptions = {} - try: - subscriptions['subscriptions_letsencrypt'] - print("# section exists") - except IndexError: + if "subscriptions_letsencrypt" not in subs: subscriptions['subscriptions_letsencrypt'] = [] - print("# section created") subscriptions['subscriptions_letsencrypt'].append(subscription) with open(SUBSCRIPTIONS_FILE, 'w') as writer: writer.write(toml.dumps(subscriptions))