mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-21 01:32:10 +01:00
Code

Hide progressbar.Bar widget after ProgressBar has completed

Browse Source
This commit is contained in:
Daniel Mach 2024-11-11 16:52:46 +01:00
parent 0638bd08cf
commit 531753b2e5
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osc/meter.py
View File

@ -37,14 +37,14 @@ class PBTextMeter(TextMeterBase):
def start(self, basename: str, size: Optional[int] = None): def start(self, basename: str, size: Optional[int] = None):
if size is None: if size is None:
widgets = [f"{basename}: ", pb.AnimatedMarker(), ' ', pb.Timer()] widgets = [f"{basename} ", pb.AnimatedMarker(), ' ', pb.Timer()]
self.bar = pb.ProgressBar(widgets=widgets, maxval=pb.UnknownLength) self.bar = pb.ProgressBar(widgets=widgets, maxval=pb.UnknownLength)
else: else:
widgets = [f"{basename}: ", pb.Bar(), ' ', pb.ETA()] widgets = [f"{basename} ", pb.Bar(), ' ', pb.ETA()]
if size: if size:
# if size is 0, using pb.Percentage will result in # if size is 0, using pb.Percentage will result in
# a ZeroDivisionException # a ZeroDivisionException
widgets.insert(1, pb.Percentage()) widgets[3:3] = [pb.Percentage(), " "]
self.bar = pb.ProgressBar(widgets=widgets, maxval=size) self.bar = pb.ProgressBar(widgets=widgets, maxval=size)
# When a signal handler is set, it resets SA_RESTART flag # When a signal handler is set, it resets SA_RESTART flag
# - see signal.siginterrupt() python docs. # - see signal.siginterrupt() python docs.
@ -57,6 +57,15 @@ class PBTextMeter(TextMeterBase):
self.bar.update(amount_read) self.bar.update(amount_read)
def end(self): def end(self):
# replace marker (ticks) and left+right borders of the bar with spaces
# to hide it from output after completion
for i in self.bar.widgets:
if not isinstance(i, pb.Bar):
continue
i.marker = " "
i.left = " "
i.right = " "
self.bar.finish() self.bar.finish()