mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2026-04-12 23:32:32 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix rotn leaf-level counting; closes #1336 (#1337)

Browse source
This commit is contained in:
NecRaul 2026-03-04 10:24:02 +04:00 committed by GitHub
parent 8e20506de8
commit 23d4a62e9f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
copyparty/authsrv.py
View file

@ -147,8 +147,11 @@ class AXS(object):
class Lim(object): class Lim(object):
def __init__(self, log_func: Optional["RootLogger"]) -> None: def __init__(
self, args: argparse.Namespace, log_func: Optional["RootLogger"]
) -> None:
self.log_func = log_func self.log_func = log_func
self.use_scandir = not args.no_scandir
self.reg: Optional[dict[str, dict[str, Any]]] = None # up2k registry self.reg: Optional[dict[str, dict[str, Any]]] = None # up2k registry
@ -312,12 +315,17 @@ class Lim(object):
return ret, d return ret, d
def dive(self, path: str, lvs: int) -> Optional[str]: def dive(self, path: str, lvs: int) -> Optional[str]:
items = bos.listdir(path)
if not lvs: if not lvs:
# at leaf level # at leaf level
items = statdir(self.log_func, self.use_scandir, False, path, True)
items = [
x
for x in items
if not stat.S_ISDIR(x[1].st_mode) and not x[0].endswith(".PARTIAL")
]
return None if len(items) >= self.rotn else "" return None if len(items) >= self.rotn else ""
items = bos.listdir(path)
dirs = [int(x) for x in items if x and all(y in "1234567890" for y in x)] dirs = [int(x) for x in items if x and all(y in "1234567890" for y in x)]
dirs.sort() dirs.sort()
@ -2284,7 +2292,7 @@ class AuthSrv(object):
vol.flags["zipmax"] = True vol.flags["zipmax"] = True
for vol in vfs.all_vols.values(): for vol in vfs.all_vols.values():
lim = Lim(self.log_func) lim = Lim(self.args, self.log_func)
use = False use = False
if vol.flags.get("nosub"): if vol.flags.get("nosub"):