From d5a79455d1927c0358cd32daa5a293955e7c82e4 Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Mon, 26 Jul 2021 23:31:45 +0200
Subject: [PATCH] cleanup

---
 copyparty/__main__.py    | 10 ++++++++--
 copyparty/web/browser.js |  9 +++------
 copyparty/web/util.js    |  4 ++--
 tests/test_httpcli.py    |  1 +
 tests/test_vfs.py        |  1 +
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/copyparty/__main__.py b/copyparty/__main__.py
index ec84843a..51bba006 100644
--- a/copyparty/__main__.py
+++ b/copyparty/__main__.py
@@ -199,10 +199,16 @@ def run_argparse(argv, formatter):
         epilog=dedent(
             """
             -a takes username:password,
-            -v takes src:dst:permset:permset:cflag:cflag:...
-               where "permset" is "accesslevel,username"
+            -v takes src:dst:perm1:perm2:permN:cflag1:cflag2:cflagN:...
+               where "perm" is "accesslevels,username1,username2,..."
                and "cflag" is config flags to set on this volume
             
+            list of accesslevels:
+              "r" (read):   list folder contents, download files
+              "w" (write):  upload files; need "r" to see the uploads
+              "m" (move):   move files and folders; need "w" at destination
+              "d" (delete): permanently delete files and folders
+
             list of cflags:
               "c,nodupe" rejects existing files (instead of symlinking them)
               "c,e2d" sets -e2d (all -e2* args can be set using ce2* cflags)
diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js
index daa5d3a5..996d8ace 100644
--- a/copyparty/web/browser.js
+++ b/copyparty/web/browser.js
@@ -35,7 +35,7 @@ ebi('widget').innerHTML = (
 	' href="#" id="fcut" tt="cut selected items &lt;small&gt;(then paste somewhere else)&lt;/small&gt;$NHotkey: ctrl-X">✂<span>cut</span></a><a' +
 	' href="#" id="fpst" tt="paste a previously cut/copied selection$NHotkey: ctrl-V">📋<span>paste</span></a>' +
 	'</span><span id="wzip"><a' +
-	' href="#" id="selall" tt="select all files">sel.<br />all</a><a' +
+	' href="#" id="selall" tt="select all files$NHotkey: ctrl-A (when file focused)">sel.<br />all</a><a' +
 	' 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' +
@@ -1600,7 +1600,7 @@ var fileman = (function () {
 	r.paste = function (e) {
 		ev(e);
 		if (!r.clip.length)
-			return alert('first cut some items to paste\n\nnote: you can cut/paste across different browser tabs');
+			return alert('first cut some files/folders to paste\n\nnote: you can cut/paste across different browser tabs');
 
 		var req = [],
 			exists = [],
@@ -2378,7 +2378,6 @@ document.onkeydown = function (e) {
 		ofiles.setAttribute("q_raw", this.q_raw);
 		set_vq();
 		mukey.render();
-		msel.render();
 		reload_browser();
 		filecols.set_style(['File Name']);
 
@@ -2391,7 +2390,6 @@ document.onkeydown = function (e) {
 		ebi('files').innerHTML = orig_html;
 		ebi('files').removeAttribute('q_raw');
 		orig_html = null;
-		msel.render();
 		reload_browser();
 	}
 })();
@@ -2726,7 +2724,6 @@ var treectl = (function () {
 
 		filecols.set_style();
 		mukey.render();
-		msel.render();
 		reload_tree();
 		reload_browser();
 
@@ -3467,8 +3464,8 @@ function reload_browser(not_mp) {
 		up2k.set_fsearch();
 
 	thegrid.setdirty();
+	msel.render();
 }
 reload_browser(true);
 mukey.render();
-msel.render();
 play_linked();
diff --git a/copyparty/web/util.js b/copyparty/web/util.js
index c041df0e..872b361a 100644
--- a/copyparty/web/util.js
+++ b/copyparty/web/util.js
@@ -39,7 +39,7 @@ function vis_exh(msg, url, lineNo, columnNo, error) {
 
     crashed = true;
     window.onerror = undefined;
-    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>',
+    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();">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>'];
 
     try {
@@ -63,7 +63,7 @@ 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%} #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}';
+            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 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 *{line-height:1.5em}';
             document.head.appendChild(s);
         }
         exbox.innerHTML = html.join('\n');
diff --git a/tests/test_httpcli.py b/tests/test_httpcli.py
index da4c9d25..6a8ee8ba 100644
--- a/tests/test_httpcli.py
+++ b/tests/test_httpcli.py
@@ -32,6 +32,7 @@ class Cfg(Namespace):
             ed=False,
             nw=False,
             no_zip=False,
+            no_voldump=True,
             no_scandir=False,
             no_sendfile=True,
             no_rescan=True,
diff --git a/tests/test_vfs.py b/tests/test_vfs.py
index 285bbc54..42396202 100644
--- a/tests/test_vfs.py
+++ b/tests/test_vfs.py
@@ -24,6 +24,7 @@ class Cfg(Namespace):
             "hist": None,
             "no_hash": False,
             "css_browser": None,
+            "no_voldump": True,
             "rproxy": 0,
         }
         ex.update(ex2)