vrr/recollwebui
2
0
Fork 0
mirror of https://framagit.org/medoc92/recollwebui.git synced 2026-10-19 03:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

shared conftree.py fixes

Browse source
This commit is contained in:
Jean-Francois Dockes 2025-11-25 09:21:53 +01:00
parent ed0737b1d3
commit af90b30cde
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
conftree.py
View file

@ -220,10 +220,12 @@ class ConfTree(ConfSimple):
# Try all sk ancestors as submaps (/a/b/c-> /a/b/c, /a/b, /a, b'')
while True:
if sk in self.submaps:
return ConfSimple.getbin(self, nm, sk)
if sk + b"/" in self.submaps:
return ConfSimple.getbin(self, nm, sk + b"/")
val = ConfSimple.getbin(self, nm, sk)
if val is not None:
return val
val = ConfSimple.getbin(self, nm, sk + b"/")
if val is not None:
return val
nsk = os.path.dirname(sk)
if nsk == sk:
# sk was already root, we're done.
@ -239,7 +241,8 @@ class ConfStack(object):
This typically provides for defaults overridden by sparse values in the
topmost file."""
def __init__(self, nm, dirs, tp="simple"):
def __init__(self, nm, dirs, tp="simple", casesensitive=True):
self.casesens = casesensitive
fnames = []
for dir in dirs:
fnm = os.path.join(dir, nm)
@ -250,9 +253,9 @@ class ConfStack(object):
self.confs = []
for fname in fnames:
if tp.lower() == "simple":
conf = ConfSimple(fname)
conf = ConfSimple(fname, casesensitive = self.casesens)
else:
conf = ConfTree(fname)
conf = ConfTree(fname, casesensitive = self.casesens)
self.confs.append(conf)
# Accepts / returns binary strings (non-unicode)