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

make -nw apply to more stuff

Browse source
This commit is contained in:
ed 2021-06-30 19:23:45 +02:00
parent 5c3d0b6520
commit 87200d9f10
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
copyparty/up2k.py
View file

@ -1019,7 +1019,8 @@ class Up2k(object):
break break
except: except:
# missing; restart # missing; restart
job = None if not self.args.nw:
job = None
break break
else: else:
# file contents match, but not the path # file contents match, but not the path
@ -1089,6 +1090,9 @@ class Up2k(object):
} }
def _untaken(self, fdir, fname, ts, ip): def _untaken(self, fdir, fname, ts, ip):
if self.args.nw:
return fname
# TODO broker which avoid this race and # TODO broker which avoid this race and
# provides a new filename if taken (same as bup) # provides a new filename if taken (same as bup)
suffix = ".{:.6f}-{}".format(ts, ip) suffix = ".{:.6f}-{}".format(ts, ip)
@ -1098,6 +1102,9 @@ class Up2k(object):
def _symlink(self, src, dst): def _symlink(self, src, dst):
# TODO store this in linktab so we never delete src if there are links to it # TODO store this in linktab so we never delete src if there are links to it
self.log("linking dupe:\n {0}\n {1}".format(src, dst)) self.log("linking dupe:\n {0}\n {1}".format(src, dst))
if self.args.nw:
return
try: try:
lsrc = src lsrc = src
ldst = dst ldst = dst
@ -1175,6 +1182,10 @@ class Up2k(object):
if ret > 0: if ret > 0:
return ret, src return ret, src
if self.args.nw:
# del self.registry[ptop][wark]
return ret, dst
atomic_move(src, dst) atomic_move(src, dst)
if ANYWIN: if ANYWIN:
@ -1284,6 +1295,10 @@ class Up2k(object):
if self.args.dotpart: if self.args.dotpart:
tnam = "." + tnam tnam = "." + tnam
if self.args.nw:
job["tnam"] = tnam
return
suffix = ".{:.6f}-{}".format(job["t0"], job["addr"]) suffix = ".{:.6f}-{}".format(job["t0"], job["addr"])
with ren_open(tnam, "wb", fdir=pdir, suffix=suffix) as f: with ren_open(tnam, "wb", fdir=pdir, suffix=suffix) as f:
f, job["tnam"] = f["orz"] f, job["tnam"] = f["orz"]