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

120x faster folder moves/renames

Browse source
This commit is contained in:
ed 2022-10-08 19:11:03 +02:00
parent 78fa96f0f4
commit 118bdcc26e
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
copyparty/up2k.py
View file

@ -2546,6 +2546,7 @@ class Up2k(object):
svn, srem = self.asrv.vfs.get(svp, uname, True, False, True) svn, srem = self.asrv.vfs.get(svp, uname, True, False, True)
svn, srem = svn.get_dbv(srem) svn, srem = svn.get_dbv(srem)
sabs = svn.canonical(srem, False) sabs = svn.canonical(srem, False)
curs: set["sqlite3.Cursor"] = set()
if not srem: if not srem:
raise Pebkac(400, "mv: cannot move a mountpoint") raise Pebkac(400, "mv: cannot move a mountpoint")
@ -2553,7 +2554,13 @@ class Up2k(object):
st = bos.lstat(sabs) st = bos.lstat(sabs)
if stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode): if stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode):
with self.mutex: with self.mutex:
return self._mv_file(uname, svp, dvp) try:
ret = self._mv_file(uname, svp, dvp, curs)
finally:
for v in curs:
v.connection.commit()
return ret
jail = svn.get_dbv(srem)[0] jail = svn.get_dbv(srem)[0]
permsets = [[True, False, True]] permsets = [[True, False, True]]
@ -2572,20 +2579,29 @@ class Up2k(object):
# the actual check (avoid toctou) # the actual check (avoid toctou)
raise Pebkac(400, "mv: source folder contains other volumes") raise Pebkac(400, "mv: source folder contains other volumes")
with self.mutex:
try:
for fn in files: for fn in files:
self.db_act = time.time()
svpf = "/".join(x for x in [dbv.vpath, vrem, fn[0]] if x) svpf = "/".join(x for x in [dbv.vpath, vrem, fn[0]] if x)
if not svpf.startswith(svp + "/"): # assert if not svpf.startswith(svp + "/"): # assert
raise Pebkac(500, "mv: bug at {}, top {}".format(svpf, svp)) raise Pebkac(500, "mv: bug at {}, top {}".format(svpf, svp))
dvpf = dvp + svpf[len(svp) :] dvpf = dvp + svpf[len(svp) :]
with self.mutex: self._mv_file(uname, svpf, dvpf, curs)
self._mv_file(uname, svpf, dvpf) finally:
for v in curs:
v.connection.commit()
curs.clear()
rmdirs(self.log_func, scandir, True, sabs, 1) rmdirs(self.log_func, scandir, True, sabs, 1)
rmdirs_up(os.path.dirname(sabs)) rmdirs_up(os.path.dirname(sabs))
return "k" return "k"
def _mv_file(self, uname: str, svp: str, dvp: str) -> str: def _mv_file(
self, uname: str, svp: str, dvp: str, curs: set["sqlite3.Cursor"]
) -> str:
svn, srem = self.asrv.vfs.get(svp, uname, True, False, True) svn, srem = self.asrv.vfs.get(svp, uname, True, False, True)
svn, srem = svn.get_dbv(srem) svn, srem = svn.get_dbv(srem)
@ -2643,11 +2659,11 @@ class Up2k(object):
self._forget_file(svn.realpath, srem, c1, w, c1 != c2) self._forget_file(svn.realpath, srem, c1, w, c1 != c2)
self._relink(w, svn.realpath, srem, dabs) self._relink(w, svn.realpath, srem, dabs)
c1.connection.commit() curs.add(c1)
if c2: if c2:
self.db_add(c2, w, drd, dfn, ftime, fsize, ip or "", at or 0) self.db_add(c2, w, drd, dfn, ftime, fsize, ip or "", at or 0)
c2.connection.commit() curs.add(c2)
else: else:
self.log("not found in src db: [{}]".format(svp)) self.log("not found in src db: [{}]".format(svp))