mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2026-06-18 20:22:27 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

pop job.vcfg; fixes up2k._snap_reg

Browse source
This commit is contained in:
ed 2026-06-13 10:39:26 +00:00
parent a00bc93fe1
commit 22c3a3dd46
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
copyparty/up2k.py
View file

@ -3037,7 +3037,7 @@ class Up2k(object):
raise Pebkac(500, "too many xbu relocs, giving up") raise Pebkac(500, "too many xbu relocs, giving up")
ptop = cj["ptop"] ptop = cj["ptop"]
if not self.register_vpath(ptop, cj["vcfg"]): if not self.register_vpath(ptop, cj.pop("vcfg")):
if ptop not in self.registry: if ptop not in self.registry:
raise Pebkac(410, "location unavailable") raise Pebkac(410, "location unavailable")
@ -3372,7 +3372,6 @@ class Up2k(object):
ud1 = (vfs.vpath, job["prel"], job["name"]) ud1 = (vfs.vpath, job["prel"], job["name"])
pdir, _, job["name"], (vfs, rem) = x pdir, _, job["name"], (vfs, rem) = x
dst = os.path.join(pdir, job["name"]) dst = os.path.join(pdir, job["name"])
job["vcfg"] = vfs.flags
job["ptop"] = vfs.realpath job["ptop"] = vfs.realpath
job["vtop"] = vfs.vpath job["vtop"] = vfs.vpath
job["prel"] = rem job["prel"] = rem
@ -3380,6 +3379,7 @@ class Up2k(object):
ud2 = (vfs.vpath, job["prel"], job["name"]) ud2 = (vfs.vpath, job["prel"], job["name"])
if ud1 != ud2: if ud1 != ud2:
# print(json.dumps(job, sort_keys=True, indent=4)) # print(json.dumps(job, sort_keys=True, indent=4))
job["vcfg"] = vfs.flags
job["hash"] = cj["hash"] job["hash"] = cj["hash"]
self.log("xbu reloc1:%d..." % (depth,), 6) self.log("xbu reloc1:%d..." % (depth,), 6)
return self._handle_json(job, depth + 1) return self._handle_json(job, depth + 1)
@ -5264,13 +5264,14 @@ class Up2k(object):
if x: if x:
ud1 = (vfs.vpath, job["prel"], job["name"]) ud1 = (vfs.vpath, job["prel"], job["name"])
pdir, _, job["name"], (vfs, rem) = x pdir, _, job["name"], (vfs, rem) = x
job["vcfg"] = vf = vfs.flags vf = vfs.flags
job["ptop"] = vfs.realpath job["ptop"] = vfs.realpath
job["vtop"] = vfs.vpath job["vtop"] = vfs.vpath
job["prel"] = rem job["prel"] = rem
job["name"] = sanitize_fn(job["name"]) job["name"] = sanitize_fn(job["name"])
ud2 = (vfs.vpath, job["prel"], job["name"]) ud2 = (vfs.vpath, job["prel"], job["name"])
if ud1 != ud2: if ud1 != ud2:
job["vcfg"] = vf
self.log("xbu reloc2:%d..." % (depth,), 6) self.log("xbu reloc2:%d..." % (depth,), 6)
return self._handle_json(job, depth + 1) return self._handle_json(job, depth + 1)