mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 09:02:15 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

v0.11.33

Browse source
This commit is contained in:
ed 2021-07-07 10:45:47 +02:00
parent 4121266678
commit d7d625be2a
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
copyparty/__version__.py
View file

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

35
copyparty/web/up2k.js
View file

@ -413,6 +413,10 @@ function U2pvis(act, btns) {
} }
} }
} }
if (this.head < 0)
this.head = 0;
if (card == "bz") { if (card == "bz") {
for (var a = this.head - 1; a >= this.head - this.wsz && a >= 0; a--) { for (var a = this.head - 1; a >= this.head - this.wsz && a >= 0; a--) {
html.unshift(this.genrow(a, true).replace(/><td>/, "><td>a ")); html.unshift(this.genrow(a, true).replace(/><td>/, "><td>a "));
@ -864,20 +868,27 @@ function up2k_init(subtle) {
if (!st.todo.handshake.length) if (!st.todo.handshake.length)
return true; return true;
var cd = st.todo.handshake[0].cooldown; var t = st.todo.handshake[0],
cd = t.cooldown;
if (cd && cd - Date.now() > 0) if (cd && cd - Date.now() > 0)
return false; return false;
// keepalive or verify // keepalive or verify
if (st.todo.handshake[0].keepalive || if (t.keepalive ||
st.todo.handshake[0].t_uploaded) t.t_uploaded)
return true; return true;
if (parallel_uploads < if (parallel_uploads <
st.busy.handshake.length) st.busy.handshake.length)
return false; return false;
if ((multitask ? parallel_uploads : 0) < if (st.busy.handshake.length)
for (var n = t.n - 1; n >= t.n - parallel_uploads && n >= 0; n--)
if (st.files[n].t_uploading)
return false;
if ((multitask ? 1 : 0) <
st.todo.upload.length + st.todo.upload.length +
st.busy.upload.length) st.busy.upload.length)
return false; return false;
@ -1629,15 +1640,20 @@ function up2k_init(subtle) {
} }
function draw_turbo() { function draw_turbo() {
var msg = '<p class="warn">WARNING: turbo enabled, <span>&nbsp;client may not detect and resume incomplete uploads; see turbo-button tooltip</span></p>', var msgu = '<p class="warn">WARNING: turbo enabled, <span>&nbsp;client may not detect and resume incomplete uploads; see turbo-button tooltip</span></p>',
html = ebi('u2foot').innerHTML; msgs = '<p class="warn">WARNING: turbo enabled, <span>&nbsp;search may give false-positives; see turbo-button tooltip</span></p>',
msg = fsearch ? msgs : msgu,
omsg = fsearch ? msgu : msgs,
html = ebi('u2foot').innerHTML,
ohtml = html;
if (turbo && html.indexOf(msg) === -1) if (turbo && html.indexOf(msg) === -1)
html += msg; html = html.replace(omsg, '') + msg;
else if (!turbo) else if (!turbo)
html = html.replace(msg, ''); html = html.replace(msgu, '').replace(msgs, '');
ebi('u2foot').innerHTML = html; if (html !== ohtml)
ebi('u2foot').innerHTML = html;
} }
draw_turbo(); draw_turbo();
@ -1678,6 +1694,7 @@ function up2k_init(subtle) {
} }
catch (ex) { } catch (ex) { }
draw_turbo();
onresize(); onresize();
} }