From aefe76fbc7ac68ab9786d84e9cbb0962f0600fd2 Mon Sep 17 00:00:00 2001
From: Wojtek Kosior <koszko@koszko.org>
Date: Mon, 21 Feb 2022 17:22:09 +0100
Subject: make hydrilla.server.config.load() use the default config path when
 none is passed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This way it will be easier to create a .wsgi script for Hydrilla.
---
 src/hydrilla/server/config.py | 5 ++++-
 src/hydrilla/server/serve.py  | 8 +++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/hydrilla/server')

diff --git a/src/hydrilla/server/config.py b/src/hydrilla/server/config.py
index 4b5bcd7..0155e83 100644
--- a/src/hydrilla/server/config.py
+++ b/src/hydrilla/server/config.py
@@ -68,7 +68,10 @@ config_schema = {
     }
 }
 
-def load(config_paths: list[Path], can_fail: list[bool]=[]) -> dict:
+here = Path(__file__).resolve().parent
+
+def load(config_paths: list[Path]=[here / 'config.json'],
+         can_fail: list[bool]=[]) -> dict:
     config = {}
 
     bools_missing = max(0, len(config_paths) - len(can_fail))
diff --git a/src/hydrilla/server/serve.py b/src/hydrilla/server/serve.py
index a5cdee8..075eaef 100644
--- a/src/hydrilla/server/serve.py
+++ b/src/hydrilla/server/serve.py
@@ -570,12 +570,10 @@ def start(malcontent_dir: Optional[str], hydrilla_project_url: Optional[str],
           port: Optional[int], config_path: Optional[str],
           language: Optional[str]) -> None:
     """<this will be replaced by a localized docstring for Click to pick up>"""
-    if config_path is None:
-        config_path = here / 'config.json'
-    else:
-        config_path = Path(config)
+    config_load_opts = {} if config_path is None \
+        else {'config_path': [Path(config_path)]}
 
-    hydrilla_config = config.load([config_path])
+    hydrilla_config = config.load(**config_load_opts)
 
     if malcontent_dir is not None:
         hydrilla_config['malcontent_dir'] = str(Path(malcontent_dir).resolve())
-- 
cgit v1.2.3