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

u2cli: nobody asked for python2.6 support so here you go w

Browse source
This commit is contained in:
ed 2021-10-02 00:36:41 +02:00
parent e5b67d2b3a
commit 63eb08ba9f
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
bin/up2k.py
View file

@ -200,8 +200,8 @@ class CTermsize(object):
eprint("\033[s\033[r\033[u") eprint("\033[s\033[r\033[u")
else: else:
self.g = 1 + self.h - margin self.g = 1 + self.h - margin
m = "{}\033[{}A".format("\n" * margin, margin) m = "{0}\033[{1}A".format("\n" * margin, margin)
eprint("{}\033[s\033[1;{}r\033[u".format(m, self.g - 1)) eprint("{0}\033[s\033[1;{1}r\033[u".format(m, self.g - 1))
ss = CTermsize() ss = CTermsize()
@ -236,7 +236,7 @@ def walkdirs(tops):
for ap, inf in walkdir(top): for ap, inf in walkdir(top):
yield top, ap[len(top) + 1 :], inf yield top, ap[len(top) + 1 :], inf
else: else:
sep = "{}".format(os.sep).encode("ascii") sep = "{0}".format(os.sep).encode("ascii")
d, n = top.rsplit(sep, 1) d, n = top.rsplit(sep, 1)
yield d, n, os.stat(top) yield d, n, os.stat(top)
@ -305,7 +305,9 @@ def get_hashlist(file, pcb):
pcb(file, file_ofs) pcb(file, file_ofs)
file.cids = ret file.cids = ret
file.kchunks = {k: [v1, v2] for k, v1, v2 in ret} file.kchunks = {}
for k, v1, v2 in ret:
file.kchunks[k] = [v1, v2]
def handshake(req_ses, url, file, pw, search): def handshake(req_ses, url, file, pw, search):
@ -407,7 +409,7 @@ class Ctl(object):
if "://" not in ar.url: if "://" not in ar.url:
ar.url = "http://" + ar.url ar.url = "http://" + ar.url
eprint("\nscanning {} locations\n".format(len(ar.files))) eprint("\nscanning {0} locations\n".format(len(ar.files)))
nfiles = 0 nfiles = 0
nbytes = 0 nbytes = 0
@ -415,7 +417,7 @@ class Ctl(object):
nfiles += 1 nfiles += 1
nbytes += inf.st_size nbytes += inf.st_size
eprint("found {} files, {}\n\n".format(nfiles, humansize(nbytes))) eprint("found {0} files, {1}\n\n".format(nfiles, humansize(nbytes)))
self.nfiles = nfiles self.nfiles = nfiles
self.nbytes = nbytes self.nbytes = nbytes
@ -437,7 +439,7 @@ class Ctl(object):
file = File(top, rel, inf.st_size, inf.st_mtime) file = File(top, rel, inf.st_size, inf.st_mtime)
upath = file.abs.decode("utf-8", "replace") upath = file.abs.decode("utf-8", "replace")
print("{} {}\n hash...".format(self.nfiles - nf, upath)) print("{0} {1}\n hash...".format(self.nfiles - nf, upath))
get_hashlist(file, None) get_hashlist(file, None)
while True: while True:
@ -446,7 +448,7 @@ class Ctl(object):
if search: if search:
if hs: if hs:
for hit in hs: for hit in hs:
print(" found: {}{}".format(self.ar.url, hit["rp"])) print(" found: {0}{1}".format(self.ar.url, hit["rp"]))
else: else:
print(" NOT found") print(" NOT found")
break break
@ -455,10 +457,10 @@ class Ctl(object):
if not hs: if not hs:
break break
print("{} {}".format(self.nfiles - nf, upath)) print("{0} {1}".format(self.nfiles - nf, upath))
ncs = len(hs) ncs = len(hs)
for nc, cid in enumerate(hs): for nc, cid in enumerate(hs):
print(" {} up {}".format(ncs - nc, cid)) print(" {0} up {1}".format(ncs - nc, cid))
upload(req_ses, file, cid, self.ar.a) upload(req_ses, file, cid, self.ar.a)
print(" ok!") print(" ok!")
@ -512,15 +514,15 @@ class Ctl(object):
if VT100: if VT100:
maxlen = ss.w - len(str(self.nfiles)) - 14 maxlen = ss.w - len(str(self.nfiles)) - 14
txt = "\033[s\033[{}H".format(ss.g) txt = "\033[s\033[{0}H".format(ss.g)
for y, k, st, f in [ for y, k, st, f in [
[0, "hash", self.st_hash, self.hash_f], [0, "hash", self.st_hash, self.hash_f],
[1, "send", self.st_up, self.up_f], [1, "send", self.st_up, self.up_f],
]: ]:
txt += "\033[{}H{}:".format(ss.g + y, k) txt += "\033[{0}H{1}:".format(ss.g + y, k)
file, arg = st file, arg = st
if not file: if not file:
txt += " {}\033[K".format(arg) txt += " {0}\033[K".format(arg)
else: else:
if y: if y:
p = 100 * file.up_b / file.size p = 100 * file.up_b / file.size
@ -529,12 +531,12 @@ class Ctl(object):
name = file.abs.decode("utf-8", "replace")[-maxlen:] name = file.abs.decode("utf-8", "replace")[-maxlen:]
if "/" in name: if "/" in name:
name = "\033[36m{}\033[0m/{}".format(*name.rsplit("/", 1)) name = "\033[36m{0}\033[0m/{1}".format(*name.rsplit("/", 1))
m = "{:6.1f}% {} {}\033[K" m = "{0:6.1f}% {1} {2}\033[K"
txt += m.format(p, self.nfiles - f, name) txt += m.format(p, self.nfiles - f, name)
txt += "\033[{}H ".format(ss.g + 2) txt += "\033[{0}H ".format(ss.g + 2)
else: else:
txt = " " txt = " "
@ -551,8 +553,8 @@ class Ctl(object):
left = humansize(self.nbytes - self.up_b) left = humansize(self.nbytes - self.up_b)
tail = "\033[K\033[u" if VT100 else "\r" tail = "\033[K\033[u" if VT100 else "\r"
m = "eta: {} @ {}/s, {} left".format(eta, spd, left) m = "eta: {0} @ {1}/s, {2} left".format(eta, spd, left)
eprint(txt + "\033]0;{}\033\\\r{}{}".format(m, m, tail)) eprint(txt + "\033]0;{0}\033\\\r{1}{2}".format(m, m, tail))
def cleanup_vt100(self): def cleanup_vt100(self):
ss.scroll_region(None) ss.scroll_region(None)
@ -624,10 +626,10 @@ class Ctl(object):
if search: if search:
if hs: if hs:
for hit in hs: for hit in hs:
m = "found: {}\n {}{}\n" m = "found: {0}\n {1}{2}\n"
print(m.format(upath, self.ar.url, hit["rp"]), end="") print(m.format(upath, self.ar.url, hit["rp"]), end="")
else: else:
print("NOT found: {}\n".format(upath), end="") print("NOT found: {0}\n".format(upath), end="")
with self.mutex: with self.mutex:
self.up_f += 1 self.up_f += 1
@ -657,7 +659,7 @@ class Ctl(object):
self.handshaker_busy -= 1 self.handshaker_busy -= 1
if not hs: if not hs:
print("uploaded {}".format(upath)) print("uploaded {0}".format(upath))
for cid in hs: for cid in hs:
self.q_upload.put([file, cid]) self.q_upload.put([file, cid])