Improve handling around config.

Author: funilrys

PyFunceble/config/compare.py

@@ -11,7 +11,7 @@
     ██║        ██║   ██║     ╚██████╔╝██║ ╚████║╚██████╗███████╗██████╔╝███████╗███████╗
     ╚═╝        ╚═╝   ╚═╝      ╚═════╝ ╚═╝  ╚═══╝ ╚═════╝╚══════╝╚═════╝ ╚══════╝╚══════╝
 
-Provides the configuration comparision interface.
+Provides the configuration comparison interface.
 
 Author:
     Nissar Chababy, @funilrys, contactTATAfunilrysTODTODcom
@@ -175,7 +175,7 @@ class ConfigComparison:
     }
 
     _local_config: dict = {}
-    _upsteam_config: dict = {}
+    _upstream_config: dict = {}
 
     dict_helper: DictHelper = DictHelper()
 
@@ -228,12 +228,12 @@ def upstream_config(self) -> dict:
         Provides the current state of the :code:`_upstream_config`.
         """
 
-        return self._upsteam_config
+        return self._upstream_config
 
     @upstream_config.setter
     def upstream_config(self, value: dict) -> None:
         """
-        Sets the upstram configuration to work with.
+        Sets the upstream configuration to work with.
 
         :raise TypeError:
             When :code:`value` is not a :py:class:`dict`
@@ -242,11 +242,11 @@ def upstream_config(self, value: dict) -> None:
         if not isinstance(value, dict):
             raise TypeError(f"<value> should be {dict}, {type(value)} given.")
 
-        self._upsteam_config = copy.deepcopy(value)
+        self._upstream_config = copy.deepcopy(value)
 
     def set_upstream_config(self, value: dict) -> "ConfigComparison":
         """
-        Sets the upstram configuration to work with.
+        Sets the upstream configuration to work with.
         """
 
         self.upstream_config = value
@@ -265,6 +265,7 @@ def is_local_identical(self) -> bool:
             )
             or "user_agent" not in self.local_config
             or not isinstance(self.local_config["user_agent"], dict)
+            or "http_codes" not in self.local_config
             or "active" in self.local_config["http_codes"]
             or "not_found_default" in self.local_config["http_codes"]
             or "self_managed" not in self.local_config["http_codes"]
@@ -281,7 +282,7 @@ def is_local_identical(self) -> bool:
             if index in self.DELETED_CORE:
                 return False
 
-        for index in self.local_config["links"]:
+        for index in self.local_config.get("links", {}):
             if index in self.DELETED_LINKS:
                 return False
 
@@ -369,10 +370,10 @@ def get_merged(self) -> dict:
                 del merged[index]
 
         for index in self.DELETED_LINKS:
-            if index in merged["links"]:
+            if index in merged.get("links", {}):
                 del merged["links"][index]
 
-        if not bool(merged["http_codes"]["self_managed"]):
+        if "http_codes" in merged and not bool(merged["http_codes"]["self_managed"]):
             for index, values in PyFunceble.storage.STD_HTTP_CODES.list.items():
                 merged["http_codes"]["list"][index] = list(values)
 

PyFunceble/config/loader.py

@@ -99,8 +99,8 @@ class ConfigLoader:
     _config_dir: Optional[str] = None
     __config_loaded: bool = False
 
-    file_helper: FileHelper = FileHelper()
-    dict_helper: DictHelper = DictHelper()
+    file_helper: Optional[FileHelper] = None
+    dict_helper: Optional[DictHelper] = None
 
     def __init__(
         self, merge_upstream: Optional[bool] = None, *, config_dir: Optional[str] = None
@@ -123,6 +123,9 @@ def __init__(
         elif EnvironmentVariableHelper("PYFUNCEBLE_AUTO_CONFIGURATION").exists():
             self.merge_upstream = True
 
+        self.file_helper = FileHelper()
+        self.dict_helper = DictHelper()
+
     def __del__(self) -> None:
         self.destroy()
 
@@ -451,7 +454,7 @@ def download_dynamic_infrastructure_files(
         self,
     ) -> "ConfigLoader":
         """
-        Downloads all the dynamicly (generated) infrastructure files.
+        Downloads all the dynamically (generated) infrastructure files.
 
         .. note::
             Downloaded if missing:
@@ -532,7 +535,7 @@ def download_remote_config(src: str, dest: str = None) -> None:
             or self.merge_upstream
             or is_3_x_version(config)
             or not config_comparer.is_local_identical()
-        ):  # pragma: no cover ## Testing the underlying comparison method is sufficent
+        ):  # pragma: no cover ## Testing the underlying comparison method is sufficient
             config = config_comparer.get_merged()
 
             self.dict_helper.set_subject(config).to_yaml_file(self.path_to_config)