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

cross-filesystem-move fixes

Browse source 
* nonlocal markdown backups
* relocation-hooks

tested on macos, to be verified on Linux/windows
This commit is contained in:
ed 2025-05-14 12:30:59 +02:00
parent 7cde9a2976
commit f425ff51ae
4 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
copyparty/cert.py
View file

@ -1,13 +1,11 @@
import calendar import calendar
import errno import errno
import filecmp
import json import json
import os import os
import shutil
import time import time
from .__init__ import ANYWIN from .__init__ import ANYWIN
from .util import Netdev, load_resource, runcmd, wrename, wunlink from .util import Netdev, atomic_move, load_resource, runcmd, wunlink
HAVE_CFSSL = not os.environ.get("PRTY_NO_CFSSL") HAVE_CFSSL = not os.environ.get("PRTY_NO_CFSSL")
@ -122,7 +120,7 @@ def _gen_ca(log: "RootLogger", args):
wunlink(nlog, bname + ".key", VF) wunlink(nlog, bname + ".key", VF)
except: except:
pass pass
wrename(nlog, bname + "-key.pem", bname + ".key", VF) atomic_move(nlog, bname + "-key.pem", bname + ".key", VF)
wunlink(nlog, bname + ".csr", VF) wunlink(nlog, bname + ".csr", VF)
log("cert", "new ca OK", 2) log("cert", "new ca OK", 2)
@ -215,7 +213,7 @@ def _gen_srv(log: "RootLogger", args, netdevs: dict[str, Netdev]):
wunlink(nlog, bname + ".key", VF) wunlink(nlog, bname + ".key", VF)
except: except:
pass pass
wrename(nlog, bname + "-key.pem", bname + ".key", VF) atomic_move(nlog, bname + "-key.pem", bname + ".key", VF)
wunlink(nlog, bname + ".csr", VF) wunlink(nlog, bname + ".csr", VF)
with open(os.path.join(args.crt_dir, "ca.pem"), "rb") as f: with open(os.path.join(args.crt_dir, "ca.pem"), "rb") as f:

3
copyparty/httpcli.py
View file

@ -113,7 +113,6 @@ from .util import (
vol_san, vol_san,
vroots, vroots,
vsplit, vsplit,
wrename,
wunlink, wunlink,
yieldfile, yieldfile,
) )
@ -3569,7 +3568,7 @@ class HttpCli(object):
except: except:
pass pass
if dp: if dp:
wrename(self.log, fp, os.path.join(dp, mfile2), vfs.flags) atomic_move(self.log, fp, os.path.join(dp, mfile2), vfs.flags)
assert self.parser.gen # !rm assert self.parser.gen # !rm
p_field, _, p_data = next(self.parser.gen) p_field, _, p_data = next(self.parser.gen)

6
copyparty/th_srv.py
View file

@ -23,6 +23,7 @@ from .util import (
VF_CAREFUL, VF_CAREFUL,
Cooldown, Cooldown,
Daemon, Daemon,
atomic_move,
afsenc, afsenc,
fsenc, fsenc,
min_ex, min_ex,
@ -30,7 +31,6 @@ from .util import (
statdir, statdir,
ub64enc, ub64enc,
vsplit, vsplit,
wrename,
wunlink, wunlink,
) )
@ -412,7 +412,7 @@ class ThumbSrv(object):
wunlink(self.log, ap_unpk, vn.flags) wunlink(self.log, ap_unpk, vn.flags)
try: try:
wrename(self.log, ttpath, tpath, vn.flags) atomic_move(self.log, ttpath, tpath, vn.flags)
except Exception as ex: except Exception as ex:
if not os.path.exists(tpath): if not os.path.exists(tpath):
t = "failed to move [%s] to [%s]: %r" t = "failed to move [%s] to [%s]: %r"
@ -677,7 +677,7 @@ class ThumbSrv(object):
except: except:
pass pass
else: else:
wrename(self.log, wtpath, tpath, vn.flags) atomic_move(self.log, wtpath, tpath, vn.flags)
def conv_spec(self, abspath: str, tpath: str, fmt: str, vn: VFS) -> None: def conv_spec(self, abspath: str, tpath: str, fmt: str, vn: VFS) -> None:
ret, _ = ffprobe(abspath, int(vn.flags["convt"] / 2)) ret, _ = ffprobe(abspath, int(vn.flags["convt"] / 2))

26
copyparty/util.py
View file

@ -2583,6 +2583,11 @@ def _fs_mvrm(
now = time.time() now = time.time()
if ex.errno == errno.ENOENT: if ex.errno == errno.ENOENT:
return False return False
if not attempt and ex.errno == errno.EXDEV:
t = "using copy+delete (%s)\n %s\n %s"
log(t % (ex.strerror, src, dst))
osfun = shutil.move
continue
if now - t0 > maxtime or attempt == 90209: if now - t0 > maxtime or attempt == 90209:
raise raise
if not attempt: if not attempt:
@ -2607,15 +2612,18 @@ def atomic_move(log: "NamedLogger", src: str, dst: str, flags: dict[str, Any]) -
elif flags.get("mv_re_t"): elif flags.get("mv_re_t"):
_fs_mvrm(log, src, dst, True, flags) _fs_mvrm(log, src, dst, True, flags)
else: else:
os.replace(bsrc, bdst) try:
os.replace(bsrc, bdst)
except OSError as ex:
def wrename(log: "NamedLogger", src: str, dst: str, flags: dict[str, Any]) -> bool: if ex.errno != errno.EXDEV:
if not flags.get("mv_re_t"): raise
os.rename(fsenc(src), fsenc(dst)) t = "using copy+delete (%s);\n %s\n %s"
return True log(t % (ex.strerror, src, dst))
try:
return _fs_mvrm(log, src, dst, False, flags) os.unlink(bdst)
except:
pass
shutil.move(bsrc, bdst)
def wunlink(log: "NamedLogger", abspath: str, flags: dict[str, Any]) -> bool: def wunlink(log: "NamedLogger", abspath: str, flags: dict[str, Any]) -> bool: