From 6934c75bbacc36c7363f7b00abedea0cdcf30132 Mon Sep 17 00:00:00 2001 From: ed Date: Fri, 29 Jan 2021 00:43:57 +0100 Subject: [PATCH] nice --- .vscode/tasks.json | 10 ++++++++++ copyparty/up2k.py | 11 +++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 .vscode/tasks.json diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000..71a084b7 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,10 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "pre", + "command": "true;rm -rf inc/* inc/.hist/;mkdir -p inc;", + "type": "shell" + } + ] +} \ No newline at end of file diff --git a/copyparty/up2k.py b/copyparty/up2k.py index 5b67c41a..76a28ef0 100644 --- a/copyparty/up2k.py +++ b/copyparty/up2k.py @@ -15,7 +15,7 @@ import hashlib import threading from copy import deepcopy -from .__init__ import WINDOWS, PY2 +from .__init__ import WINDOWS from .util import Pebkac, Queue, fsdec, fsenc, sanitize_fn, ren_open, atomic_move HAVE_SQLITE3 = False @@ -296,7 +296,12 @@ class Up2k(object): names = [job[x] for x in ["name", "tnam"] if x in job] for fn in names: path = os.path.join(job["ptop"], job["prel"], fn) - if not os.path.exists(path): + try: + if os.path.getsize(path) > 0: + # upload completed or both present + break + except: + # missing; restart job = None break else: @@ -530,6 +535,8 @@ class Up2k(object): self.registry[job["ptop"]][job["wark"]] = job pdir = os.path.join(job["ptop"], job["prel"]) job["name"] = self._untaken(pdir, job["name"], job["t0"], job["addr"]) + # if len(job["name"].split(".")) > 8: + # raise Exception("aaa") tnam = job["name"] + ".PARTIAL" suffix = ".{:.6f}-{}".format(job["t0"], job["addr"])