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

hook/reloc: dupe in one vol doesn't mean dupe in another

Browse source
This commit is contained in:
ed 2024-08-16 21:08:22 +00:00
parent c8f4aeaefa
commit b0af4b3712
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
copyparty/up2k.py
View file

@ -2760,7 +2760,8 @@ class Up2k(object):
job = deepcopy(job) job = deepcopy(job)
job["wark"] = wark job["wark"] = wark
job["at"] = cj.get("at") or time.time() job["at"] = cj.get("at") or time.time()
for k in "lmod ptop vtop prel name host user addr".split(): zs = "lmod ptop vtop prel name host user addr poke"
for k in zs.split():
job[k] = cj.get(k) or "" job[k] = cj.get(k) or ""
pdir = djoin(cj["ptop"], cj["prel"]) pdir = djoin(cj["ptop"], cj["prel"])
@ -2805,7 +2806,9 @@ class Up2k(object):
job["vtop"] = vfs.vpath job["vtop"] = vfs.vpath
job["prel"] = rem job["prel"] = rem
if zvfs.vpath != vfs.vpath: if zvfs.vpath != vfs.vpath:
self.log("xbu reloc %d..." % (depth,), 6) # print(json.dumps(job, sort_keys=True, indent=4))
job["hash"] = cj["hash"]
self.log("xbu reloc1:%d..." % (depth,), 6)
return self._handle_json(job, depth + 1) return self._handle_json(job, depth + 1)
job["name"] = self._untaken(pdir, job, now) job["name"] = self._untaken(pdir, job, now)
@ -4231,7 +4234,7 @@ class Up2k(object):
job["vtop"] = vfs.vpath job["vtop"] = vfs.vpath
job["prel"] = rem job["prel"] = rem
if zvfs.vpath != vfs.vpath: if zvfs.vpath != vfs.vpath:
self.log("xbu reloc %d..." % (depth,), 6) self.log("xbu reloc2:%d..." % (depth,), 6)
return self._handle_json(job, depth + 1) return self._handle_json(job, depth + 1)
job["name"] = self._untaken(pdir, job, job["t0"]) job["name"] = self._untaken(pdir, job, job["t0"])