From d1a03c6d17c6d5e9c6814e6382382cd3e81a2d18 Mon Sep 17 00:00:00 2001 From: ed Date: Mon, 11 Jul 2022 23:17:33 +0200 Subject: [PATCH] zerobyte semantics --- copyparty/up2k.py | 5 ++++- copyparty/web/up2k.js | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/copyparty/up2k.py b/copyparty/up2k.py index fedfa140..145197bc 100644 --- a/copyparty/up2k.py +++ b/copyparty/up2k.py @@ -2231,8 +2231,11 @@ class Up2k(object): return ret def _new_upload(self, job: dict[str, Any]) -> None: - self.registry[job["ptop"]][job["wark"]] = job pdir = os.path.join(job["ptop"], job["prel"]) + if not job["size"] and bos.path.isfile(os.path.join(pdir, job["name"])): + return + + self.registry[job["ptop"]][job["wark"]] = job job["name"] = self._untaken(pdir, job["name"], job["t0"], job["addr"]) # if len(job["name"].split(".")) > 8: # raise Exception("aaa") diff --git a/copyparty/web/up2k.js b/copyparty/web/up2k.js index 24ff1b75..6abb745c 100644 --- a/copyparty/web/up2k.js +++ b/copyparty/web/up2k.js @@ -966,6 +966,9 @@ function up2k_init(subtle) { } function gotallfiles(good_files, nil_files, bad_files) { + if (uc.fsearch && !uc.turbo) + nil_files = []; + var ntot = good_files.concat(nil_files, bad_files).length; if (bad_files.length) { var msg = L.u_badf.format(bad_files.length, ntot);