Introduction of a way provide a custom configuration folder.

This patch fixes #377. Contributors: * @spirillen
funilrys · Sep 29, 2024 · 541dd57 · 541dd57
1 parent 90b0d98
commit 541dd57
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/PyFunceble/cli/entry_points/pyfunceble/cli.py b/PyFunceble/cli/entry_points/pyfunceble/cli.py
@@ -1209,6 +1209,16 @@ def get_default_group_data() -> List[Tuple[List[str], dict]]:
                 "overwritten by your overwrite configuration file.",
             },
         ),
+        (
+            [
+                "--config-dir",
+            ],
+            {
+                "dest": "config_dir",
+                "type": os.path.realpath,
+                "help": "Sets the configuration directory to use.",
+            },
+        ),
     ]
 
 

diff --git a/PyFunceble/cli/system/integrator.py b/PyFunceble/cli/system/integrator.py
@@ -265,6 +265,10 @@ def start(self) -> "SystemIntegrator":
                     )
                 )
 
+            if hasattr(self.args, "config_dir") and self.args.config_dir:
+                PyFunceble.facility.ConfigLoader.set_config_dir(self.args.config_dir)
+                PyFunceble.storage.CONFIG_DIRECTORY = self.args.config_dir
+
             if hasattr(self.args, "config_file") and self.args.config_file:
                 PyFunceble.facility.ConfigLoader.set_remote_config_location(
                     self.args.config_file

diff --git a/PyFunceble/config/loader.py b/PyFunceble/config/loader.py
@@ -60,6 +60,7 @@
     import importlib_resources as package_resources
 
 from box import Box
+from dotenv import load_dotenv
 from yaml.error import MarkedYAMLError
 
 import PyFunceble.cli.storage
@@ -144,7 +145,7 @@ def wrapper(self, *args, **kwargs):
             result = func(self, *args, **kwargs)  # pylint: disable=not-callable
 
             if self.is_already_loaded():
-                self.start()
+                self.reload()
 
             return result
 
@@ -531,6 +532,9 @@ def start(self) -> "ConfigLoader":
         Starts the loading processIs.
         """
 
+        load_dotenv(os.path.join(self.config_dir, ".env"))
+        load_dotenv(os.path.join(self.config_dir, PyFunceble.storage.ENV_FILENAME))
+
         config = self.get_config_file_content()
 
         if self.custom_config: