From 153ac4227a5ae465792d25b1b667b76c50cab287 Mon Sep 17 00:00:00 2001 From: Vikash Kothary Date: Fri, 14 Oct 2022 22:58:50 +0100 Subject: [PATCH] refactor: Move backward compatible argument handling into config loader --- src/ankisyncd/__main__.py | 6 +----- src/ankisyncd/config.py | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ankisyncd/__main__.py b/src/ankisyncd/__main__.py index fc38931..d924245 100644 --- a/src/ankisyncd/__main__.py +++ b/src/ankisyncd/__main__.py @@ -19,11 +19,7 @@ def main(): "ankisyncd {} ({})".format(ankisyncd._get_version(), ankisyncd._homepage) ) - if len(sys.argv) > 1: - # backwards compat - config = ankisyncd.config.load(sys.argv[1]) - else: - config = ankisyncd.config.load() + config = ankisyncd.config.load(sys.argv) ankiserver = SyncApp(config) run_server(ankiserver, config["host"], int(config["port"])) diff --git a/src/ankisyncd/config.py b/src/ankisyncd/config.py index a440b44..6a000d5 100644 --- a/src/ankisyncd/config.py +++ b/src/ankisyncd/config.py @@ -26,6 +26,11 @@ def load_from_env(conf): def load(path=None): + # backwards compat + if len(path) > 1: + path = path[1] + else: + path = None choices = paths parser = configparser.ConfigParser() if path: