db got the wrong lastmod when linking dupes

This commit is contained in:
ed 2023-02-26 18:52:04 +00:00
parent 1e3b7eee3b
commit ab87fac6d8

View file

@ -2278,8 +2278,9 @@ class Up2k(object):
# returning the previous upload info # returning the previous upload info
job = deepcopy(job) job = deepcopy(job)
job["wark"] = wark job["wark"] = wark
for k in "ptop vtop prel addr".split(): job["at"] = cj.get("at") or time.time()
job[k] = cj[k] for k in "lmod ptop vtop prel host user addr".split():
job[k] = cj.get(k) or ""
pdir = djoin(cj["ptop"], cj["prel"]) pdir = djoin(cj["ptop"], cj["prel"])
if rand: if rand:
@ -2296,12 +2297,12 @@ class Up2k(object):
xbu, # type: ignore xbu, # type: ignore
dst, dst,
job["vtop"], job["vtop"],
job.get("host") or "", job["host"],
job.get("user") or "", job["user"],
job["lmod"], job["lmod"],
job["size"], job["size"],
job["addr"], job["addr"],
job.get("at") or 0, job["at"],
"", "",
): ):
t = "upload blocked by xbu server config: {}".format(dst) t = "upload blocked by xbu server config: {}".format(dst)
@ -2319,9 +2320,8 @@ class Up2k(object):
raise raise
if cur: if cur:
zs = "prel name lmod size ptop vtop wark host user addr" zs = "prel name lmod size ptop vtop wark host user addr at"
a = [job[x] for x in zs.split()] a = [job[x] for x in zs.split()]
a += [job.get("at") or time.time()]
self.db_add(cur, vfs.flags, *a) self.db_add(cur, vfs.flags, *a)
cur.connection.commit() cur.connection.commit()