mirror of
https://github.com/9001/copyparty.git
synced 2025-09-28 12:42:26 -06:00
ignore dotfiles in config-folders; closes #727
macos adds garbage files named ._something.conf into config folders, crashing the config parser
This commit is contained in:
parent
c71128fd72
commit
230a146209
|
@ -1751,7 +1751,11 @@ class AuthSrv(object):
|
|||
files = os.listdir(E.cfg)
|
||||
except:
|
||||
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:
|
||||
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)
|
||||
|
@ -3501,7 +3505,9 @@ def expand_config_file(
|
|||
|
||||
if os.path.isdir(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:
|
||||
t = "warning: tried to read config-files from folder '%s' but it does not contain any "
|
||||
if names:
|
||||
|
|
Loading…
Reference in a new issue