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

fix #65 (symlinks die when moved)

Browse source
This commit is contained in:
ed 2023-12-08 21:28:20 +00:00
parent b4031e8d43
commit 6cb3b35a54
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
copyparty/up2k.py
View file

@ -3360,28 +3360,27 @@ class Up2k(object):
if bos.path.exists(dabs): if bos.path.exists(dabs):
raise Pebkac(400, "mv2: target file exists") raise Pebkac(400, "mv2: target file exists")
stl = bos.lstat(sabs) is_link = is_dirlink = False
try: st = stl = bos.lstat(sabs)
st = bos.stat(sabs) if stat.S_ISLNK(stl.st_mode):
except: is_link = True
st = stl try:
st = bos.stat(sabs)
is_dirlink = stat.S_ISDIR(st.st_mode)
except:
pass # broken symlink; keep as-is
xbr = svn.flags.get("xbr") xbr = svn.flags.get("xbr")
xar = dvn.flags.get("xar") xar = dvn.flags.get("xar")
if xbr: if xbr:
if not runhook( if not runhook(
self.log, xbr, sabs, svp, "", uname, st.st_mtime, st.st_size, "", 0, "" self.log, xbr, sabs, svp, "", uname, stl.st_mtime, st.st_size, "", 0, ""
): ):
t = "move blocked by xbr server config: {}".format(svp) t = "move blocked by xbr server config: {}".format(svp)
self.log(t, 1) self.log(t, 1)
raise Pebkac(405, t) raise Pebkac(405, t)
is_xvol = svn.realpath != dvn.realpath is_xvol = svn.realpath != dvn.realpath
if stat.S_ISLNK(stl.st_mode):
is_dirlink = stat.S_ISDIR(st.st_mode)
is_link = True
else:
is_link = is_dirlink = False
bos.makedirs(os.path.dirname(dabs)) bos.makedirs(os.path.dirname(dabs))
@ -3408,7 +3407,7 @@ class Up2k(object):
c2 = self.cur.get(dvn.realpath) c2 = self.cur.get(dvn.realpath)
if ftime_ is None: if ftime_ is None:
ftime = st.st_mtime ftime = stl.st_mtime
fsize = st.st_size fsize = st.st_size
else: else:
ftime = ftime_ ftime = ftime_
@ -3450,7 +3449,16 @@ class Up2k(object):
if is_xvol and has_dupes: if is_xvol and has_dupes:
raise OSError(errno.EXDEV, "src is symlink") raise OSError(errno.EXDEV, "src is symlink")
atomic_move(sabs, dabs) if is_link and st != stl:
# relink non-broken symlinks to still work after the move,
# but only resolve 1st level to maintain relativity
dlink = bos.readlink(sabs)
dlink = os.path.join(os.path.dirname(sabs), dlink)
dlink = bos.path.abspath(dlink)
self._symlink(dlink, dabs, dvn.flags, lmod=ftime)
bos.unlink(sabs)
else:
atomic_move(sabs, dabs)
except OSError as ex: except OSError as ex:
if ex.errno != errno.EXDEV: if ex.errno != errno.EXDEV: