refactor(config: ConfigRoot): continue replacing globals to singleton…

…s - 2
actionless · Jul 16, 2023 · b05bb84 · b05bb84
1 parent 5f1263a
commit b05bb84
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/pikaur/config.py b/pikaur/config.py
@@ -104,14 +104,6 @@ def get_value(cls) -> Path:
         return cls.value
 
 
-VERSION: "Final" = "1.16.1-dev"
-
-DEFAULT_CONFIG_ENCODING: "Final" = "utf-8"
-BOOL: "Final" = "bool"
-INT: "Final" = "int"
-STR: "Final" = "str"
-
-
 def pre_arg_parser(key: str, fallback: str) -> str:
     if key in sys.argv:
         return sys.argv[
@@ -130,6 +122,14 @@ def pre_arg_parser(key: str, fallback: str) -> str:
     return fallback
 
 
+VERSION: "Final" = "1.16.1-dev"
+
+DEFAULT_CONFIG_ENCODING: "Final" = "utf-8"
+BOOL: "Final" = "bool"
+INT: "Final" = "int"
+STR: "Final" = "str"
+
+
 class CustomUserId(IntOrBoolSingleton):
     @classmethod
     def init_value(cls) -> int:
@@ -199,10 +199,14 @@ def get_value(cls) -> Path:
         return CacheRoot()() / "pkg"
 
 
-CONFIG_ROOT: "Final" = Path(os.environ.get(
-    "XDG_CONFIG_HOME",
-    Home()() / ".config/",
-))
+class ConfigRoot(PathSingleton):
+    @classmethod
+    def get_value(cls) -> Path:
+        return Path(os.environ.get(
+            "XDG_CONFIG_HOME",
+            Home()() / ".config/",
+        ))
+
 
 DATA_ROOT: "Final" = (
     Path(os.environ.get(
@@ -234,7 +238,7 @@ def get_config_path() -> Path:
     config_overridden = pre_arg_parser("--pikaur-config", "")
     if config_overridden:
         return Path(config_overridden)
-    return CONFIG_ROOT / "pikaur.conf"
+    return ConfigRoot()() / "pikaur.conf"
 
 
 class UpgradeSortingValues:
@@ -511,13 +515,14 @@ def write_config(config: configparser.ConfigParser | None = None) -> None:
                 need_write = True
     if need_write:
         update_custom_user_id(int(config["misc"]["UserId"]))
-        if not CONFIG_ROOT.exists():
-            CONFIG_ROOT.mkdir(parents=True)
+        config_root = ConfigRoot()()
+        if not config_root.exists():
+            config_root.mkdir(parents=True)
         with get_config_path().open("w", encoding=DEFAULT_CONFIG_ENCODING) as configfile:
             config.write(configfile)
         if custom_user_id := CustomUserId()():
             for path in (
-                CONFIG_ROOT,
+                config_root,
                 get_config_path(),
             ):
                 os.chown(path, custom_user_id, custom_user_id)

diff --git a/pikaur/makepkg_config.py b/pikaur/makepkg_config.py
@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING
 
 from .args import parse_args
-from .config import CONFIG_ROOT, _UserTempRoot
+from .config import ConfigRoot, _UserTempRoot
 from .core import open_file
 from .privilege import using_dynamic_users
 
@@ -96,7 +96,7 @@ def get_user_makepkg_path(cls) -> Path | None:
         if cls._user_makepkg_path is cls._UNSET:
             possible_paths = [
                 Path("~/.makepkg.conf").expanduser(),
-                CONFIG_ROOT / "pacman/makepkg.conf",
+                ConfigRoot()() / "pacman/makepkg.conf",
             ]
             config_path: Path | None = None
             for path in possible_paths: