cista/__main__.py

@@ -50,7 +50,6 @@ def main():
 
 def _main():
     args = docopt(doc)
-    config.init_confdir()
     if args["--user"]:
         return _user(args)
     listen = args["-l"]

cista/config.py

@@ -7,7 +7,7 @@ from functools import wraps
 from hashlib import sha256
 from pathlib import Path, PurePath
 from time import time
-from contextlib import suppress
+
 import msgspec
 
 
@@ -37,22 +37,6 @@ config = None
 conffile = None
 
 
-def init_confdir():
-    if p := os.environ.get("CISTA_HOME"):
-        home = Path(p)
-    else:
-        xdg = os.environ.get("XDG_CONFIG_HOME")
-        home = (
-            Path(xdg).expanduser() / "cista" if xdg else Path.home() / ".config/cista"
-        )
-    if not home.exists()
-        home.mkdir(parents=True, exist_ok=True)
-        home.chmod(0o700)
-
-    global conffile
-    conffile = home / "db.toml"
-
-
 def derived_secret(*params, len=8) -> bytes:
     """Used to derive secret keys from the main secret"""
     # Each part is made the same length by hashing first
@@ -78,8 +62,8 @@ def dec_hook(typ, obj):
 
 def config_update(modify):
     global config
-    if conffile is None:
-        init_confdir()
+    if not conffile.exists():
+        conffile.parent.mkdir(parents=True, exist_ok=True)
     tmpname = conffile.with_suffix(".tmp")
     try:
         f = tmpname.open("xb")
@@ -93,6 +77,10 @@ def config_update(modify):
             old = conffile.read_bytes()
             c = msgspec.toml.decode(old, type=Config, dec_hook=dec_hook)
         except FileNotFoundError:
+            # No existing config file, make sure we have a folder...
+            confdir = conffile.parent
+            confdir.mkdir(parents=True, exist_ok=True)
+            confdir.chmod(0o700)
             old = b""
             c = None
         c = modify(c)
@@ -105,9 +93,7 @@ def config_update(modify):
         f.write(new)
         f.close()
         if sys.platform == "win32":
-            # Windows doesn't support atomic replace
-            with suppress(FileNotFoundError):
-                conffile.unlink()
+            conffile.unlink()  # Windows doesn't support atomic replace
         tmpname.rename(conffile)  # Atomic replace
     except:
         f.close()
@@ -135,8 +121,9 @@ def modifies_config(modify):
 
 def load_config():
     global config, conffile
-    if conffile is None:
-        init_confdir()
+    conffile = (
+        Path(os.environ.get("CISTA_HOME")) or Path.home() / ".local/share/cista/db.toml"
+    )
     config = msgspec.toml.decode(conffile.read_bytes(), type=Config, dec_hook=dec_hook)