mirror of
https://github.com/9001/copyparty.git
synced 2025-08-17 09:02:15 -06:00
cosmetic eta improvements:
* u2c: strip hh:mm:ss past 30 days * u2js: fix "infini.ty" in elapsed-times
This commit is contained in:
parent
520ac8f4dc
commit
b10843d051
|
@ -1090,6 +1090,8 @@ class Ctl(object):
|
||||||
|
|
||||||
spd = humansize(spd)
|
spd = humansize(spd)
|
||||||
self.eta = str(datetime.timedelta(seconds=int(eta)))
|
self.eta = str(datetime.timedelta(seconds=int(eta)))
|
||||||
|
if eta > 2591999:
|
||||||
|
self.eta = self.eta.split(",")[0] # truncate HH:MM:SS
|
||||||
sleft = humansize(self.nbytes - self.up_b)
|
sleft = humansize(self.nbytes - self.up_b)
|
||||||
nleft = self.nfiles - self.up_f
|
nleft = self.nfiles - self.up_f
|
||||||
tail = "\033[K\033[u" if VT100 and not self.ar.ns else "\r"
|
tail = "\033[K\033[u" if VT100 and not self.ar.ns else "\r"
|
||||||
|
|
|
@ -881,6 +881,8 @@ if (window.Number && Number.isFinite)
|
||||||
|
|
||||||
function f2f(val, nd) {
|
function f2f(val, nd) {
|
||||||
// 10.toFixed(1) returns 10.00 for certain values of 10
|
// 10.toFixed(1) returns 10.00 for certain values of 10
|
||||||
|
if (!isNum(val))
|
||||||
|
val = 999;
|
||||||
val = (val * Math.pow(10, nd)).toFixed(0).split('.')[0];
|
val = (val * Math.pow(10, nd)).toFixed(0).split('.')[0];
|
||||||
return nd ? (val.slice(0, -nd) || '0') + '.' + val.slice(-nd) : val;
|
return nd ? (val.slice(0, -nd) || '0') + '.' + val.slice(-nd) : val;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue