mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-09-28 12:42:26 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

strongly prefer XDG_CONFIG_HOME; closes #442

Browse source
This commit is contained in:
ed 2025-08-24 21:34:37 +00:00
parent 48d6224ec8
commit 35472557cb
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
copyparty/__main__.py
View file

@ -196,26 +196,33 @@ def init_E(EE: EnvParams) -> None:
(unicode, "/tmp"), (unicode, "/tmp"),
] ]
errs = [] errs = []
for chk in [os.listdir, os.mkdir]: if True:
for npath, (pf, pa) in enumerate(paths): for npath, (pf, pa) in enumerate(paths):
p = "" p = ""
try: try:
p = pf(pa) p = pf(pa)
# print(chk.__name__, p, pa)
if not p or p.startswith("~"): if not p or p.startswith("~"):
continue continue
p = os.path.normpath(p) p = os.path.normpath(p)
chk(p) # type: ignore if os.path.isdir(p) and os.listdir(p):
mkdir = False
else:
mkdir = True
os.mkdir(p)
p = os.path.join(p, "copyparty") p = os.path.join(p, "copyparty")
if not os.path.isdir(p): if not os.path.isdir(p):
os.mkdir(p) os.mkdir(p)
if npath > 1: if npath > 1:
t = "Using [%s] for config; filekeys/dirkeys will change on every restart. Consider setting XDG_CONFIG_HOME or giving the unix-user a ~/.config/" t = "Using %s/copyparty [%s] for config; filekeys/dirkeys will change on every restart. Consider setting XDG_CONFIG_HOME or giving the unix-user a ~/.config/"
errs.append(t % (p,)) errs.append(t % (pa, p))
elif mkdir:
t = "Using %s/copyparty [%s] for config%s (Warning: %s did not exist and was created just now)"
errs.append(t % (pa, p, " instead" if npath else "", pa))
elif errs: elif errs:
errs.append("Using [%s] instead" % (p,)) errs.append("Using %s/copyparty [%s] instead" % (pa, p))
if errs: if errs:
warn(". ".join(errs)) warn(". ".join(errs))
@ -223,8 +230,8 @@ def init_E(EE: EnvParams) -> None:
return p # type: ignore return p # type: ignore
except Exception as ex: except Exception as ex:
if p and npath < 2: if p and npath < 2:
t = "Unable to store config in [%s] due to %r" t = "Unable to store config in %s [%s] due to %r"
errs.append(t % (p, ex)) errs.append(t % (pa, p, ex))
raise Exception("could not find a writable path for config") raise Exception("could not find a writable path for config")