From 06926fd7865196816c04b21a368ab8595b30228f Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Wed, 10 Apr 2024 16:17:08 -0600 Subject: [PATCH] better arg parsing --- args.py | 13 ++++++++++--- updater/adapter.py | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/args.py b/args.py index 69599e2..b4d70d5 100644 --- a/args.py +++ b/args.py @@ -6,7 +6,6 @@ def get_args(): parser.add_argument("--endpoint", default="https://hatecomputers.club") parser.add_argument("--api-key-file", default="apikey.secret") - parser.add_argument("--records-file", default="records.json") parser.add_argument( "--log-level", default="INFO", @@ -14,9 +13,17 @@ def get_args(): ) parser.add_argument("--certbot", action="store_true", default=False) - parser.add_argument("--acme-url", required=True) + parser.add_argument("--acme-url", required=False) parser.add_argument("--acme-storage", default="acme.json") parser.add_argument("--sync", action="store_true", default=False) + parser.add_argument("--records-file", default="records.json") - return parser.parse_args() + args = parser.parse_args() + + if (args.certbot) and (not args.acme_url): + parser.error("--acme-url is required when --certbot is used") + if (args.certbot) and (args.sync): + parser.error("--sync cannot be used in combination with --certbot") + + return args diff --git a/updater/adapter.py b/updater/adapter.py index b0980a3..a12c8e3 100644 --- a/updater/adapter.py +++ b/updater/adapter.py @@ -20,5 +20,5 @@ class HatecomputersDNSAdapter: for record in dns_entries: self.post_record(record) - self.logger.info(f"sleeping for {eepy_time}") + self.logger.info(f"eeping out for {eepy_time}s") time.sleep(eepy_time)