refactor(cli): load configs via ConfigReader

Author: tony

src/vcspull/cli/add.py

@@ -7,9 +7,9 @@
 import traceback
 import typing as t
 
-import yaml
 from colorama import Fore, Style
 
+from vcspull._internal.config_reader import ConfigReader
 from vcspull.config import find_home_config_files, save_config_yaml
 
 if t.TYPE_CHECKING:
@@ -95,19 +95,23 @@ def add_repo(
     raw_config: dict[str, t.Any] = {}
     if config_file_path.exists() and config_file_path.is_file():
         try:
-            with config_file_path.open(encoding="utf-8") as f:
-                raw_config = yaml.safe_load(f) or {}
-            if not isinstance(raw_config, dict):
-                log.error(
-                    "Config file %s is not a valid YAML dictionary. ",
-                    config_file_path,
-                )
-                return
+            loaded_config = ConfigReader._from_file(config_file_path)
         except Exception:
             log.exception("Error loading YAML from %s. Aborting.", config_file_path)
             if log.isEnabledFor(logging.DEBUG):
                 traceback.print_exc()
             return
+
+        if loaded_config is None:
+            raw_config = {}
+        elif isinstance(loaded_config, dict):
+            raw_config = loaded_config
+        else:
+            log.error(
+                "Config file %s is not a valid YAML dictionary.",
+                config_file_path,
+            )
+            return
     else:
         log.info(
             "Config file %s not found. A new one will be created.",

src/vcspull/cli/add_from_fs.py

@@ -9,9 +9,9 @@
 import traceback
 import typing as t
 
-import yaml
 from colorama import Fore, Style
 
+from vcspull._internal.config_reader import ConfigReader
 from vcspull.config import expand_dir, find_home_config_files, save_config_yaml
 
 if t.TYPE_CHECKING:
@@ -134,19 +134,23 @@ def add_from_filesystem(
     raw_config: dict[str, t.Any] = {}
     if config_file_path.exists() and config_file_path.is_file():
         try:
-            with config_file_path.open(encoding="utf-8") as f:
-                raw_config = yaml.safe_load(f) or {}
-            if not isinstance(raw_config, dict):
-                log.error(
-                    "Config file %s is not a valid YAML dictionary. ",
-                    config_file_path,
-                )
-                return
+            loaded_config = ConfigReader._from_file(config_file_path)
         except Exception:
             log.exception("Error loading YAML from %s. Aborting.", config_file_path)
             if log.isEnabledFor(logging.DEBUG):
                 traceback.print_exc()
             return
+
+        if loaded_config is None:
+            raw_config = {}
+        elif isinstance(loaded_config, dict):
+            raw_config = loaded_config
+        else:
+            log.error(
+                "Config file %s is not a valid YAML dictionary.",
+                config_file_path,
+            )
+            return
     else:
         log.info(
             "%si%s Config file %s%s%s not found. A new one will be created.",