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

better rmtree semantics

Browse source
This commit is contained in:
ed 2021-10-27 09:40:20 +02:00
parent f93212a665
commit 744727087a
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
copyparty/up2k.py
View file

@ -242,7 +242,7 @@ class Up2k(object):
if vp: if vp:
fvp = "{}/{}".format(vp, fvp) fvp = "{}/{}".format(vp, fvp)
self._handle_rm(LEELOO_DALLAS, None, fvp, True) self._handle_rm(LEELOO_DALLAS, None, fvp)
nrm += 1 nrm += 1
if nrm: if nrm:
@ -1504,7 +1504,7 @@ class Up2k(object):
ok = {} ok = {}
ng = {} ng = {}
for vp in vpaths: for vp in vpaths:
a, b, c = self._handle_rm(uname, ip, vp, False) a, b, c = self._handle_rm(uname, ip, vp)
n_files += a n_files += a
for k in b: for k in b:
ok[k] = 1 ok[k] = 1
@ -1517,7 +1517,7 @@ class Up2k(object):
return "deleted {} files (and {}/{} folders)".format(n_files, ok, ok + ng) return "deleted {} files (and {}/{} folders)".format(n_files, ok, ok + ng)
def _handle_rm(self, uname, ip, vpath, rm_topdir): def _handle_rm(self, uname, ip, vpath):
try: try:
permsets = [[True, False, False, True]] permsets = [[True, False, False, True]]
vn, rem = self.asrv.vfs.get(vpath, uname, *permsets[0]) vn, rem = self.asrv.vfs.get(vpath, uname, *permsets[0])
@ -1588,7 +1588,7 @@ class Up2k(object):
bos.unlink(abspath) bos.unlink(abspath)
rm = rmdirs(self.log_func, scandir, True, atop, 1 if rm_topdir else 0) rm = rmdirs(self.log_func, scandir, True, atop, 1)
return n_files, rm[0], rm[1] return n_files, rm[0], rm[1]
def handle_mv(self, uname, svp, dvp): def handle_mv(self, uname, svp, dvp):

1
copyparty/util.py
View file

@ -1224,6 +1224,7 @@ def statdir(logger, scandir, lstat, top):
def rmdirs(logger, scandir, lstat, top, depth): def rmdirs(logger, scandir, lstat, top, depth):
if not os.path.exists(fsenc(top)) or not os.path.isdir(fsenc(top)): if not os.path.exists(fsenc(top)) or not os.path.isdir(fsenc(top)):
top = os.path.dirname(top) top = os.path.dirname(top)
depth -= 1
dirs = statdir(logger, scandir, lstat, top) dirs = statdir(logger, scandir, lstat, top)
dirs = [x[0] for x in dirs if stat.S_ISDIR(x[1].st_mode)] dirs = [x[0] for x in dirs if stat.S_ISDIR(x[1].st_mode)]