diff --git a/README.md b/README.md index da56fe3f..e5d3675f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ turn your phone or raspi into a portable file server with resumable uploads/down ## breaking changes \o/ -this is the readme for v0.12 (unreleased) which has a different expression for volume permissions (`-v`); see [the v0.11.x readme](https://github.com/9001/copyparty/tree/15b59822112dda56cee576df30f331252fc62628#readme) for stuff regarding the [current stable release](https://github.com/9001/copyparty/releases/tag/v0.11.47) +this is the readme for v0.12 which has a different expression for volume permissions (`-v`); see [the v0.11.x readme](https://github.com/9001/copyparty/tree/15b59822112dda56cee576df30f331252fc62628#readme) for stuff regarding the [current stable release](https://github.com/9001/copyparty/releases/tag/v0.11.47) ## readme toc diff --git a/copyparty/__version__.py b/copyparty/__version__.py index 11745be3..1c035ca7 100644 --- a/copyparty/__version__.py +++ b/copyparty/__version__.py @@ -1,8 +1,8 @@ # coding: utf-8 -VERSION = (0, 11, 47) -CODENAME = "the grid" -BUILD_DT = (2021, 7, 22) +VERSION = (0, 12, 0) +CODENAME = "fil\033[33med" +BUILD_DT = (2021, 7, 28) S_VERSION = ".".join(map(str, VERSION)) S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT) diff --git a/copyparty/svchub.py b/copyparty/svchub.py index 5e2d9cb1..a0f0dc23 100644 --- a/copyparty/svchub.py +++ b/copyparty/svchub.py @@ -103,6 +103,7 @@ class SvcHub(object): if self.httpsrv_up != self.broker.num_workers: return + self.log("root", "workers OK\n") self.up2k.init_vols() thr = threading.Thread(target=self.sd_notify, name="sd-notify") diff --git a/copyparty/tcpsrv.py b/copyparty/tcpsrv.py index 75ab5b38..d3cb3f80 100644 --- a/copyparty/tcpsrv.py +++ b/copyparty/tcpsrv.py @@ -30,14 +30,16 @@ class TcpSrv(object): for x in nonlocals: eps[x] = "external" + msgs = [] + m = "available @ http://{}:{}/ (\033[33m{}\033[0m)" for ip, desc in sorted(eps.items(), key=lambda x: x[1]): for port in sorted(self.args.p): - self.log( - "tcpsrv", - "available @ http://{}:{}/ (\033[33m{}\033[0m)".format( - ip, port, desc - ), - ) + msgs.append(m.format(ip, port, desc)) + + if msgs: + msgs[-1] += "\n" + for m in msgs: + self.log("tcpsrv", m) self.srv = [] for ip in self.args.i: @@ -117,6 +119,7 @@ class TcpSrv(object): m = rip.match(ln) if m: eps[m.group(1)] = dev + dev = None return eps