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

condense uploads listing on view change

Browse source
This commit is contained in:
ed 2023-02-14 21:58:15 +00:00
parent 8adfcf5950
commit 6eba9feffe
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
copyparty/httpcli.py
View file

@ -1421,7 +1421,7 @@ class HttpCli(object):
self.log(t, 1) self.log(t, 1)
raise Pebkac(403, t) raise Pebkac(403, t)
if is_put and not self.args.no_dav: if is_put and not (self.args.no_dav or self.args.nw):
# allow overwrite if... # allow overwrite if...
# * volflag 'daw' is set # * volflag 'daw' is set
# * and account has delete-access # * and account has delete-access

1
copyparty/up2k.py
View file

@ -2269,6 +2269,7 @@ class Up2k(object):
if ( if (
not ret["hash"] not ret["hash"]
and "fk" in vfs.flags and "fk" in vfs.flags
and not self.args.nw
and (cj["user"] in vfs.axs.uread or cj["user"] in vfs.axs.upget) and (cj["user"] in vfs.axs.uread or cj["user"] in vfs.axs.upget)
): ):
ap = absreal(djoin(job["ptop"], job["prel"], job["name"])) ap = absreal(djoin(job["ptop"], job["prel"], job["name"]))

8
copyparty/web/up2k.js
View file

@ -1452,7 +1452,7 @@ function up2k_init(subtle) {
}); });
}; };
var etaref = 0, etaskip = 0, utw_minh = 0, utw_read = 0; var etaref = 0, etaskip = 0, utw_minh = 0, utw_read = 0, utw_card = 0;
function etafun() { function etafun() {
var nhash = st.busy.head.length + st.busy.hash.length + st.todo.head.length + st.todo.hash.length, var nhash = st.busy.head.length + st.busy.hash.length + st.todo.head.length + st.todo.hash.length,
nsend = st.busy.upload.length + st.todo.upload.length, nsend = st.busy.upload.length + st.todo.upload.length,
@ -1465,6 +1465,12 @@ function up2k_init(subtle) {
//ebi('acc_info').innerHTML = humantime(st.time.busy) + ' ' + f2f(now / 1000, 1); //ebi('acc_info').innerHTML = humantime(st.time.busy) + ' ' + f2f(now / 1000, 1);
if (utw_card != pvis.act) {
utw_card = pvis.act;
utw_read = 9001;
ebi('u2tabw').style.minHeight = '0px';
}
if (++utw_read >= 20) { if (++utw_read >= 20) {
utw_read = 0; utw_read = 0;
utw_minh = parseInt(ebi('u2tabw').style.minHeight || '0'); utw_minh = parseInt(ebi('u2tabw').style.minHeight || '0');