diff --git a/copyparty/__main__.py b/copyparty/__main__.py index 9e726d49..5aac5c08 100755 --- a/copyparty/__main__.py +++ b/copyparty/__main__.py @@ -1103,6 +1103,7 @@ def add_ui(ap, retry): ap2.add_argument("--textfiles", metavar="CSV", type=u, default="txt,nfo,diz,cue,readme", help="file extensions to present as plaintext") ap2.add_argument("--txt-max", metavar="KiB", type=int, default=64, help="max size of embedded textfiles on ?doc= (anything bigger will be lazy-loaded by JS)") ap2.add_argument("--doctitle", metavar="TXT", type=u, default="copyparty @ --name", help="title / service-name to show in html documents") + ap2.add_argument("--bname", metavar="TXT", type=u, default="--name", help="server name (displayed in filebrowser document title)") ap2.add_argument("--pb-url", metavar="URL", type=u, default="https://github.com/9001/copyparty", help="powered-by link; disable with -np") ap2.add_argument("--ver", action="store_true", help="show version on the control panel (incompatible by -np)") ap2.add_argument("--md-sbf", metavar="FLAGS", type=u, default="downloads forms popups scripts top-navigation-by-user-activation", help="list of capabilities to ALLOW for README.md docs (volflag=md_sbf); see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe#attr-sandbox") diff --git a/copyparty/httpcli.py b/copyparty/httpcli.py index 0dd4c9ee..c123c391 100644 --- a/copyparty/httpcli.py +++ b/copyparty/httpcli.py @@ -211,7 +211,7 @@ class HttpCli(object): ka["ts"] = self.conn.hsrv.cachebuster() ka["lang"] = self.args.lang ka["favico"] = self.args.favico - ka["s_name"] = self.args.vbname + ka["s_name"] = self.args.bname ka["s_doctitle"] = self.args.doctitle ka["html_head"] = self.html_head return tpl.render(**ka) # type: ignore @@ -3718,7 +3718,7 @@ class HttpCli(object): "url_suf": url_suf, "logues": logues, "readme": readme, - "title": html_escape("%s %s" % (self.args.vbname, self.vpath), crlf=True), + "title": html_escape("%s %s" % (self.args.bname, self.vpath), crlf=True), "srv_info": srv_infot, "dgrid": "grid" in vf, "unlist": unlist, diff --git a/copyparty/svchub.py b/copyparty/svchub.py index 082e3f70..3ba90135 100644 --- a/copyparty/svchub.py +++ b/copyparty/svchub.py @@ -171,7 +171,7 @@ class SvcHub(object): else: args.vname = args.name args.doctitle = args.doctitle.replace("--name", args.vname) - args.vbname = "" if args.nth else args.vname + args.bname = args.bname.replace("--name", args.vname) or args.vname if args.log_fk: args.log_fk = re.compile(args.log_fk)