mirror/gibMacOS
1
0
Fork 0
mirror of https://github.com/corpnewt/gibMacOS.git synced 2024-09-20 01:30:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Calculate time remaining, consider the last 1024 packets

Browse source
This commit is contained in:
CorpNewt 2024-07-14 14:11:01 -05:00 committed by GitHub
parent e66df57739
commit 32aef451de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Scripts/downloader.py
View file

@ -81,7 +81,7 @@ class Downloader:
return "{:,}{} {}".format(int(a),"" if not b else "."+b,biggest) return "{:,}{} {}".format(int(a),"" if not b else "."+b,biggest)
def _progress_hook(self, bytes_so_far, total_size, packets=None): def _progress_hook(self, bytes_so_far, total_size, packets=None):
speed = "" speed = remaining = ""
if packets: if packets:
speed = " | ?? B/s" speed = " | ?? B/s"
if len(packets) > 1: if len(packets) > 1:
@ -91,7 +91,24 @@ class Downloader:
chunks = sum([float(x[1]) for x in packets]) chunks = sum([float(x[1]) for x in packets])
t = last-first t = last-first
assert t >= 0 assert t >= 0
speed = " | {}/s".format(self.get_size(1./t*chunks,round_to=1)) bytes_speed = 1. / t * chunks
speed = " | {}/s".format(self.get_size(bytes_speed,round_to=1))
# Get our remaining time
if total_size > 0:
seconds_left = (total_size-bytes_so_far) / bytes_speed
days = seconds_left // 86400
hours = (seconds_left - (days*86400)) // 3600
mins = (seconds_left - (days*86400) - (hours*3600)) // 60
secs = seconds_left - (days*86400) - (hours*3600) - (mins*60)
if days > 99 or bytes_speed == 0:
remaining = " | ?? left"
else:
remaining = " | {}{:02d}:{:02d}:{:02d} left".format(
"{}:".format(int(days)) if days else "",
int(hours),
int(mins),
round(secs)
)
except: except:
pass pass
if total_size > 0: if total_size > 0:
@ -103,13 +120,14 @@ class Downloader:
perc_str = " {:.2f}%".format(percent) perc_str = " {:.2f}%".format(percent)
bar_width = (TERMINAL_WIDTH // 3)-len(perc_str) bar_width = (TERMINAL_WIDTH // 3)-len(perc_str)
progress = "=" * int(bar_width * (percent/100)) progress = "=" * int(bar_width * (percent/100))
sys.stdout.write("\r\033[K{}/{} | {}{}{}{}".format( sys.stdout.write("\r\033[K{}/{} | {}{}{}{}{}".format(
b_s, b_s,
t_s, t_s,
progress, progress,
" " * (bar_width-len(progress)), " " * (bar_width-len(progress)),
perc_str, perc_str,
speed speed,
remaining
)) ))
else: else:
b_s = self.get_size(bytes_so_far) b_s = self.get_size(bytes_so_far)
@ -133,7 +151,7 @@ class Downloader:
bytes_so_far += len(chunk) bytes_so_far += len(chunk)
if progress: if progress:
packets.append((time.time(),len(chunk))) packets.append((time.time(),len(chunk)))
packets = packets[-50:] # Limit to 25 total packets = packets[-1024:]
self._progress_hook(bytes_so_far,total_size,packets=packets) self._progress_hook(bytes_so_far,total_size,packets=packets)
if not chunk: break if not chunk: break
chunk_so_far += chunk chunk_so_far += chunk
@ -157,7 +175,7 @@ class Downloader:
bytes_so_far += len(chunk) bytes_so_far += len(chunk)
if progress: if progress:
packets.append((time.time(),len(chunk))) packets.append((time.time(),len(chunk)))
packets = packets[-25:] # Limit to 25 total packets = packets[-1024:]
self._progress_hook(bytes_so_far,total_size,packets=packets) self._progress_hook(bytes_so_far,total_size,packets=packets)
if not chunk: break if not chunk: break
f.write(chunk) f.write(chunk)