v0.11.47

copyparty/__version__.py

@@ -1,8 +1,8 @@
 # coding: utf-8
 
-VERSION = (0, 11, 44)
+VERSION = (0, 11, 47)
 CODENAME = "the grid"
-BUILD_DT = (2021, 7, 20)
+BUILD_DT = (2021, 7, 22)
 
 S_VERSION = ".".join(map(str, VERSION))
 S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT)

copyparty/httpcli.py

@@ -1653,6 +1653,7 @@ class HttpCli(object):
             "files": [],
             "taglist": [],
             "srvinf": srv_info,
+            "acct": self.uname,
             "perms": perms,
             "logues": logues,
         }
@@ -1660,6 +1661,7 @@ class HttpCli(object):
             "vdir": quotep(self.vpath),
             "vpnodes": vpnodes,
             "files": [],
+            "acct": self.uname,
             "perms": json.dumps(perms),
             "taglist": [],
             "tag_order": [],

copyparty/web/browser.css

@@ -211,15 +211,39 @@ a, #files tbody div a:last-child {
 	margin: .8em 0;
 }
 #srv_info {
-	opacity: .5;
-	font-size: .8em;
-	color: #fc5;
+	color: #a73;
+	background: #333;
 	position: absolute;
-	top: .5em;
+	font-size: .8em;
+ 	top: .5em;
 	left: 2em;
+	padding-right: .5em;
 }
 #srv_info span {
-	color: #fff;
+	color: #aaa;
+}
+#acc_info {
+	position: absolute;
+	font-size: .81em;
+	top: .5em;
+	right: 2em;
+	color: #999;
+}
+#acc_info span:before {
+	color: #f4c;
+	border-bottom: 1px solid rgba(255,68,204,0.6);
+	margin-right: .6em;
+}
+html.read #acc_info span:before {
+	content: 'Read-Only access';
+}
+html.write #acc_info span:before {
+	content: 'Write-Only access';
+}
+html.read.write #acc_info span:before {
+	content: 'Read-Write access';
+	color: #999;
+	border: none;
 }
 #files tbody a.play {
 	color: #e70;
@@ -1001,10 +1025,14 @@ html.light .tgl.btn.on {
 }
 html.light #srv_info {
 	color: #c83;
+	background: #eee;
+}
+html.light #srv_info,
+html.light #acc_info {
 	text-shadow: 1px 1px 0 #fff;
 }
 html.light #srv_info span {
-	color: #000;
+	color: #777;
 }
 html.light #treeul a+a {
 	background: inherit;

copyparty/web/browser.html

@@ -121,7 +121,8 @@
 	<div id="widget"></div>
 
 	<script>
-		var perms = {{ perms }},
+		var acct = "{{ acct }}",
+			perms = {{ perms }},
 			tag_order_cfg = {{ tag_order }},
 			have_up2k_idx = {{ have_up2k_idx|tojson }},
 			have_tags_idx = {{ have_tags_idx|tojson }},

copyparty/web/browser.js

@@ -62,7 +62,7 @@ ebi('op_up2k').innerHTML = (
 	'		</td>\n' +
 	'		<td rowspan="2">\n' +
 	'			<input type="checkbox" id="ask_up" />\n' +
-	'			<label for="ask_up" tt="ask for confirmation befofre upload starts">💭</label>\n' +
+	'			<label for="ask_up" tt="ask for confirmation before upload starts">💭</label>\n' +
 	'		</td>\n' +
 	'		<td rowspan="2">\n' +
 	'			<input type="checkbox" id="flag_en" />\n' +
@@ -1452,6 +1452,13 @@ function play_linked() {
 };
 
 
+(function () {
+	var d = mknod('div');
+	d.setAttribute('id', 'acc_info');
+	document.body.insertBefore(d, ebi('ops'));
+})();
+
+
 var thegrid = (function () {
 	var lfiles = ebi('files'),
 		gfiles = mknod('div');
@@ -2434,6 +2441,7 @@ var treectl = (function () {
 		if (this.hpush)
 			hist_push(this.top);
 
+		acct = res.acct;
 		apply_perms(res.perms);
 		despin('#files');
 		despin('#gfiles');
@@ -2550,6 +2558,10 @@ function despin(sel) {
 function apply_perms(newperms) {
 	perms = newperms || [];
 
+	ebi('acc_info').innerHTML = '<span>' + (acct != '*' ?
+		'<a href="/?pw=x">Logout ' + acct + '</a>' :
+		'<a href="/?h">Login</a>') + '</span>';
+
 	var o = QSA('#ops>a[data-perm], #u2footfoot');
 	for (var a = 0; a < o.length; a++) {
 		var display = '';
@@ -2573,12 +2585,10 @@ function apply_perms(newperms) {
 		de = document.documentElement,
 		tds = QSA('#u2conf td');
 
-	/* good idea maybe
 	clmod(de, "read", have_read);
 	clmod(de, "write", have_write);
 	clmod(de, "nread", !have_read);
 	clmod(de, "nwrite", !have_write);
-	*/
 
 	for (var a = 0; a < tds.length; a++) {
 		tds[a].style.display =

copyparty/web/up2k.js

@@ -462,6 +462,9 @@ function U2pvis(act, btns) {
 
 function fsearch_explain(e) {
     ev(e);
+    if (!has(perms, 'write'))
+        return alert('your access to this folder is Read-Only\n\n' + (acct == '*' ? 'you are currently not logged in' : 'you are currently logged in as ' + acct));
+
     alert('you are currently in file-search mode\n\nswitch to upload-mode by clicking the green magnifying glass (next to the big yellow search button), and then refresh\n\nsorry');
 }
 
@@ -493,8 +496,9 @@ function up2k_init(subtle) {
         shame = 'your browser is impressively ancient';
 
     // upload ui hidden by default, clicking the header shows it
+    var got_deps = false;
     function init_deps() {
-        if (!subtle && !window.asmCrypto) {
+        if (!got_deps && !subtle && !window.asmCrypto) {
             var fn = 'sha512.' + sha_js + '.js';
             showmodal('<h1>loading ' + fn + '</h1><h2>since ' + shame + '</h2><h4>thanks chrome</h4>');
             import_js('/.cpr/deps/' + fn, unmodal);
@@ -505,6 +509,7 @@ function up2k_init(subtle) {
                 ebi('u2foot').innerHTML = 'seems like ' + shame + ' so do that if you want more performance <span style="color:#' +
                     (sha_js == 'ac' ? 'c84">(expecting 20' : '8a5">(but dont worry too much, expect 100') + ' MiB/s)</span>';
         }
+        got_deps = true;
     }
 
     // show uploader if the user only has write-access
@@ -921,8 +926,11 @@ function up2k_init(subtle) {
                 return;
 
             clearTimeout(tto);
+            if (crashed)
+                return defer();
+
             running = true;
-            while (window['vis_exh']) {
+            while (true) {
                 var now = Date.now(),
                     is_busy = 0 !=
                         st.todo.head.length +
@@ -1004,7 +1012,7 @@ function up2k_init(subtle) {
                     mou_ikkai = true;
                 }
 
-                if (!mou_ikkai)
+                if (!mou_ikkai || crashed)
                     return defer();
             }
         }
@@ -1297,9 +1305,7 @@ function up2k_init(subtle) {
 
                     if (!response || !response.hits || !response.hits.length) {
                         smsg = '404';
-                        msg = 'not found on server';
-                        if (has(perms, 'write'))
-                            msg += ' <a href="#" onclick="fsearch_explain()" class="fsearch_explain">(explain)</a>';
+                        msg = 'not found on server <a href="#" onclick="fsearch_explain()" class="fsearch_explain">(explain)</a>';
                     }
                     else {
                         smsg = 'found';
@@ -1516,7 +1522,7 @@ function up2k_init(subtle) {
                 try { orz(xhr); } catch (ex) { vis_exh(ex + '', '', '', '', ex); }
             };
             xhr.onerror = function (xev) {
-                if (!window['vis_exh'])
+                if (crashed)
                     return;
 
                 console.log('chunkpit onerror, retrying', t);

copyparty/web/util.js

@@ -7,7 +7,14 @@ if (!window['console'])
 
 
 var is_touch = 'ontouchstart' in window,
-    ANDROID = /(android)/i.test(navigator.userAgent);
+    IPHONE = /iPhone|iPad|iPod/i.test(navigator.userAgent),
+    ANDROID = /android/i.test(navigator.userAgent);
+
+
+var ebi = document.getElementById.bind(document),
+    QS = document.querySelector.bind(document),
+    QSA = document.querySelectorAll.bind(document),
+    mknod = document.createElement.bind(document);
 
 
 // error handler for mobile devices
@@ -21,36 +28,60 @@ function esc(txt) {
         }[c];
     });
 }
+var crashed = false, ignexd = {};
 function vis_exh(msg, url, lineNo, columnNo, error) {
-    if (!window.onerror)
+    if ((msg + '').indexOf('ResizeObserver') !== -1)
+        return;  // chrome issue 809574 (benign, from <video>)
+
+    var ekey = url + '\n' + lineNo + '\n' + msg;
+    if (ignexd[ekey] || crashed)
         return;
 
+    crashed = true;
     window.onerror = undefined;
-    window['vis_exh'] = null;
-    var html = ['<h1>you hit a bug!</h1><p style="font-size:1.3em;margin:0">try to <a href="#" onclick="localStorage.clear();location.reload();" style="text-decoration:underline;color:#fc0">reset copyparty settings</a> if you are stuck here</p><p>please send me a screenshot arigathanks gozaimuch: <code>ed/irc.rizon.net</code> or <code>ed#2644</code><br />&nbsp; (and if you can, press F12 and include the "Console" tab in the screenshot too)</p><p>',
+    var html = ['<h1>you hit a bug!</h1><p style="font-size:1.3em;margin:0">try to <a href="#" onclick="localStorage.clear();location.reload();" style="text-decoration:underline;color:#fc0">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><br />&nbsp; (and if you can, press F12 and include the "Console" tab in the screenshot too)</p><p>',
         esc(url + ' @' + lineNo + ':' + columnNo), '<br />' + esc(String(msg)) + '</p>'];
 
-    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'));
+    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'));
+        }
+        ignexd[ekey] = true;
+        html.push('<h3>localStore</h3>' + esc(JSON.stringify(localStorage)));
     }
-    document.body.innerHTML = html.join('\n');
+    catch (e) { }
 
-    var s = mknod('style');
-    s.innerHTML = 'body{background:#333;color:#ddd;font-family:sans-serif;font-size:0.8em;padding:0 1em 1em 1em} h1{margin:.5em 1em 0 0;padding:0} h3{border-top:1px solid #999;margin:0} code{color:#bf7;background:#222;padding:.1em;margin:.2em;font-size:1.1em;font-family:monospace,monospace} *{line-height:1.5em}';
-    document.head.appendChild(s);
+    try {
+        var exbox = ebi('exbox');
+        if (!exbox) {
+            exbox = mknod('div');
+            exbox.setAttribute('id', 'exbox');
+            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%} #exbox h1{margin:.5em 1em 0 0;padding:0} #exbox h3{border-top:1px solid #999;margin:1em 0 0 0} #exbox code{color:#bf7;background:#222;padding:.1em;margin:.2em;font-size:1.1em;font-family:monospace,monospace} #exbox *{line-height:1.5em}';
+            document.head.appendChild(s);
+        }
+        exbox.innerHTML = html.join('\n');
+        exbox.style.display = 'block';
+    }
+    catch (e) {
+        document.body.innerHTML = html.join('\n');
+    }
     throw 'fatal_err';
 }
-
-
-var ebi = document.getElementById.bind(document),
-    QS = document.querySelector.bind(document),
-    QSA = document.querySelectorAll.bind(document),
-    mknod = document.createElement.bind(document);
+function ignex(all) {
+    var o = ebi('exbox');
+    o.style.display = 'none';
+    o.innerHTML = '';
+    crashed = false;
+    if (!all)
+        window.onerror = vis_exh;
+}
 
 
 function ctrl(e) {
@@ -547,12 +578,25 @@ var tt = (function () {
         clmod(r.tt, 'show', 1);
     };
 
-    r.hide = function () {
+    r.hide = function (e) {
+        ev(e);
         clmod(r.tt, 'show');
         if (r.el)
             r.el.removeEventListener('mouseleave', r.hide);
     };
 
+    if (is_touch && IPHONE) {
+        var f1 = r.show,
+            f2 = r.hide;
+
+        r.show = function () {
+            setTimeout(f1.bind(this), 301);
+        };
+        r.hide = function () {
+            setTimeout(f2.bind(this), 301);
+        };
+    }
+
     r.tt.onclick = r.hide;
 
     r.att = function (ctr) {