From dfc861cc0969dc494683c4485c51ac8a3f254660 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sat, 31 May 2025 14:41:38 -0700 Subject: [PATCH] Reset progress/results before BootScan --- boot_diags/src/app.rs | 4 ++++ boot_diags/src/components/progress.rs | 5 ++++- boot_diags/src/diags.rs | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/boot_diags/src/app.rs b/boot_diags/src/app.rs index 14e8e4f..a889e2e 100644 --- a/boot_diags/src/app.rs +++ b/boot_diags/src/app.rs @@ -529,6 +529,10 @@ impl App { } fn queue_boot_scan_tasks(&mut self) -> Result<()> { + self.diag_groups.reset(); + if let Ok(mut results) = self.results.lock() { + results.clear(); + } let disk_list = self.clone.disk_list.lock().unwrap(); if let Some(disk_index) = self.clone.disk_index_dest { if let Some(disk) = disk_list.get(disk_index) { diff --git a/boot_diags/src/components/progress.rs b/boot_diags/src/components/progress.rs index a008528..0366e78 100644 --- a/boot_diags/src/components/progress.rs +++ b/boot_diags/src/components/progress.rs @@ -96,7 +96,10 @@ impl Component for Progress { line.running = false; } } - Action::SetMode(mode) => self.mode = mode, + Action::SetMode(mode) => { + self.mode = mode; + self.lines.clear(); + } _ => {} }; Ok(None) diff --git a/boot_diags/src/diags.rs b/boot_diags/src/diags.rs index a035eee..32d6fb7 100644 --- a/boot_diags/src/diags.rs +++ b/boot_diags/src/diags.rs @@ -48,6 +48,11 @@ impl Groups { lines } + pub fn reset(&mut self) { + self.items.clear(); + self.order.clear(); + } + pub fn start(&mut self, title: String) { self.order.push(title.clone()); self.items.insert(