diff --git a/copyparty/__main__.py b/copyparty/__main__.py index 3566aff1..f7161235 100755 --- a/copyparty/__main__.py +++ b/copyparty/__main__.py @@ -888,7 +888,7 @@ def add_upload(ap): ap2.add_argument("--df", metavar="GiB", type=float, default=0, help="ensure \033[33mGiB\033[0m free disk space by rejecting upload requests") ap2.add_argument("--sparse", metavar="MiB", type=int, default=4, help="windows-only: minimum size of incoming uploads through up2k before they are made into sparse files") ap2.add_argument("--turbo", metavar="LVL", type=int, default=0, help="configure turbo-mode in up2k client; [\033[32m-1\033[0m] = forbidden/always-off, [\033[32m0\033[0m] = default-off and warn if enabled, [\033[32m1\033[0m] = default-off, [\033[32m2\033[0m] = on, [\033[32m3\033[0m] = on and disable datecheck") - ap2.add_argument("--u2j", metavar="JOBS", type=int, default=2, help="web-client: number of file chunks to upload in parallel; 1 or 2 is good for low-latency (same-country) connections, 4-8 for android clients, 16-32 for cross-atlantic (max=64)") + ap2.add_argument("--u2j", metavar="JOBS", type=int, default=2, help="web-client: number of file chunks to upload in parallel; 1 or 2 is good for low-latency (same-country) connections, 4-8 for android clients, 16 for cross-atlantic (max=64)") ap2.add_argument("--u2sort", metavar="TXT", type=u, default="s", help="upload order; [\033[32ms\033[0m]=smallest-first, [\033[32mn\033[0m]=alphabetical, [\033[32mfs\033[0m]=force-s, [\033[32mfn\033[0m]=force-n -- alphabetical is a bit slower on fiber/LAN but makes it easier to eyeball if everything went fine") ap2.add_argument("--write-uplog", action="store_true", help="write POST reports to textfiles in working-directory") diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js index 9301f1c0..98c14d0c 100644 --- a/copyparty/web/browser.js +++ b/copyparty/web/browser.js @@ -465,6 +465,7 @@ var Ls = { "u_emtleakf": 'try the following:\n
F5
to refresh the pageđ„
(potato) in the upload UIconnections-per-server
in about:config
",
"u_tu": 'WARNING: turbo enabled, client may not detect and resume incomplete uploads; see turbo-button tooltip
', "u_ts": 'WARNING: turbo enabled, search results can be incorrect; see turbo-button tooltip
', "u_turbo_c": "turbo is disabled in server config", @@ -956,6 +957,7 @@ var Ls = { "u_emtleakf": 'prĂžver fĂžlgende:\nđ„
("enkelt UI") i opplasterenconnections-per-server
in about:config
",
"u_tu": 'ADVARSEL: turbo er pÄ, avbrutte opplastninger vil muligens ikke oppdages og gjenopptas; hold musepekeren over turbo-knappen for mer info
', "u_ts": 'ADVARSEL: turbo er pÄ, sÞkeresultater kan vÊre feil; hold musepekeren over turbo-knappen for mer info
', "u_turbo_c": "turbo er deaktivert i serverkonfigurasjonen", diff --git a/copyparty/web/ui.css b/copyparty/web/ui.css index 72b36a1d..e27030ec 100644 --- a/copyparty/web/ui.css +++ b/copyparty/web/ui.css @@ -147,6 +147,10 @@ html { #toast.err #toastc { background: #d06; } +#toast code { + padding: 0 .2em; + background: rgba(0,0,0,0.2); +} #tth { color: #fff; background: #111; diff --git a/copyparty/web/up2k.js b/copyparty/web/up2k.js index 701248f4..5386d5eb 100644 --- a/copyparty/web/up2k.js +++ b/copyparty/web/up2k.js @@ -2720,6 +2720,9 @@ function up2k_init(subtle) { if (parallel_uploads > 16) parallel_uploads = 16; + if (parallel_uploads > 7) + toast.warn(10, L.u_maxconn); + obj.value = parallel_uploads; bumpthread({ "target": 1 }); }