v1.1.7

copyparty/__version__.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-VERSION = (1, 1, 6)
+VERSION = (1, 1, 7)
 CODENAME = "opus"
 BUILD_DT = (2021, 12, 7)
 

copyparty/tcpsrv.py

@@ -83,9 +83,9 @@ class TcpSrv(object):
 
                 for tk, tv in hits:
                     try:
-                        title_tab[tk] += " and {}".format(tv)
+                        title_tab[tk][tv] = 1
                     except:
-                        title_tab[tk] = tv
+                        title_tab[tk] = {tv: 1}
 
         if msgs:
             msgs[-1] += "\n"
@@ -263,12 +263,21 @@ class TcpSrv(object):
 
     def _set_wintitle(self, vars):
         if "pub" not in vars:
-            vars["pub"] = "Local-Only"
+            vars["pub"] = {"Local-Only": 1}
+
+        vars2 = {}
+        for k, eps in vars.items():
+            vars2[k] = {
+                ep: 1
+                for ep in eps.keys()
+                if ":" not in ep or ep.split(":")[0] not in eps
+            }
 
         title = ""
+        vars = vars2
         for p in self.args.wintitle.split(" "):
             if p.startswith("$"):
-                p = vars.get(p[1:], "(None)")
+                p = " and ".join(sorted(vars.get(p[1:], {"(None)": 1}).keys()))
 
             title += "{} ".format(p)
 

copyparty/web/browser.css

@@ -487,7 +487,7 @@ html.light #wfm a:not(.en) {
 	width: calc(100% - 10.5em);
 	background: rgba(0,0,0,0.2);
 }
-@media (min-width: 80em) {
+@media (min-width: 70em) {
 	#barpos,
 	#barbuf {
 		width: calc(100% - 21em);
@@ -679,7 +679,7 @@ input.eq_gain {
 #wrap {
 	margin: 1.8em 1.5em 0 1.5em;
 	min-height: 70vh;
-	padding-bottom: 5em;
+	padding-bottom: 7em;
 }
 #tree {
 	display: none;

copyparty/web/browser.js

@@ -1481,7 +1481,7 @@ function play(tid, is_ev, seek, call_depth) {
 			seek_au_sec(seek);
 		}
 
-		if (!seek) {
+		if (!seek && !ebi('unsearch')) {
 			var o = ebi(oid);
 			o.setAttribute('id', 'thx_js');
 			sethash(oid);
@@ -2966,9 +2966,6 @@ document.onkeydown = function (e) {
 		if (QS('.opview.act'))
 			return QS('#ops>a').click();
 
-		if (QS('#unsearch'))
-			return QS('#unsearch').click();
-
 		if (widget.is_open)
 			return widget.close();
 
@@ -2978,6 +2975,9 @@ document.onkeydown = function (e) {
 		if (!treectl.hidden)
 			return treectl.detree();
 
+		if (QS('#unsearch'))
+			return QS('#unsearch').click();
+
 		if (thegrid.en)
 			return ebi('griden').click();
 	}
@@ -3352,7 +3352,7 @@ document.onkeydown = function (e) {
 
 		treectl.hide();
 
-		var html = mk_files_header(tagord);
+		var html = mk_files_header(tagord), seen = {};
 		html.push('<tbody>');
 		html.push('<tr><td>-</td><td colspan="42"><a href="#" id="unsearch"><big style="font-weight:bold">[❌] close search results</big></a></td></tr>');
 		for (var a = 0; a < res.hits.length; a++) {
@@ -3361,13 +3361,18 @@ document.onkeydown = function (e) {
 				sz = esc(r.sz + ''),
 				rp = esc(uricom_dec(r.rp + '')[0]),
 				ext = rp.lastIndexOf('.') > 0 ? rp.split('.').pop().split('?')[0] : '%',
-				links = linksplit(r.rp + '');
+				id = 'f-' + ('00000000' + crc32(rp)).slice(-8);
+
+			while (seen[id])
+				id += 'a';
+			seen[id] = 1;
 
 			if (ext.length > 8)
 				ext = '%';
 
-			links = links.join('');
+			var links = linksplit(r.rp + '', id).join(''),
-			var nodes = ['<tr><td>-</td><td><div>' + links + '</div>', sz];
+				nodes = ['<tr><td>-</td><td><div>' + links + '</div>', sz];
+
 			for (var b = 0; b < tagord.length; b++) {
 				var k = tagord[b],
 					v = r.tags[k] || "";
@@ -3437,7 +3442,7 @@ var treectl = (function () {
 	});
 	setwrap(bcfg_bind(r, 'wtree', 'wraptree', true, setwrap));
 	setwrap(bcfg_bind(r, 'parpane', 'parpane', true, onscroll));
-	bcfg_bind(r, 'htree', 'hovertree', true, reload_tree);
+	bcfg_bind(r, 'htree', 'hovertree', false, reload_tree);
 
 	function setwrap(v) {
 		clmod(ebi('tree'), 'nowrap', !v);

copyparty/web/util.js

@@ -434,7 +434,7 @@ function makeSortable(table, cb) {
 }
 
 
-function linksplit(rp) {
+function linksplit(rp, id) {
     var ret = [],
         apath = '/',
         q = null;
@@ -464,8 +464,13 @@ function linksplit(rp) {
             vlink = vlink.slice(0, -1) + '<span>/</span>';
         }
 
-        if (!rp && q)
+        if (!rp) {
-            link += q;
+            if (q)
+                link += q;
+
+            if (id)
+                link += '" id="' + id;
+        }
 
         ret.push('<a href="' + apath + link + '">' + vlink + '</a>');
         apath += link;