fix(asrgs, config): Correctly source xdg data paths (#806) (fixes: #801)

* Prefer environment variables over config * Sync default config values
actionless · Jun 15, 2024 · a3a476c · a3a476c
1 parent 0b34e1e
commit a3a476c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/pikaur/config.py b/pikaur/config.py
@@ -144,6 +144,18 @@ def init_value(cls) -> Path:
         return Path(gettempdir())
 
 
+class _CachePathDefault(FixedPathSingleton):
+    @classmethod
+    def init_value(cls) -> Path:
+        return Path(
+            pre_arg_parser("--xdg-cache-home", "")
+            or os.environ.get(
+                "XDG_CACHE_HOME",
+            )
+            or Home()() / ".cache/",
+        )
+
+
 class _UserCacheRoot(FixedPathSingleton):
     @classmethod
     def init_value(cls) -> Path:
@@ -190,6 +202,18 @@ def init_value(cls) -> Path:
         )
 
 
+class _DataPathDefault(FixedPathSingleton):
+    @classmethod
+    def init_value(cls) -> Path:
+        return Path(
+            pre_arg_parser("--xdg-data-home", "")
+            or os.environ.get(
+                "XDG_DATA_HOME",
+            )
+            or Home()() / ".local/share/",
+        )
+
+
 class DataRoot(FixedPathSingleton):
     @classmethod
     def init_value(cls) -> Path:
@@ -459,11 +483,11 @@ class DiffPagerValues:
         },
         "CachePath": {
             "data_type": STR,
-            "default": str(Home()() / ".cache/"),
+            "default": str(_CachePathDefault()()),
         },
         "DataPath": {
             "data_type": STR,
-            "default": str(Home()() / ".local/share/"),
+            "default": str(_DataPathDefault()()),
         },
         "PacmanPath": {
             "data_type": STR,

diff --git a/pikaur/privilege.py b/pikaur/privilege.py
@@ -119,7 +119,7 @@ def get_args_to_elevate_pikaur(original_args: list[str]) -> list[str]:
             ("--xdg-data-home", "xdg_data_home", "XDG_DATA_HOME"),
         ):
             arg_value = str(getattr(args, arg_key, None) or "")
-            if value := (arg_value or os.environ.get(env_key)):
+            if value := (os.environ.get(env_key) or arg_value):
                 extra_args += [
                     (flag, value),
                 ]