pinetime/wasp-os
1
0
Fork 0
Code Activity

wasptool: Fix progress bar numbering

Browse source 
Currently direct callers of draw_pbar() can have 20 or more digits after
the decimal place. Fix this by moving the rounding function.

Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
This commit is contained in:
Daniel Thompson 2021-05-05 21:02:16 +01:00
parent 69a989b97e
commit 3bbd808115
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/wasptool
View file

@ -18,13 +18,13 @@ def draw_pbar(percent, quiet=False, end='\r'):
if percent > 100: if percent > 100:
percent = 100 percent = 100
bar = int(percent) // 2 bar = int(percent) // 2
print(f'[{"#"*bar}{"."*(50-bar)}] {percent}% ', end=end, flush=True) print(f'[{"#"*bar}{"."*(50-bar)}] {round(percent, 1)}% ', end=end, flush=True)
def pbar(iterable, quiet=False): def pbar(iterable, quiet=False):
step = 100 / len(iterable) step = 100 / len(iterable)
for i, v in enumerate(iterable): for i, v in enumerate(iterable):
draw_pbar(round(step * i, 1), quiet) draw_pbar(step * i, quiet)
yield v yield v
if not quiet: if not quiet:
draw_pbar(100, quiet, None) draw_pbar(100, quiet, None)
@ -264,7 +264,6 @@ def handle_binary_download(c, tname, fname):
elif reply.startswith("'"): elif reply.startswith("'"):
# 'b\'..CONTENT..\'' # 'b\'..CONTENT..\''
reply = reply[1:-1].replace("\\'", "'") reply = reply[1:-1].replace("\\'", "'")
data = print(reply)
data = eval(reply) data = eval(reply)
if len(data) == 0: if len(data) == 0:
break break