1 files changed, 23 insertions, 20 deletions
diff --git a/src/hydrilla/server/config.py b/src/hydrilla/server/config.py
index 1edd070..42aabab 100644
--- a/src/hydrilla/server/config.py
+++ b/src/hydrilla/server/config.py
@@ -21,19 +21,20 @@
 #
 #
 # I, Wojtek Kosior, thereby promise not to sue for violation of this
-# file's license. Although I request that you do not make use this code
-# in a proprietary program, I am not going to enforce this in court.
-
-# Enable using with Python 3.7.
-from __future__ import annotations
+# file's license. Although I request that you do not make use of this
+# code in a proprietary program, I am not going to enforce this in
+# court.
 
 import json
+import typing as t
 
 from pathlib import Path
 
-import jsonschema
+import jsonschema # type: ignore
 
-from .. import util
+from ..translations import smart_gettext as _
+from ..exceptions import HaketiloException
+from .. import json_instances
 
 config_schema = {
     '$schema': 'http://json-schema.org/draft-07/schema#',
@@ -42,9 +43,6 @@ config_schema = {
         'malcontent_dir': {
             'type': 'string'
         },
-        'malcontent_dir': {
-            'type': 'string'
-        },
         'hydrilla_project_url': {
             'type': 'string'
         },
@@ -67,15 +65,18 @@ config_schema = {
         },
         'werror': {
             'type': 'boolean'
+        },
+        'verify_files': {
+            'type': 'boolean'
         }
     }
 }
 
 here = Path(__file__).resolve().parent
 
-def load(config_paths: list[Path]=[here / 'config.json'],
-         can_fail: list[bool]=[]) -> dict:
-    config = {}
+def load(config_paths: t.List[Path]=[here / 'config.json'],
+         can_fail: t.List[bool]=[]) -> t.Dict[str, t.Any]:
+    config: t.Dict[str, t.Any] = {}
 
     bools_missing = max(0, len(config_paths) - len(can_fail))
     config_paths = [*config_paths]
@@ -92,17 +93,13 @@ def load(config_paths: list[Path]=[here / 'config.json'],
                 continue
             raise e from None
 
-        new_config = json.loads(util.strip_json_comments(json_text))
+        new_config = json.loads(json_instances.strip_json_comments(json_text))
         jsonschema.validate(new_config, config_schema)
 
         config.update(new_config)
 
-        if 'malcontent_dir' in config:
-            malcontent_dir = Path(config['malcontent_dir'])
-            if not malcontent_dir.is_absolute():
-                malcontent_dir = path.parent / malcontent_dir
-
-        config['malcontent_dir'] = str(malcontent_dir.resolve())
+        if 'malcontent_dir' in new_config:
+            malcontent_path_relative_to = path.parent
 
         for key, failure_ok in [('try_configs', True), ('use_configs', False)]:
             paths = new_config.get(key, [])
@@ -110,6 +107,12 @@ def load(config_paths: list[Path]=[here / 'config.json'],
             config_paths.extend(paths)
             can_fail.extend([failure_ok] * len(paths))
 
+
+    if 'malcontent_dir' in config:
+        malcontent_dir_str = config['malcontent_dir']
+        malcontent_dir_path = malcontent_path_relative_to / malcontent_dir_str
+        config['malcontent_dir'] = str(malcontent_dir_path)
+
     for key in ('try_configs', 'use_configs'):
         if key in config:
             config.pop(key)