v0.13.12

copyparty/__version__.py

@@ -1,8 +1,8 @@
 # coding: utf-8
 
-VERSION = (0, 13, 10)
+VERSION = (0, 13, 12)
 CODENAME = "future-proof"
-BUILD_DT = (2021, 8, 30)
+BUILD_DT = (2021, 9, 1)
 
 S_VERSION = ".".join(map(str, VERSION))
 S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT)

copyparty/tcpsrv.py

@@ -177,7 +177,7 @@ class TcpSrv(object):
             eps = self.ips_linux()
 
         if "0.0.0.0" not in listen_ips:
-            eps = {k: v for k, v in eps if k in listen_ips}
+            eps = {k: v for k, v in eps.items() if k in listen_ips}
 
         default_route = None
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)

copyparty/web/browser.css

@@ -343,17 +343,19 @@ html.light #ggrid>a.sel {
 }
 #wtgrid,
 #wtico {
-	cursor: url(/.cpr/dd/4.png), pointer;
-	animation: cursor 500ms;
 	position: relative;
 	font-size: .9em;
 	top: -.04em;
 }
 #wtgrid {
 	font-size: .75em;
+	padding: .1em;
 	top: -.12em;
 }
-#wtgrid:hover,
+#wtico {
+	cursor: url(/.cpr/dd/4.png), pointer;
+	animation: cursor 500ms;
+}
 #wtico:hover {
 	animation: cursor 500ms infinite;
 }
@@ -381,23 +383,25 @@ html.light #ggrid>a.sel {
 	background: #3c3c3c;
 	box-shadow: 0 0 .5em #222;
 	border-radius: .3em 0 0 0;
-	padding: 0;
+	padding: 0 0 0 .1em;
 	color: #fff;
 }
-#wzip, #wnp {
+#wfm, #wzip, #wnp {
 	display: none;
-	margin-right: .3em;
-	padding-right: .3em;
+}
+#wzip, #wnp {
+	margin-right: .2em;
+	padding-right: .2em;
 	border-right: .1em solid #555;
 }
-#wnp a {
-	position: relative;
-	font-size: .47em;
-	margin: 0 .1em;
-	top: -.4em;
+#wfm.act+#wzip,
+#wfm.act+#wzip+#wnp {
+	margin-left: .2em;
+	padding-left: .2em;
+	border-left: .1em solid #555;
 }
-#wnp a+a {
-	margin-left: .33em;
+#wfm.act {
+	display: inline-block;
 }
 #wtoggle,
 #wtoggle * {
@@ -411,6 +415,7 @@ html.light #ggrid>a.sel {
 	display: none;
 }
 #wfm a,
+#wnp a,
 #wzip a {
 	font-size: .5em;
 	padding: 0 .3em;
@@ -418,10 +423,14 @@ html.light #ggrid>a.sel {
 	position: relative;
 	display: inline-block;
 }
-#wfm span {
+#wfm span,
+#wnp span {
 	font-size: .6em;
 	display: block;
 }
+#wnp span {
+	font-size: .7em;
+}
 #wfm a:not(.en) {
 	opacity: .3;
 	color: #f6c;

copyparty/web/browser.js

@@ -40,8 +40,8 @@ ebi('widget').innerHTML = (
 	' href="#" id="selinv" tt="invert selection">sel.<br />inv.</a><a' +
 	' href="#" id="selzip" tt="download selection as archive">zip</a>' +
 	'</span><span id="wnp"><a' +
-	' href="#" id="npirc" tt="copy irc-formatted track info">📋irc</a><a' +
-	' href="#" id="nptxt" tt="copy plaintext track info">📋txt</a>' +
+	' href="#" id="npirc" tt="copy irc-formatted track info">📋<span>irc</span></a><a' +
+	' href="#" id="nptxt" tt="copy plaintext track info">📋<span>txt</span></a>' +
 	'</span><a' +
 	'	href="#" id="wtgrid" tt="toggle grid/list view$NHotkey: G">田</a><a' +
 	'	href="#" id="wtico">♫</a>' +
@@ -1252,6 +1252,9 @@ function play(tid, is_ev, seek, call_depth) {
 	if (mp.order.length == 0)
 		return console.log('no audio found wait what');
 
+	if (crashed)
+		return;
+
 	mp.stopfade(true);
 
 	var tn = tid;
@@ -1718,7 +1721,7 @@ var fileman = (function () {
 		bcut.style.display = have_mv && has(perms, 'move') ? '' : 'none';
 		bpst.style.display = have_mv && has(perms, 'write') ? '' : 'none';
 		bpst.setAttribute('tt', 'paste ' + r.clip.length + ' items$NHotkey: ctrl-V');
-		ebi('wfm').style.display = QS('#wfm a.en:not([display])') ? '' : 'none';
+		clmod(ebi('wfm'), 'act', QS('#wfm a.en:not([style])'));
 	};
 
 	r.rename = function (e) {
@@ -2089,9 +2092,18 @@ var fileman = (function () {
 				clmod(els[a], 'fcut', 1);
 		}, 1);
 
-		toast.inf(1.5, 'cut ' + sel.length + ' items');
-		jwrite('fman_clip', vps);
-		r.tx(1);
+		try {
+			vps = JSON.stringify(vps);
+			if (vps.length > 1024 * 1024)
+				throw 'a';
+
+			swrite('fman_clip', vps);
+			r.tx(1);
+			toast.inf(1.5, 'cut ' + sel.length + ' items');
+		}
+		catch (ex) {
+			toast.warn(30, 'cut ' + sel.length + ' items\n\nbut: only <b>this</b> browser-tab can paste them\n(since the selection is so absolutely massive)');
+		}
 	};
 
 	r.paste = function (e) {
@@ -2700,10 +2712,10 @@ document.onkeydown = function (e) {
 			return ebi('gridsel').click();
 
 		if (k == 'KeyA')
-			return QSA('#ghead>a[z]')[0].click();
+			return QSA('#ghead a[z]')[0].click();
 
 		if (k == 'KeyD')
-			return QSA('#ghead>a[z]')[1].click();
+			return QSA('#ghead a[z]')[1].click();
 	}
 };
 

copyparty/web/ui.css

@@ -52,7 +52,7 @@ html {
 	opacity: 0;
 	padding: .3em 0;
 	margin: -.3em 0 0 0;
-	line-height: 1.5em;
+	line-height: 1.3em;
 	color: #000;
 	border: none;
 	outline: none;
@@ -60,6 +60,15 @@ html {
 	border-radius: .5em 0 0 .5em;
 	transition: left .3s, width .3s, padding .3s, opacity .3s;
 }
+#toastb {
+	max-height: 70vh;
+	overflow-y: auto;
+}
+#toast.scroll #toastb {
+	overflow-y: scroll;
+	margin-right: -1.2em;
+	padding-right: .7em;
+}
 #toast pre {
 	margin: 0;
 }

copyparty/web/util.js

@@ -40,19 +40,49 @@ function vis_exh(msg, url, lineNo, columnNo, error) {
     crashed = true;
     window.onerror = undefined;
     var con = is_touch ? '' : '<br />&nbsp; (and if you can, press F12 and include the "Console" tab in the screenshot too)',
-        html = ['<h1>you hit a bug!</h1><p style="font-size:1.3em;margin:0">try to <a href="#" onclick="localStorage.clear();location.reload();">reset copyparty settings</a> if you are stuck here, or <a href="#" onclick="ignex();">ignore this</a> / <a href="#" onclick="ignex(true);">ignore all</a></p><p>please send me a screenshot arigathanks gozaimuch: <code>ed/irc.rizon.net</code> or <code>ed#2644</code>' + con + '</p><p>',
-        esc(url + ' @' + lineNo + ':' + columnNo), '<br />' + esc(String(msg)) + '</p>'];
+        html = [
+            '<h1>you hit a bug!</h1>',
+            '<p style="font-size:1.3em;margin:0">try to <a href="#" onclick="localStorage.clear();location.reload();">reset copyparty settings</a> if you are stuck here, or <a href="#" onclick="ignex();">ignore this</a> / <a href="#" onclick="ignex(true);">ignore all</a></p>',
+            '<p style="color:#fff">please send me a screenshot arigathanks gozaimuch: <code>ed/irc.rizon.net</code> or <code>ed#2644</code>' + con + '</p>',
+            '<p class="b">' + esc(url + ' @' + lineNo + ':' + columnNo), '<br />' + esc(String(msg)) + '</p>',
+            '<p><b>UA:</b> ' + esc(navigator.userAgent + '')
+        ];
+
+    try {
+        var ua = '',
+            ad = navigator.userAgentData,
+            adb = ad.brands;
+
+        for (var a = 0; a < adb.length; a++)
+            if (adb[a].brand.indexOf('Not;A') < 0)
+                ua += adb[a].brand + '/' + adb[a].version + ', ';
+        ua += ad.platform;
+
+        html.push('<br /><b>UAD:</b> ' + esc(ua.slice(0, 100)));
+    }
+    catch (e) { }
+    html.push('</p>');
 
     try {
         if (error) {
             var find = ['desc', 'stack', 'trace'];
             for (var a = 0; a < find.length; a++)
                 if (String(error[find[a]]) !== 'undefined')
-                    html.push('<h3>' + find[a] + '</h3>' +
-                        esc(String(error[find[a]])).replace(/\n/g, '<br />\n'));
+                    html.push('<p class="b"><b>' + find[a] + ':</b><br />' +
+                        esc(String(error[find[a]])).replace(/\n/g, '<br />\n') + '</p>');
         }
         ignexd[ekey] = true;
-        html.push('<h3>localStore</h3>' + esc(JSON.stringify(localStorage)));
+
+        var ls = jcp(localStorage);
+        if (ls.fman_clip)
+            ls.fman_clip = ls.fman_clip.length + ' items';
+
+        var lsk = Object.keys(ls);
+        lsk.sort();
+        html.push('<p class="b">');
+        for (var a = 0; a < lsk.length; a++)
+            html.push(' <b>' + esc(lsk[a]) + '</b> <code>' + esc(ls[lsk[a]]) + '</code> ');
+        html.push('</p>');
     }
     catch (e) { }
 
@@ -64,7 +94,15 @@ function vis_exh(msg, url, lineNo, columnNo, error) {
             document.body.appendChild(exbox);
 
             var s = mknod('style');
-            s.innerHTML = '#exbox{background:#333;color:#ddd;font-family:sans-serif;font-size:0.8em;padding:0 1em 1em 1em;z-index:80386;position:fixed;top:0;left:0;right:0;bottom:0;width:100%;height:100%;overflow:auto;width:calc(100% - 2em)} #exbox h1{margin:.5em 1em 0 0;padding:0} #exbox h3{border-top:1px solid #999;margin:1em 0 0 0} #exbox a{text-decoration:underline;color:#fc0} #exbox code{color:#bf7;background:#222;padding:.1em;margin:.2em;font-size:1.1em;font-family:monospace,monospace} #exbox,#exbox *{line-height:1.5em;overflow-wrap:break-word}';
+            s.innerHTML = (
+                '#exbox{background:#333;color:#ddd;font-family:sans-serif;font-size:0.8em;padding:0 1em 1em 1em;z-index:80386;position:fixed;top:0;left:0;right:0;bottom:0;width:100%;height:100%;overflow:auto;width:calc(100% - 2em)} ' +
+                '#exbox,#exbox *{line-height:1.5em;overflow-wrap:break-word} ' +
+                '#exbox code{color:#bf7;background:#222;padding:.1em;margin:.2em;font-size:1.1em;font-family:monospace,monospace} ' +
+                '#exbox a{text-decoration:underline;color:#fc0} ' +
+                '#exbox h1{margin:.5em 1em 0 0;padding:0} ' +
+                '#exbox p.b{border-top:1px solid #999;margin:1em 0 0 0;font-size:1em} ' +
+                '#exbox b{color:#fff}'
+            );
             document.head.appendChild(s);
         }
         exbox.innerHTML = html.join('\n').replace(/https?:\/\/[^ \/]+\//g, '/');
@@ -727,6 +765,7 @@ function lf2br(txt) {
 var toast = (function () {
     var r = {},
         te = null,
+        scrolling = false,
         obj = mknod('div');
 
     obj.setAttribute('id', 'toast');
@@ -734,8 +773,30 @@ var toast = (function () {
     r.visible = false;
     r.txt = null;
 
+    function scrollchk() {
+        if (scrolling)
+            return;
+
+        var tb = ebi('toastb'),
+            vis = tb.offsetHeight,
+            all = tb.scrollHeight;
+
+        if (8 + vis >= all)
+            return;
+
+        clmod(obj, 'scroll', 1);
+        scrolling = true;
+    }
+
+    function unscroll() {
+        timer.rm(scrollchk);
+        clmod(obj, 'scroll');
+        scrolling = false;
+    }
+
     r.hide = function (e) {
         ev(e);
+        unscroll();
         clearTimeout(te);
         clmod(obj, 'vis');
         r.visible = false;
@@ -746,11 +807,12 @@ var toast = (function () {
         if (ms)
             te = setTimeout(r.hide, ms * 1000);
 
-        obj.innerHTML = '<a href="#" id="toastc">x</a>' + lf2br(txt);
+        obj.innerHTML = '<a href="#" id="toastc">x</a><div id="toastb">' + lf2br(txt) + '</div>';
         obj.className = cl;
         ms += obj.offsetWidth;
         obj.className += ' vis';
         ebi('toastc').onclick = r.hide;
+        timer.add(scrollchk);
         r.visible = true;
         r.txt = txt;
     };

docs/browser-icons.css

@@ -1,4 +1,7 @@
-/* video */
+/* video, alternative 1:
+   top-left icon, just like the other formats
+=======================================================================
+
 #ggrid>a:is(
 [href$=".mkv"i],
 [href$=".mp4"i],
@@ -6,6 +9,40 @@
 ):before {
     content: '📺';
 }
+*/
+
+
+
+/* video, alternative 2:
+   play-icon in the middle of the thumbnail
+=======================================================================
+*/
+#ggrid>a:is(
+[href$=".mkv"i],
+[href$=".mp4"i],
+[href$=".webm"i],
+) {
+	position: relative;
+	overflow: hidden;
+}
+#ggrid>a:is(
+[href$=".mkv"i],
+[href$=".mp4"i],
+[href$=".webm"i],
+):before {
+    content: '▶';
+	opacity: .8;
+	margin: 0;
+	padding: 1em .5em 1em .7em;
+	border-radius: 9em;
+	line-height: 0;
+	color: #fff;
+	text-shadow: none;
+	background: rgba(0, 0, 0, 0.7);
+	left: calc(50% - 1em);
+	top: calc(50% - 1.4em);
+}
+
 
 
 /* audio */
@@ -21,6 +58,7 @@
 }
 
 
+
 /* image */
 #ggrid>a:is(
 [href$=".jpg"i],

docs/notes.sh

@@ -130,6 +130,9 @@ sqlite3 .hist/up2k.db 'select * from mt where k="fgsfds" or k="t:mtp"' | tee /de
 for ((f=420;f<1200;f++)); do sz=$(ffmpeg -y -f lavfi -i sine=frequency=$f:duration=2 -vf volume=0.1 -ac 1 -ar 44100 -f s16le /dev/shm/a.wav 2>/dev/null; base64 -w0 </dev/shm/a.wav | gzip -c | wc -c); printf '%d %d\n' $f $sz; done | tee /dev/stderr | sort -nrk2,2
 ffmpeg -y -f lavfi -i sine=frequency=1050:duration=2 -vf volume=0.1 -ac 1 -ar 44100 /dev/shm/a.wav
 
+# play icon calibration pics
+for w in 150 170 190 210 230 250; do for h in 130 150 170 190 210; do /c/Program\ Files/ImageMagick-7.0.11-Q16-HDRI/magick.exe convert -size ${w}x${h} xc:brown -fill orange -draw "circle $((w/2)),$((h/2)) $((w/2)),$((h/3))" $w-$h.png; done; done
+
 
 ##
 ## vscode

scripts/make-sfx.sh

@@ -37,6 +37,7 @@ gtar=$(command -v gtar || command -v gnutar) || true
 	sed()  { gsed  "$@"; }
 	find() { gfind "$@"; }
 	sort() { gsort "$@"; }
+	shuf() { gshuf "$@"; }
 	sha1sum() { shasum "$@"; }
 	unexpand() { gunexpand "$@"; }
 	command -v grealpath >/dev/null &&
@@ -303,7 +304,7 @@ for d in copyparty dep-j2; do find $d -type f; done |
 sed -r 's/(.*)\.(.*)/\2 \1/' | LC_ALL=C sort |
 sed -r 's/([^ ]*) (.*)/\2.\1/' | grep -vE '/list1?$' > list1
 
-(grep -vE '\.(gz|br)$' list1; grep -E '\.(gz|br)$' list1) >list || true
+(grep -vE '\.(gz|br)$' list1; grep -E '\.(gz|br)$' list1 | shuf) >list || true
 
 echo creating tar
 args=(--owner=1000 --group=1000)