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

ignore dotfiles in config-folders; closes #727

Browse source 
macos adds garbage files named ._something.conf
into config folders, crashing the config parser
This commit is contained in:
ed 2025-09-03 19:57:28 +00:00
parent c71128fd72
commit 230a146209
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
copyparty/authsrv.py
View file

@ -1751,7 +1751,11 @@ class AuthSrv(object):
files = os.listdir(E.cfg) files = os.listdir(E.cfg)
except: except:
files = [] files = []
hits = [x for x in files if x.lower().endswith(".conf")] hits = [
x
for x in files
if x.lower().endswith(".conf") and not x.startswith(".")
]
if hits: if hits:
t = "Hint: Found some config files in [%s], but these were not automatically loaded because they are in the wrong place%s %s\n" t = "Hint: Found some config files in [%s], but these were not automatically loaded because they are in the wrong place%s %s\n"
self.log(t % (E.cfg, ehint, ", ".join(hits)), 3) self.log(t % (E.cfg, ehint, ", ".join(hits)), 3)
@ -3501,7 +3505,9 @@ def expand_config_file(
if os.path.isdir(fp): if os.path.isdir(fp):
names = list(sorted(os.listdir(fp))) names = list(sorted(os.listdir(fp)))
cnames = [x for x in names if x.lower().endswith(".conf")] cnames = [
x for x in names if x.lower().endswith(".conf") and not x.startswith(".")
]
if not cnames: if not cnames:
t = "warning: tried to read config-files from folder '%s' but it does not contain any " t = "warning: tried to read config-files from folder '%s' but it does not contain any "
if names: if names: