From b4a59f7c7cd36b78660c6bb050ef53616a119e08 Mon Sep 17 00:00:00 2001
From: Vikash Kothary <kothary.vikash@gmail.com>
Date: Fri, 14 Oct 2022 23:13:40 +0100
Subject: [PATCH] refactor: Separate loading config from file and environment
 variables

---
 src/ankisyncd/__main__.py | 6 ++++--
 src/ankisyncd/config.py   | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/ankisyncd/__main__.py b/src/ankisyncd/__main__.py
index d924245..16324ea 100644
--- a/src/ankisyncd/__main__.py
+++ b/src/ankisyncd/__main__.py
@@ -2,7 +2,8 @@ import os
 import sys
 
 import ankisyncd
-import ankisyncd.config
+from ankisyncd.config import load_from_file
+from ankisyncd.config import load_from_env
 from ankisyncd import logging
 from ankisyncd.sync_app import SyncApp
 from ankisyncd.server import run_server
@@ -19,7 +20,8 @@ def main():
         "ankisyncd {} ({})".format(ankisyncd._get_version(), ankisyncd._homepage)
     )
 
-    config = ankisyncd.config.load(sys.argv)
+    config = load_from_file(sys.argv)
+    load_from_env(config)
 
     ankiserver = SyncApp(config)
     run_server(ankiserver, config["host"], int(config["port"]))
diff --git a/src/ankisyncd/config.py b/src/ankisyncd/config.py
index 3730cac..756f8bd 100644
--- a/src/ankisyncd/config.py
+++ b/src/ankisyncd/config.py
@@ -26,7 +26,7 @@ def load_from_env(conf):
             logger.info("Setting {} from ENV".format(config_key))
 
 
-def load(path=None):
+def load_from_file(path=None):
     # backwards compat
     if len(path) > 1:
         path = path[1]
@@ -42,7 +42,6 @@ def load(path=None):
             parser.read(path)
             conf = parser["sync_app"]
             logger.info("Loaded config from {}".format(path))
-            load_from_env(conf)
             return conf
         except KeyError:
             pass