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

v0.12.12

Browse source
This commit is contained in:
ed 2021-08-06 11:10:04 +02:00
parent e47a2a4ca2
commit ae3a01038b
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
copyparty/__version__.py
View file

@ -1,6 +1,6 @@
# coding: utf-8 # coding: utf-8
VERSION = (0, 12, 11) VERSION = (0, 12, 12)
CODENAME = "fil\033[33med" CODENAME = "fil\033[33med"
BUILD_DT = (2021, 8, 6) BUILD_DT = (2021, 8, 6)

16
copyparty/up2k.py
View file

@ -1424,7 +1424,8 @@ 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):
return self._mv_file(uname, svp, dvp) with self.mutex:
return self._mv_file(uname, svp, dvp)
jail = svn.get_dbv(srem)[0] jail = svn.get_dbv(srem)[0]
permsets = [[True, False, True]] permsets = [[True, False, True]]
@ -1449,7 +1450,8 @@ class Up2k(object):
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) :]
self._mv_file(uname, svpf, dvpf) with self.mutex:
self._mv_file(uname, svpf, dvpf)
rmdirs(self.log_func, scandir, True, sabs) rmdirs(self.log_func, scandir, True, sabs)
return "k" return "k"
@ -1541,13 +1543,15 @@ class Up2k(object):
self.log("forgetting {}".format(vrem)) self.log("forgetting {}".format(vrem))
if wark: if wark:
self.log("found {} in db".format(wark)) self.log("found {} in db".format(wark))
if self._relink(wark, ptop, vrem, None): if drop_tags:
drop_tags = False if self._relink(wark, ptop, vrem, None):
drop_tags = False
if drop_tags: if drop_tags:
q = "delete from mt where w=?" q = "delete from mt where w=?"
cur.execute(q, (wark[:16],)) cur.execute(q, (wark[:16],))
self.db_rm(cur, srd, sfn)
self.db_rm(cur, srd, sfn)
reg = self.registry.get(ptop) reg = self.registry.get(ptop)
if reg: if reg:
@ -1599,7 +1603,7 @@ class Up2k(object):
# deleting final remaining full copy; swap it with a symlink # deleting final remaining full copy; swap it with a symlink
slabs = list(sorted(links.keys()))[0] slabs = list(sorted(links.keys()))[0]
ptop, rem = links.pop(slabs) ptop, rem = links.pop(slabs)
self.log("linkswap [{}] and [{}]".format(sabs, dabs)) self.log("linkswap [{}] and [{}]".format(sabs, slabs))
bos.unlink(slabs) bos.unlink(slabs)
bos.rename(sabs, slabs) bos.rename(sabs, slabs)
self._symlink(slabs, sabs, False) self._symlink(slabs, sabs, False)