diff --git a/st_record.py b/st_record.py index 3bb0884..65f13ec 100644 --- a/st_record.py +++ b/st_record.py @@ -604,7 +604,7 @@ class TotalMaximumProgressUpdater: if value > self.maximum: self.maximum = value self.progress.update(self.progress_task, total=self.maximum) - self.progress.update(self.progress_task, completed=value) + self.progress.update(self.progress_task, completed=value, visible=True) def tui_record(packet_filter, vcd_sink, enable_verbose_trace): try: @@ -616,7 +616,7 @@ def tui_record(packet_filter, vcd_sink, enable_verbose_trace): from rich.align import Align except: print("error: TUI mode requires the rich package") - return + exit() if enable_verbose_trace: print("warning: verbose trace is not avaialble in TUI mode") @@ -628,18 +628,18 @@ def tui_record(packet_filter, vcd_sink, enable_verbose_trace): progress_colums = [ TextColumn("[progress.description]{task.description}"), - BarColumn(bar_width=80), + BarColumn(bar_width=80, complete_style="gold3", finished_style="red"), TaskProgressColumn(), MofNCompleteColumn() ] diag_progress = Progress(*progress_colums, transient=True, auto_refresh=False, refresh_per_second=1) - buffer_health = diag_progress.add_task("[green]Buffer Health", total=255) - buffer_items = diag_progress.add_task("[green]Buffer Items") - items_sent = diag_progress.add_task("[blue]Items Sent", total=1024) - render_time = diag_progress.add_task("[blue]Render Time", total=1024) - comp_lvl = diag_progress.add_task("[yellow]Compression Level", total=100) - comp_time = diag_progress.add_task("[yellow]Compression Time", total=100) + buffer_health = diag_progress.add_task("[green]Buffer Health", total=255, visible=False) + buffer_items = diag_progress.add_task("[green]Buffer Items", visible=False) + items_sent = diag_progress.add_task("[blue]Items Sent", total=1024, visible=False) + render_time = diag_progress.add_task("[blue]Render Time", total=1024, visible=False) + comp_lvl = diag_progress.add_task("[yellow]Compression Level", total=100, visible=False) + comp_time = diag_progress.add_task("[yellow]Compression Time", total=100, visible=False) buffer_items_tm = TotalMaximumProgressUpdater(diag_progress, buffer_items) items_sent_tm = TotalMaximumProgressUpdater(diag_progress, items_sent) @@ -647,10 +647,10 @@ def tui_record(packet_filter, vcd_sink, enable_verbose_trace): comp_time_tm = TotalMaximumProgressUpdater(diag_progress, comp_time) with Live(console=console, transient=True) as live_status: - vcd_sink.onvalue("ST.BufferHealth", lambda _,value,sub: diag_progress.update(buffer_health, completed=value)) + vcd_sink.onvalue("ST.BufferHealth", lambda _,value,sub: diag_progress.update(buffer_health, completed=value, visible=True)) vcd_sink.onvalue("ST.BufferItems", lambda _,value,sub: buffer_items_tm.update(value)) vcd_sink.onvalue("ST.ItemsSent", lambda _,value,sub: items_sent_tm.update(value)) - vcd_sink.onvalue("ST.CompressionLevel", lambda _,value,sub: diag_progress.update(comp_lvl, completed=value)) + vcd_sink.onvalue("ST.CompressionLevel", lambda _,value,sub: diag_progress.update(comp_lvl, completed=value, visible=True)) vcd_sink.onvalue("ST.CompressionTime", lambda _,value,sub: comp_time_tm.update(value)) vcd_sink.onvalue("ST.RenderTime", lambda _,value,sub: render_time_tm.update(value))