mirror of
https://github.com/9001/copyparty.git
synced 2026-04-13 07:32:49 -06:00
httpcli: filter directory listings using .hidden
This commit is contained in:
parent
67fd204003
commit
501e8d20e0
|
|
@ -80,6 +80,7 @@ from .util import (
|
||||||
has_resource,
|
has_resource,
|
||||||
hashcopy,
|
hashcopy,
|
||||||
hidedir,
|
hidedir,
|
||||||
|
load_dothidden,
|
||||||
html_bescape,
|
html_bescape,
|
||||||
html_escape,
|
html_escape,
|
||||||
html_sh_esc,
|
html_sh_esc,
|
||||||
|
|
@ -1845,13 +1846,14 @@ class HttpCli(object):
|
||||||
if not self.can_read:
|
if not self.can_read:
|
||||||
vfs_ls = []
|
vfs_ls = []
|
||||||
if not self.can_dot:
|
if not self.can_dot:
|
||||||
vfs_ls = exclude_dotfiles_ls(vfs_ls)
|
dothidden = load_dothidden(vn.canonical(rem))
|
||||||
|
vfs_ls = exclude_dotfiles_ls(vfs_ls, dothidden)
|
||||||
fgen = [{"vp": vp, "st": st} for vp, st in vfs_ls]
|
fgen = [{"vp": vp, "st": st} for vp, st in vfs_ls]
|
||||||
|
|
||||||
if vfs_virt:
|
if vfs_virt:
|
||||||
zsl = list(vfs_virt)
|
zsl = list(vfs_virt)
|
||||||
if not self.can_dot:
|
if not self.can_dot:
|
||||||
zsl = exclude_dotfiles(zsl)
|
zsl = exclude_dotfiles(zsl, dothidden)
|
||||||
fgen += [{"vp": v, "st": vst} for v in zsl]
|
fgen += [{"vp": v, "st": vst} for v in zsl]
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
|
@ -5852,9 +5854,10 @@ class HttpCli(object):
|
||||||
vfs_virt[d2] = vfs # typechk, value never read
|
vfs_virt[d2] = vfs # typechk, value never read
|
||||||
|
|
||||||
dirs = [x[0] for x in vfs_ls if stat.S_ISDIR(x[1].st_mode)]
|
dirs = [x[0] for x in vfs_ls if stat.S_ISDIR(x[1].st_mode)]
|
||||||
|
dothidden = load_dothidden(fsroot) if fsroot else None
|
||||||
|
|
||||||
if not dots:
|
if not dots:
|
||||||
dirs = exclude_dotfiles(dirs)
|
dirs = exclude_dotfiles(dirs, dothidden)
|
||||||
|
|
||||||
dirs = [quotep(x) for x in dirs if x != excl]
|
dirs = [quotep(x) for x in dirs if x != excl]
|
||||||
|
|
||||||
|
|
@ -5884,7 +5887,7 @@ class HttpCli(object):
|
||||||
x += "\n"
|
x += "\n"
|
||||||
dirs.append(quotep(x))
|
dirs.append(quotep(x))
|
||||||
if not dots:
|
if not dots:
|
||||||
dirs = exclude_dotfiles(dirs)
|
dirs = exclude_dotfiles(dirs, dothidden)
|
||||||
|
|
||||||
ret["a"] = dirs
|
ret["a"] = dirs
|
||||||
return ret
|
return ret
|
||||||
|
|
@ -7134,7 +7137,8 @@ class HttpCli(object):
|
||||||
if not self.can_dot or (
|
if not self.can_dot or (
|
||||||
"dots" not in self.uparam and (is_ls or "dots" not in self.cookies)
|
"dots" not in self.uparam and (is_ls or "dots" not in self.cookies)
|
||||||
):
|
):
|
||||||
ls_names = exclude_dotfiles(ls_names)
|
dothidden = load_dothidden(fsroot)
|
||||||
|
ls_names = exclude_dotfiles(ls_names, dothidden)
|
||||||
|
|
||||||
add_dk = vf.get("dk")
|
add_dk = vf.get("dk")
|
||||||
add_fk = vf.get("fk")
|
add_fk = vf.get("fk")
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue