diff --git a/copyparty/up2k.py b/copyparty/up2k.py index 0ffbed2e..4d5cf16e 100644 --- a/copyparty/up2k.py +++ b/copyparty/up2k.py @@ -93,7 +93,7 @@ class Up2k(object): ret.append(v) except: ret.append("//" + w8b64enc(v)) - self.log("mojien/{} [{}] {}".format(k, v, ret[-1][2:])) + # self.log("mojien/{} [{}] {}".format(k, v, ret[-1][2:])) return tuple(ret) @@ -102,7 +102,7 @@ class Up2k(object): for k, v in [["d", rd], ["f", fn]]: if v.startswith("//"): ret.append(w8b64dec(v[2:])) - self.log("mojide/{} [{}] {}".format(k, ret[-1], v[2:])) + # self.log("mojide/{} [{}] {}".format(k, ret[-1], v[2:])) else: ret.append(v) @@ -236,8 +236,9 @@ class Up2k(object): self.pp.n -= 1 _, dts, dsz, _, _ = in_db[0] if len(in_db) > 1: - m = "WARN: multiple entries: [{}] => [{}] ({})" - self.log(m.format(top, rp, len(in_db))) + m = "WARN: multiple entries: [{}] => [{}] |{}|\n{}" + rep_db = "\n".join([repr(x) for x in in_db]) + self.log(m.format(top, rp, len(in_db), rep_db)) dts = -1 if dts == inf.st_mtime and dsz == inf.st_size: diff --git a/copyparty/util.py b/copyparty/util.py index 784a1923..5effce64 100644 --- a/copyparty/util.py +++ b/copyparty/util.py @@ -114,12 +114,19 @@ class ProgressPrinter(threading.Thread): def run(self): msg = None while not self.end: - time.sleep(0.05) + time.sleep(0.1) if msg == self.msg or self.end: continue msg = self.msg - print(" {}\033[K\r".format(msg), end="") + m = " {}\033[K\r".format(msg) + try: + print(m, end="") + except UnicodeEncodeError: + try: + print(m.encode("utf-8", "replace").decode(), end="") + except: + print(m.encode("ascii", "replace").decode(), end="") print("\033[K", end="") sys.stdout.flush() # necessary on win10 even w/ stderr btw