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

improve shumantime + use it everywhere

Browse source
This commit is contained in:
ed 2022-07-27 15:07:04 +02:00
parent e24ffebfc8
commit 77f624b01e
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
copyparty/up2k.py
View file

@ -231,7 +231,9 @@ class Up2k(object):
"hashq": self.n_hashq, "hashq": self.n_hashq,
"tagq": self.n_tagq, "tagq": self.n_tagq,
"mtpq": mtpq, "mtpq": mtpq,
"dbwt": min(1000 * 24 * 60 * 60 - 1, int(time.time() - self.db_act)), "dbwt": "{:.2f}".format(
min(1000 * 24 * 60 * 60 - 1, time.time() - self.db_act)
),
} }
return json.dumps(ret, indent=4) return json.dumps(ret, indent=4)

4
copyparty/web/up2k.js
View file

@ -679,8 +679,8 @@ function Donut(uc, st) {
} }
if (++r.tc >= 10) { if (++r.tc >= 10) {
wintitle("{0}%, {1}s, #{2}, ".format( wintitle("{0}%, {1}, #{2}, ".format(
f2f(v * 100 / t, 1), r.eta, st.files.length - st.nfile.upload), true); f2f(v * 100 / t, 1), shumantime(r.eta), st.files.length - st.nfile.upload), true);
r.tc = 0; r.tc = 0;
} }

15
copyparty/web/util.js
View file

@ -642,7 +642,7 @@ function humansize(b, terse) {
function humantime(v) { function humantime(v) {
if (v >= 60 * 60 * 24) if (v >= 60 * 60 * 24)
return v; return shumantime(v);
try { try {
return /.*(..:..:..).*/.exec(new Date(v * 1000).toUTCString())[1]; return /.*(..:..:..).*/.exec(new Date(v * 1000).toUTCString())[1];
@ -660,17 +660,18 @@ function shumantime(v) {
return f2f(v, 1) + 's'; return f2f(v, 1) + 's';
v = parseInt(v); v = parseInt(v);
var st = [[60 * 60 * 24, 'd'], [60 * 60, 'h'], [60, 'm']]; var st = [[60 * 60 * 24, 60 * 60, 'd'], [60 * 60, 60, 'h'], [60, 1, 'm']];
for (var a = 0; a < st.length; a++) { for (var a = 0; a < st.length; a++) {
var mod = st[a][0], var m1 = st[a][0],
ch = st[a][1]; m2 = st[a][1],
ch = st[a][2];
if (v < mod) if (v < m1)
continue; continue;
var v1 = parseInt(v / mod), var v1 = parseInt(v / m1),
v2 = ('0' + parseInt(v % mod)).slice(-2); v2 = ('0' + parseInt((v % m1) / m2)).slice(-2);
return v1 + ch + (v1 >= 10 ? '' : v2); return v1 + ch + (v1 >= 10 ? '' : v2);
} }