From 6db72d716644b98b4a2b0a9fa6d3b9b2c4d7149d Mon Sep 17 00:00:00 2001 From: ed Date: Thu, 15 Sep 2022 01:18:19 +0200 Subject: [PATCH] optimizations / cleanup --- bin/mtag/vidchk.py | 2 +- copyparty/web/browser.css | 13 ++++++++++--- copyparty/web/browser.js | 20 ++++++++++---------- copyparty/web/up2k.js | 2 +- docs/notes.sh | 5 +++++ 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/bin/mtag/vidchk.py b/bin/mtag/vidchk.py index f1a22f4b..42801772 100755 --- a/bin/mtag/vidchk.py +++ b/bin/mtag/vidchk.py @@ -104,7 +104,7 @@ def main(): if err: return err - if min(w, h) < 720: + if max(w, h) < 1280 and min(w, h) < 720: return "resolution too small" zs = ( diff --git a/copyparty/web/browser.css b/copyparty/web/browser.css index b598ff1c..ee2de85f 100644 --- a/copyparty/web/browser.css +++ b/copyparty/web/browser.css @@ -88,10 +88,10 @@ --g-sel-fg: #fff; --g-sel-bg: #925; - --g-sel-b1: #c37; + --g-sel-b1: #e39; --g-sel-sh: #b36; --g-fsel-bg: #d39; - --g-fsel-b1: #d48; + --g-fsel-b1: #f4a; --g-fsel-ts: #804; --g-fg: var(--a-hil); --g-bg: var(--bg-u2); @@ -1261,7 +1261,9 @@ html.y #ops svg circle { max-width: min(41em, calc(100% - 2.6em)); } .opbox input { + position: relative; margin: .5em; + top: -.3em; } .opview input[type=text] { color: var(--fg); @@ -1454,7 +1456,7 @@ html { margin: .2em; white-space: pre; position: relative; - top: -.2em; + top: -.12em; } html.c .btn, html.a .btn { @@ -2903,6 +2905,11 @@ html.d #treepar { gap: 1em; } + html.b #ggrid { + padding: 0 2em 2em 0; + gap: .5em 3em; + } + #ggrid > a { margin: unset; padding: unset; diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js index d75b4ee4..ee8d635c 100644 --- a/copyparty/web/browser.js +++ b/copyparty/web/browser.js @@ -325,7 +325,8 @@ var Ls = { "u_emtleak2": ' switch to https (recommended) or ', "u_emtleak3": ' ', "u_emtleak4": "try the following:\nUploads will be a bit slower, but oh well.\nSorry for the trouble !", - "u_emtleakc": "\n\nPS: chrome v107 has a bugfix for this", + "u_emtleakc": '\n\nPS: chrome v107 has a bugfix for this', + "u_emtleakf": '\n\nPS: firefox v106 should have a bugfix for this', "u_s404": "not found on server", "u_expl": "explain", "u_tu": '

WARNING: turbo enabled,  client may not detect and resume incomplete uploads; see turbo-button tooltip

', @@ -671,7 +672,8 @@ var Ls = { "u_emtleak2": ' helst at du bytter til https, eller ', "u_emtleak3": ' at du ', "u_emtleak4": "prøver følgende:\nOpplastning vil gå litt tregere, men det får så være.\nBeklager bryderiet !", - "u_emtleakc": "\n\nPS: feilen skal være fikset i chrome v107", + "u_emtleakc": '\n\nPS: feilen skal være fikset i chrome v107', + "u_emtleakf": '\n\nPS: feilen skal være fikset i firefox v106', "u_s404": "ikke funnet på serveren", "u_expl": "forklar", "u_tu": '

ADVARSEL: turbo er på,  avbrutte opplastninger vil muligens ikke oppdages og gjenopptas; hold musepekeren over turbo-knappen for mer info

', @@ -3265,7 +3267,7 @@ var showfile = (function () { window.Prism = { 'manual': true }; var em = QS('#bdoc>pre'); if (em) - em = [r.sname(window.location.search), window.location.hash, em.textContent]; + em = [r.sname(window.location.search), location.hash, em.textContent]; else { var m = /[?&]doc=([^&]+)/.exec(window.location.search); if (m) { @@ -4508,6 +4510,7 @@ function aligngriditems() { ebi('ggrid').style.justifyContent = 'space-between'; } } +window.addEventListener('resize', aligngriditems); var treectl = (function () { var r = { @@ -4697,8 +4700,6 @@ var treectl = (function () { timer.add(onscroll2, true); function onresize(e) { - aligngriditems(); - if (!entreed || r.hidden) return; @@ -5038,7 +5039,6 @@ var treectl = (function () { set_files_html(html); function asdf() { - filecols.set_style(); showfile.mktree(); mukey.render(); reload_tree(); @@ -5158,7 +5158,7 @@ var treectl = (function () { r.goto(url.pathname, false, true); }; - hist_replace(get_evpath() + window.location.hash); + hist_replace(get_evpath() + location.hash); r.onscroll = onscroll; return r; })(); @@ -5317,7 +5317,7 @@ var filecols = (function () { var hidden = jread('filecols', []); var add_btns = function () { - var ths = QSA('#files th>span'); + var ths = QSA('#files>thead th>span'); for (var a = 0, aa = ths.length; a < aa; a++) { var th = ths[a].parentElement, ttv = L.cols[ths[a].textContent]; @@ -5363,7 +5363,7 @@ var filecols = (function () { add_btns(); var ohidden = [], - ths = QSA('#files th'), + ths = QSA('#files>thead th'), ncols = ths.length; for (var a = 0; a < ncols; a++) { @@ -5389,7 +5389,7 @@ var filecols = (function () { } if (window['tt']) { tt.att(ebi('hcols')); - tt.att(QS('#files thead')); + tt.att(QS('#files>thead')); } }; diff --git a/copyparty/web/up2k.js b/copyparty/web/up2k.js index 7e40d5f3..e04ff66a 100644 --- a/copyparty/web/up2k.js +++ b/copyparty/web/up2k.js @@ -1397,7 +1397,7 @@ function up2k_init(subtle) { st.oserr = true; var msg = HTTPS ? L.u_emtleak3 : L.u_emtleak2.format((window.location + '').replace(':', 's:')); - modal.alert(L.u_emtleak1 + msg + L.u_emtleak4 + (CHROME ? L.u_emtleakc : '')); + modal.alert(L.u_emtleak1 + msg + L.u_emtleak4 + (CHROME ? L.u_emtleakc : FIREFOX ? L.u_emtleakf : '')); } ///// diff --git a/docs/notes.sh b/docs/notes.sh index 27d0e3ee..0426c834 100644 --- a/docs/notes.sh +++ b/docs/notes.sh @@ -54,6 +54,11 @@ cat log | awk '!/"purl"/{next} {s=$1;sub(/[^m]+m/,"");gsub(/:/," ");t=60*(60*$1+ cat log | awk '!/"purl"/{next} {s=$1;sub(/[^m]+m/,"");gsub(/:/," ");t=60*(60*$1+$2)+$3} t1{printf "%.3f += %.3f - %.3f (%.3f) # %.3f -> %.3f\n",r,p,a,p-a,p,t;r+=p-a;a=t} {p=t} END {print r+p-a}' +## +## find uploads blocked by slow i/o or maybe deadlocks +awk '/^.\+. opened logfile/{print;next} {sub(/.$/,"")} !/^..36m[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3} /{next} !/0m(POST|writing) /{next} {c=0;p=$3} /0mPOST/{c=1} {s=$1;sub(/[^m]+m/,"");gsub(/:/," ");s=60*(60*$1+$2)+$3} c{t[p]=s;next} {d=s-t[p]} d>10{print $0 " # " d}' + + ## ## bad filenames