mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2026-06-18 20:22:27 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix wrong dks in tree/navpane (closes #1392);

Browse source 
wrong key due to url-escaped foldername as input

also fixes "wrong dirkey" logspam as parent levels are built
This commit is contained in:
ed 2026-04-22 18:39:06 +00:00
parent ac05b4f1e6
commit 228c3dfa79
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
copyparty/httpcli.py
View file

@ -5835,6 +5835,7 @@ class HttpCli(object):
excl, target = (target.split("/", 1) + [""])[:2] excl, target = (target.split("/", 1) + [""])[:2]
sub = self.gen_tree("/".join([top, excl]).strip("/"), target, dk) sub = self.gen_tree("/".join([top, excl]).strip("/"), target, dk)
ret["k" + quotep(excl)] = sub ret["k" + quotep(excl)] = sub
dk = ""
vfs = self.asrv.vfs vfs = self.asrv.vfs
dk_sz = False dk_sz = False
@ -5874,16 +5875,16 @@ class HttpCli(object):
else: else:
dirs = exclude_dotfiles(dirs) dirs = exclude_dotfiles(dirs)
dirs = [quotep(x) for x in dirs if x != excl]
if dk_sz and fsroot: if dk_sz and fsroot:
kdirs = [] kdirs = []
fsroot_ = os.path.join(fsroot, "") fsroot_ = os.path.join(fsroot, "")
for dn in dirs: for dn in [x for x in dirs if x != excl]:
ap = fsroot_ + dn ap = fsroot_ + dn
zs = self.gen_fk(2, self.args.dk_salt, ap, 0, 0)[:dk_sz] zs = self.gen_fk(2, self.args.dk_salt, ap, 0, 0)[:dk_sz]
kdirs.append(dn + "?k=" + zs) kdirs.append(quotep(dn) + "?k=" + zs)
dirs = kdirs dirs = kdirs
else:
dirs = [quotep(x) for x in dirs if x != excl]
if vfs_virt: if vfs_virt:
for x in vfs_virt: for x in vfs_virt: