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

fix other possible division-by-zeros;

Browse source 
u2c: also fix exe detection
This commit is contained in:
ed 2024-02-17 23:19:11 +00:00
parent 6bd087ddc5
commit fd552842d4
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bin/u2c.py
View file

@ -1,8 +1,8 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from __future__ import print_function, unicode_literals from __future__ import print_function, unicode_literals
S_VERSION = "1.14" S_VERSION = "1.15"
S_BUILD_DT = "2024-01-27" S_BUILD_DT = "2024-02-18"
""" """
u2c.py: upload to copyparty u2c.py: upload to copyparty
@ -29,7 +29,7 @@ import platform
import threading import threading
import datetime import datetime
EXE = sys.executable.endswith("exe") EXE = bool(getattr(sys, "frozen", False))
try: try:
import argparse import argparse
@ -846,12 +846,12 @@ class Ctl(object):
txt = " " txt = " "
if not self.up_br: if not self.up_br:
spd = self.hash_b / (time.time() - self.t0) spd = self.hash_b / ((time.time() - self.t0) or 1)
eta = (self.nbytes - self.hash_b) / (spd + 1) eta = (self.nbytes - self.hash_b) / (spd or 1)
else: else:
spd = self.up_br / (time.time() - self.t0_up) spd = self.up_br / ((time.time() - self.t0_up) or 1)
spd = self.spd = (self.spd or spd) * 0.9 + spd * 0.1 spd = self.spd = (self.spd or spd) * 0.9 + spd * 0.1
eta = (self.nbytes - self.up_b) / (spd + 1) eta = (self.nbytes - self.up_b) / (spd or 1)
spd = humansize(spd) spd = humansize(spd)
self.eta = str(datetime.timedelta(seconds=int(eta))) self.eta = str(datetime.timedelta(seconds=int(eta)))

2
copyparty/authsrv.py
View file

@ -193,7 +193,7 @@ class Lim(object):
self.dft = int(time.time()) + 300 self.dft = int(time.time()) + 300
self.dfv = get_df(abspath)[0] or 0 self.dfv = get_df(abspath)[0] or 0
for j in list(self.reg.values()) if self.reg else []: for j in list(self.reg.values()) if self.reg else []:
self.dfv -= int(j["size"] / len(j["hash"]) * len(j["need"])) self.dfv -= int(j["size"] / (len(j["hash"]) or 999) * len(j["need"]))
if already_written: if already_written:
sz = 0 sz = 0

2
copyparty/up2k.py
View file

@ -552,7 +552,7 @@ class Up2k(object):
runihook(self.log, cmd, vol, ups) runihook(self.log, cmd, vol, ups)
def _vis_job_progress(self, job: dict[str, Any]) -> str: def _vis_job_progress(self, job: dict[str, Any]) -> str:
perc = 100 - (len(job["need"]) * 100.0 / len(job["hash"])) perc = 100 - (len(job["need"]) * 100.0 / (len(job["hash"]) or 1))
path = djoin(job["ptop"], job["prel"], job["name"]) path = djoin(job["ptop"], job["prel"], job["name"])
return "{:5.1f}% {}".format(perc, path) return "{:5.1f}% {}".format(perc, path)

2
copyparty/util.py
View file

@ -1768,7 +1768,7 @@ def get_spd(nbyte: int, t0: float, t: Optional[float] = None) -> str:
if t is None: if t is None:
t = time.time() t = time.time()
bps = nbyte / ((t - t0) + 0.001) bps = nbyte / ((t - t0) or 0.001)
s1 = humansize(nbyte).replace(" ", "\033[33m").replace("iB", "") s1 = humansize(nbyte).replace(" ", "\033[33m").replace("iB", "")
s2 = humansize(bps).replace(" ", "\033[35m").replace("iB", "") s2 = humansize(bps).replace(" ", "\033[35m").replace("iB", "")
return "%s \033[0m%s/s\033[0m" % (s1, s2) return "%s \033[0m%s/s\033[0m" % (s1, s2)