mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-18 01:22:13 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup

Browse source
This commit is contained in:
ed 2021-04-21 18:48:23 +02:00
parent eed82dbb54
commit 28c12ef3bf
2 changed files with 113 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

209
copyparty/web/up2k.js
View file

@ -219,25 +219,28 @@ function U2pvis(act, btns) {
}; };
this.hashed = function (fobj) { this.hashed = function (fobj) {
var fo = this.tab[fobj.n]; var fo = this.tab[fobj.n],
var nb = fo.bt * (++fo.nh / fo.cb.length); nb = fo.bt * (++fo.nh / fo.cb.length),
var p = this.perc(nb, 0, fobj.size, fobj.t1); p = this.perc(nb, 0, fobj.size, fobj.t1);
fo.hp = '{0}%, {1}, {2} MB/s'.format( fo.hp = '{0}%, {1}, {2} MB/s'.format(
p[0].toFixed(2), p[1], p[2].toFixed(2) p[0].toFixed(2), p[1], p[2].toFixed(2)
); );
if (!this.is_act(fo.in)) if (!this.is_act(fo.in))
return; return;
var obj = ebi('f{0}p'.format(fobj.n)); var obj = ebi('f{0}p'.format(fobj.n)),
o1 = p[0] - 2, o2 = p[0] - 0.1, o3 = p[0];
obj.innerHTML = fo.hp; obj.innerHTML = fo.hp;
obj.style.color = '#fff'; obj.style.color = '#fff';
var o1 = p[0] - 2, o2 = p[0] - 0.1, o3 = p[0];
obj.style.background = 'linear-gradient(90deg, #025, #06a ' + o1 + '%, #09d ' + o2 + '%, #333 ' + o3 + '%, #333 99%, #777)'; obj.style.background = 'linear-gradient(90deg, #025, #06a ' + o1 + '%, #09d ' + o2 + '%, #333 ' + o3 + '%, #333 99%, #777)';
}; };
this.prog = function (fobj, nchunk, cbd) { this.prog = function (fobj, nchunk, cbd) {
var fo = this.tab[fobj.n]; var fo = this.tab[fobj.n],
var delta = cbd - fo.cb[nchunk]; delta = cbd - fo.cb[nchunk];
fo.cb[nchunk] = cbd; fo.cb[nchunk] = cbd;
fo.bd += delta; fo.bd += delta;
@ -249,10 +252,11 @@ function U2pvis(act, btns) {
if (!this.is_act(fo.in)) if (!this.is_act(fo.in))
return; return;
var obj = ebi('f{0}p'.format(fobj.n)); var obj = ebi('f{0}p'.format(fobj.n)),
o1 = p[0] - 2, o2 = p[0] - 0.1, o3 = p[0];
obj.innerHTML = fo.hp; obj.innerHTML = fo.hp;
obj.style.color = '#fff'; obj.style.color = '#fff';
var o1 = p[0] - 2, o2 = p[0] - 0.1, o3 = p[0];
obj.style.background = 'linear-gradient(90deg, #050, #270 ' + o1 + '%, #4b0 ' + o2 + '%, #333 ' + o3 + '%, #333 99%, #777)'; obj.style.background = 'linear-gradient(90deg, #050, #270 ' + o1 + '%, #4b0 ' + o2 + '%, #333 ' + o3 + '%, #333 99%, #777)';
}; };
@ -331,9 +335,9 @@ function U2pvis(act, btns) {
this.changecard = function (card) { this.changecard = function (card) {
this.act = card; this.act = card;
var html = [];
this.head = -1; this.head = -1;
this.tail = -1; this.tail = -1;
var html = [];
for (var a = 0; a < this.tab.length; a++) { for (var a = 0; a < this.tab.length; a++) {
var rt = this.tab[a].in; var rt = this.tab[a].in;
if (this.is_act(rt)) { if (this.is_act(rt)) {
@ -416,8 +420,9 @@ function up2k_init(have_crypto) {
ebi('u2notbtn').innerHTML = ''; ebi('u2notbtn').innerHTML = '';
} }
var shame = 'your browser <a href="https://www.chromium.org/blink/webcrypto">disables sha512</a> unless you <a href="' + (window.location + '').replace(':', 's:') + '">use https</a>' var shame = 'your browser <a href="https://www.chromium.org/blink/webcrypto">disables sha512</a> unless you <a href="' + (window.location + '').replace(':', 's:') + '">use https</a>',
var is_https = (window.location + '').indexOf('https:') === 0; is_https = (window.location + '').indexOf('https:') === 0;
if (is_https) if (is_https)
// chrome<37 firefox<34 edge<12 ie<11 opera<24 safari<10.1 // chrome<37 firefox<34 edge<12 ie<11 opera<24 safari<10.1
shame = 'your browser is impressively ancient'; shame = 'your browser is impressively ancient';
@ -474,14 +479,14 @@ function up2k_init(have_crypto) {
}; };
} }
var parallel_uploads = icfg_get('nthread'); var parallel_uploads = icfg_get('nthread'),
var multitask = bcfg_get('multitask', true); multitask = bcfg_get('multitask', true),
var ask_up = bcfg_get('ask_up', true); ask_up = bcfg_get('ask_up', true),
var flag_en = bcfg_get('flag_en', false); flag_en = bcfg_get('flag_en', false),
var fsearch = bcfg_get('fsearch', false); fsearch = bcfg_get('fsearch', false),
var min_filebuf = 0; fdom_ctr = 0,
min_filebuf = 0;
var fdom_ctr = 0;
var st = { var st = {
"files": [], "files": [],
"todo": { "todo": {
@ -531,8 +536,9 @@ function up2k_init(have_crypto) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
var files; var files,
var is_itemlist = false; is_itemlist = false;
if (e.dataTransfer) { if (e.dataTransfer) {
if (e.dataTransfer.items) { if (e.dataTransfer.items) {
files = e.dataTransfer.items; // DataTransferItemList files = e.dataTransfer.items; // DataTransferItemList
@ -546,9 +552,10 @@ function up2k_init(have_crypto) {
return alert('no files selected??'); return alert('no files selected??');
more_one_file(); more_one_file();
var bad_files = []; var bad_files = [],
var good_files = []; good_files = [],
var dirs = []; dirs = [];
for (var a = 0; a < files.length; a++) { for (var a = 0; a < files.length; a++) {
var fobj = files[a]; var fobj = files[a];
if (is_itemlist) { if (is_itemlist) {
@ -633,12 +640,13 @@ function up2k_init(have_crypto) {
function gotallfiles(good_files, bad_files) { function gotallfiles(good_files, bad_files) {
if (bad_files.length > 0) { if (bad_files.length > 0) {
var ntot = bad_files.length + good_files.length; var ntot = bad_files.length + good_files.length,
var msg = 'These {0} files (of {1} total) were skipped because they are empty:\n'.format(bad_files.length, ntot); msg = 'These {0} files (of {1} total) were skipped because they are empty:\n'.format(bad_files.length, ntot);
for (var a = 0, aa = Math.min(20, bad_files.length); a < aa; a++) for (var a = 0, aa = Math.min(20, bad_files.length); a < aa; a++)
msg += '-- ' + bad_files[a] + '\n'; msg += '-- ' + bad_files[a] + '\n';
if (good_files.length - bad_files.length <= 1 && /(android)/i.test(navigator.userAgent)) if (good_files.length - bad_files.length <= 1 && ANDROID)
msg += '\nFirefox-Android has a bug which prevents selecting multiple files. Try selecting one file at a time. For more info, see firefox bug 1456557'; msg += '\nFirefox-Android has a bug which prevents selecting multiple files. Try selecting one file at a time. For more info, see firefox bug 1456557';
alert(msg); alert(msg);
@ -652,9 +660,10 @@ function up2k_init(have_crypto) {
return; return;
for (var a = 0; a < good_files.length; a++) { for (var a = 0; a < good_files.length; a++) {
var fobj = good_files[a][0]; var fobj = good_files[a][0],
var now = new Date().getTime(); now = new Date().getTime(),
var lmod = fobj.lastModified || now; lmod = fobj.lastModified || now;
var entry = { var entry = {
"n": parseInt(st.files.length.toString()), "n": parseInt(st.files.length.toString()),
"t0": now, "t0": now,
@ -690,7 +699,7 @@ function up2k_init(have_crypto) {
function more_one_file() { function more_one_file() {
fdom_ctr++; fdom_ctr++;
var elm = document.createElement('div') var elm = document.createElement('div');
elm.innerHTML = '<input id="file{0}" type="file" name="file{0}[]" multiple="multiple" />'.format(fdom_ctr); elm.innerHTML = '<input id="file{0}" type="file" name="file{0}[]" multiple="multiple" />'.format(fdom_ctr);
ebi('u2form').appendChild(elm); ebi('u2form').appendChild(elm);
ebi('file' + fdom_ctr).addEventListener('change', gotfile, false); ebi('file' + fdom_ctr).addEventListener('change', gotfile, false);
@ -737,8 +746,8 @@ function up2k_init(have_crypto) {
} }
var tasker = (function () { var tasker = (function () {
var mutex = false; var mutex = false,
var was_busy = false; was_busy = false;
function taskerd() { function taskerd() {
if (mutex) if (mutex)
@ -757,10 +766,8 @@ function up2k_init(have_crypto) {
if (was_busy != is_busy) { if (was_busy != is_busy) {
was_busy = is_busy; was_busy = is_busy;
if (is_busy) window[(is_busy ? "add" : "remove") +
window.addEventListener("beforeunload", warn_uploader_busy); "EventListener"]("beforeunload", warn_uploader_busy);
else
window.removeEventListener("beforeunload", warn_uploader_busy);
} }
if (flag) { if (flag) {
@ -831,47 +838,47 @@ function up2k_init(have_crypto) {
// https://gist.github.com/jonleighton/958841 // https://gist.github.com/jonleighton/958841
function buf2b64(arrayBuffer) { function buf2b64(arrayBuffer) {
var base64 = ''; var base64 = '',
var encodings = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_'; cset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_',
var bytes = new Uint8Array(arrayBuffer); src = new Uint8Array(arrayBuffer),
var byteLength = bytes.byteLength; nbytes = src.byteLength,
var byteRemainder = byteLength % 3; byteRem = nbytes % 3,
var mainLength = byteLength - byteRemainder; mainLen = nbytes - byteRem,
var a, b, c, d; a, b, c, d, chunk;
var chunk;
for (var i = 0; i < mainLength; i = i + 3) { for (var i = 0; i < mainLen; i = i + 3) {
chunk = (bytes[i] << 16) | (bytes[i + 1] << 8) | bytes[i + 2]; chunk = (src[i] << 16) | (src[i + 1] << 8) | src[i + 2];
// create 8*3=24bit segment then split into 6bit segments // create 8*3=24bit segment then split into 6bit segments
a = (chunk & 16515072) >> 18; // 16515072 = (2^6 - 1) << 18 a = (chunk & 16515072) >> 18; // (2^6 - 1) << 18
b = (chunk & 258048) >> 12; // 258048 = (2^6 - 1) << 12 b = (chunk & 258048) >> 12; // (2^6 - 1) << 12
c = (chunk & 4032) >> 6; // 4032 = (2^6 - 1) << 6 c = (chunk & 4032) >> 6; // (2^6 - 1) << 6
d = chunk & 63; // 63 = 2^6 - 1 d = chunk & 63; // 2^6 - 1
// Convert the raw binary segments to the appropriate ASCII encoding // Convert the raw binary segments to the appropriate ASCII encoding
base64 += encodings[a] + encodings[b] + encodings[c] + encodings[d]; base64 += cset[a] + cset[b] + cset[c] + cset[d];
} }
if (byteRemainder == 1) { if (byteRem == 1) {
chunk = bytes[mainLength]; chunk = src[mainLen];
a = (chunk & 252) >> 2; // 252 = (2^6 - 1) << 2 a = (chunk & 252) >> 2; // (2^6 - 1) << 2
b = (chunk & 3) << 4; // 3 = 2^2 - 1 (zero 4 LSB) b = (chunk & 3) << 4; // 2^2 - 1 (zero 4 LSB)
base64 += encodings[a] + encodings[b];//+ '=='; base64 += cset[a] + cset[b];//+ '==';
} }
else if (byteRemainder == 2) { else if (byteRem == 2) {
chunk = (bytes[mainLength] << 8) | bytes[mainLength + 1]; chunk = (src[mainLen] << 8) | src[mainLen + 1];
a = (chunk & 64512) >> 10; // 64512 = (2^6 - 1) << 10 a = (chunk & 64512) >> 10; // (2^6 - 1) << 10
b = (chunk & 1008) >> 4; // 1008 = (2^6 - 1) << 4 b = (chunk & 1008) >> 4; // (2^6 - 1) << 4
c = (chunk & 15) << 2; // 15 = 2^4 - 1 (zero 2 LSB) c = (chunk & 15) << 2; // 2^4 - 1 (zero 2 LSB)
base64 += encodings[a] + encodings[b] + encodings[c];//+ '='; base64 += cset[a] + cset[b] + cset[c];//+ '=';
} }
return base64; return base64;
} }
function get_chunksize(filesize) { function get_chunksize(filesize) {
var chunksize = 1024 * 1024; var chunksize = 1024 * 1024,
var stepsize = 512 * 1024; stepsize = 512 * 1024;
while (true) { while (true) {
for (var mul = 1; mul <= 2; mul++) { for (var mul = 1; mul <= 2; mul++) {
var nchunks = Math.ceil(filesize / chunksize); var nchunks = Math.ceil(filesize / chunksize);
@ -889,7 +896,6 @@ function up2k_init(have_crypto) {
st.busy.hash.push(t); st.busy.hash.push(t);
st.bytes.hashed += t.size; st.bytes.hashed += t.size;
t.bytes_uploaded = 0; t.bytes_uploaded = 0;
t.t1 = new Date().getTime();
var bpend = 0, var bpend = 0,
nchunk = 0, nchunk = 0,
@ -926,7 +932,9 @@ function up2k_init(have_crypto) {
} }
hash_calc(nch, e.target.result); hash_calc(nch, e.target.result);
}; };
reader.onerror = segm_err; reader.onerror = function () {
alert('y o u b r o k e i t\nerror: ' + reader.error);
};
reader.readAsArrayBuffer( reader.readAsArrayBuffer(
bobslice.call(t.fobj, car, cdr)); bobslice.call(t.fobj, car, cdr));
@ -937,8 +945,9 @@ function up2k_init(have_crypto) {
while (segm_next()); while (segm_next());
var hash_done = function (hashbuf) { var hash_done = function (hashbuf) {
var hslice = new Uint8Array(hashbuf).subarray(0, 32); var hslice = new Uint8Array(hashbuf).subarray(0, 32),
var b64str = buf2b64(hslice).replace(/=$/, ''); b64str = buf2b64(hslice).replace(/=$/, '');
hashtab[nch] = b64str; hashtab[nch] = b64str;
t.hash.push(nch); t.hash.push(nch);
pvis.hashed(t); pvis.hashed(t);
@ -974,10 +983,7 @@ function up2k_init(have_crypto) {
} }
}; };
var segm_err = function () { t.t1 = new Date().getTime();
alert('y o u b r o k e i t\nerror: ' + reader.error);
};
segm_next(); segm_next();
} }
@ -996,8 +1002,9 @@ function up2k_init(have_crypto) {
var response = JSON.parse(xhr.responseText); var response = JSON.parse(xhr.responseText);
if (!response.name) { if (!response.name) {
var msg = ''; var msg = '',
var smsg = ''; smsg = '';
if (!response || !response.hits || !response.hits.length) { if (!response || !response.hits || !response.hits.length) {
msg = 'not found on server'; msg = 'not found on server';
smsg = '404'; smsg = '404';
@ -1030,10 +1037,11 @@ function up2k_init(have_crypto) {
pvis.seth(t.n, 0, linksplit(esc(t.purl + t.name)).join(' ')); pvis.seth(t.n, 0, linksplit(esc(t.purl + t.name)).join(' '));
} }
var chunksize = get_chunksize(t.size); var chunksize = get_chunksize(t.size),
var cdr_idx = Math.ceil(t.size / chunksize) - 1; cdr_idx = Math.ceil(t.size / chunksize) - 1,
var cdr_sz = (t.size % chunksize) || chunksize; cdr_sz = (t.size % chunksize) || chunksize,
var cbd = []; cbd = [];
for (var a = 0; a <= cdr_idx; a++) { for (var a = 0; a <= cdr_idx; a++) {
cbd.push(a == cdr_idx ? cdr_sz : chunksize); cbd.push(a == cdr_idx ? cdr_sz : chunksize);
} }
@ -1054,8 +1062,9 @@ function up2k_init(have_crypto) {
pvis.setat(t.n, cbd); pvis.setat(t.n, cbd);
pvis.prog(t, 0, cbd[0]); pvis.prog(t, 0, cbd[0]);
var done = true; var done = true,
var msg = '&#x1f3b7;&#x1f41b;'; msg = '&#x1f3b7;&#x1f41b;';
if (t.postlist.length > 0) { if (t.postlist.length > 0) {
for (var a = 0; a < t.postlist.length; a++) for (var a = 0; a < t.postlist.length; a++)
st.todo.upload.push({ st.todo.upload.push({
@ -1072,10 +1081,12 @@ function up2k_init(have_crypto) {
if (done) { if (done) {
t.done = true; t.done = true;
st.bytes.uploaded += t.size - t.bytes_uploaded; st.bytes.uploaded += t.size - t.bytes_uploaded;
var spd1 = (t.size / ((t.t2 - t.t1) / 1000.)) / (1024 * 1024.); var spd1 = (t.size / ((t.t2 - t.t1) / 1000.)) / (1024 * 1024.),
var spd2 = (t.size / ((t.t4 - t.t3) / 1000.)) / (1024 * 1024.); spd2 = (t.size / ((t.t4 - t.t3) / 1000.)) / (1024 * 1024.);
pvis.seth(t.n, 2, 'hash {0}, up {1} MB/s'.format( pvis.seth(t.n, 2, 'hash {0}, up {1} MB/s'.format(
spd1.toFixed(2), spd2.toFixed(2))); spd1.toFixed(2), spd2.toFixed(2)));
pvis.move(t.n, 'ok'); pvis.move(t.n, 'ok');
} }
else t.t4 = undefined; else t.t4 = undefined;
@ -1142,16 +1153,18 @@ function up2k_init(have_crypto) {
var upt = st.todo.upload.shift(); var upt = st.todo.upload.shift();
st.busy.upload.push(upt); st.busy.upload.push(upt);
var npart = upt.npart; var npart = upt.npart,
var t = st.files[upt.nfile]; t = st.files[upt.nfile];
if (!t.t3) if (!t.t3)
t.t3 = new Date().getTime(); t.t3 = new Date().getTime();
pvis.seth(t.n, 1, "🚀 send"); pvis.seth(t.n, 1, "🚀 send");
var chunksize = get_chunksize(t.size); var chunksize = get_chunksize(t.size),
var car = npart * chunksize; car = npart * chunksize,
var cdr = car + chunksize; cdr = car + chunksize;
if (cdr >= t.size) if (cdr >= t.size)
cdr = t.size; cdr = t.size;
@ -1216,10 +1229,10 @@ function up2k_init(have_crypto) {
onresize(); onresize();
function desc_show(e) { function desc_show(e) {
var msg = this.getAttribute('alt'); var msg = this.getAttribute('alt'),
msg = msg.replace(/\$N/g, "<br />"); cdesc = ebi('u2cdesc');
var cdesc = ebi('u2cdesc');
cdesc.innerHTML = msg; cdesc.innerHTML = msg.replace(/\$N/g, "<br />");
cdesc.setAttribute('class', 'show'); cdesc.setAttribute('class', 'show');
} }
function desc_hide(e) { function desc_hide(e) {
@ -1283,8 +1296,8 @@ function up2k_init(have_crypto) {
} }
function set_fsearch(new_state) { function set_fsearch(new_state) {
var perms = document.body.getAttribute('perms'); var perms = document.body.getAttribute('perms'),
var read_only = false; read_only = false;
if (!ebi('fsearch')) { if (!ebi('fsearch')) {
new_state = false; new_state = false;
@ -1305,11 +1318,11 @@ function up2k_init(have_crypto) {
catch (ex) { } catch (ex) { }
try { try {
var fun = fsearch ? 'add' : 'remove'; var fun = fsearch ? 'add' : 'remove',
ebi('op_up2k').classList[fun]('srch'); ico = fsearch ? '🔎' : '🚀',
desc = fsearch ? 'Search' : 'Upload';
var ico = fsearch ? '🔎' : '🚀'; ebi('op_up2k').classList[fun]('srch');
var desc = fsearch ? 'Search' : 'Upload';
ebi('u2bm').innerHTML = ico + ' <sup>' + desc + '</sup>'; ebi('u2bm').innerHTML = ico + ' <sup>' + desc + '</sup>';
} }
catch (ex) { } catch (ex) { }

3
copyparty/web/util.js
View file

@ -6,7 +6,8 @@ if (!window['console'])
}; };
var clickev = window.Touch ? 'touchstart' : 'click'; var clickev = window.Touch ? 'touchstart' : 'click',
ANDROID = /(android)/i.test(navigator.userAgent);
// error handler for mobile devices // error handler for mobile devices