feat: use gui_status for various gui states

src/ui/draw_blocks.rs

@@ -216,43 +216,36 @@ pub fn logs<B: Backend>(
     loading_icon: &str,
 ) {
     let block = generate_block(app_data, area, gui_state, SelectablePanel::Logs);
-    let status = gui_state.lock().get_status();
-    match status {
-        Status::Init => {
-            let paragraph = Paragraph::new(format!("parsing logs {}", loading_icon))
-                .style(Style::default())
-                .block(block)
-                .alignment(Alignment::Center);
-            f.render_widget(paragraph, area);
-        }
+    let contains_init = gui_state.lock().status_contains(&[Status::Init]);
+    if contains_init {
+        let paragraph = Paragraph::new(format!("parsing logs {}", loading_icon))
+            .style(Style::default())
+            .block(block)
+            .alignment(Alignment::Center);
+        f.render_widget(paragraph, area);
+    } else if let Some(index) = index {
+        let items = app_data.lock().containers.items[index]
+            .logs
+            .items
+            .iter()
+            .enumerate()
+            .map(|i| i.1.clone())
+            .collect::<Vec<_>>();
 
-        _ => {
-            if let Some(index) = index {
-                let items = app_data.lock().containers.items[index]
-                    .logs
-                    .items
-                    .iter()
-                    .enumerate()
-                    .map(|i| i.1.clone())
-                    .collect::<Vec<_>>();
-
-                let items = List::new(items)
-                    .block(block)
-                    .highlight_symbol(ARROW)
-                    .highlight_style(Style::default().add_modifier(Modifier::BOLD));
-                f.render_stateful_widget(
-                    items,
-                    area,
-                    &mut app_data.lock().containers.items[index].logs.state,
-                );
-            } else {
-                let paragraph = Paragraph::new("no logs found")
-                    .block(block)
-                    .alignment(Alignment::Center);
-                f.render_widget(paragraph, area);
-                // }
-            }
-        }
+        let items = List::new(items)
+            .block(block)
+            .highlight_symbol(ARROW)
+            .highlight_style(Style::default().add_modifier(Modifier::BOLD));
+        f.render_stateful_widget(
+            items,
+            area,
+            &mut app_data.lock().containers.items[index].logs.state,
+        );
+    } else {
+        let paragraph = Paragraph::new("no logs found")
+            .block(block)
+            .alignment(Alignment::Center);
+        f.render_widget(paragraph, area);
     }
 }
 
@@ -356,7 +349,7 @@ pub fn heading_bar<B: Backend>(
     gui_state: &Arc<Mutex<GuiState>>,
 ) {
     let block = |fg: Color| Block::default().style(Style::default().bg(Color::Magenta).fg(fg));
-    let info_visible = gui_state.lock().get_status() == Status::Help;
+    let help_visible = gui_state.lock().status_contains(&[Status::Help]);
 
     f.render_widget(block(Color::Black), area);
 
@@ -436,13 +429,8 @@ pub fn heading_bar<B: Backend>(
         })
         .collect::<Vec<_>>();
 
-    let suffix = if info_visible { "exit" } else { "show" };
-    let info_text = format!(
-        "( h ) {} help {} {:?}",
-        suffix,
-        MARGIN,
-        gui_state.lock().get_status()
-    );
+    let suffix = if help_visible { "exit" } else { "show" };
+    let info_text = format!("( h ) {} help {}", suffix, MARGIN,);
     let info_width = info_text.chars().count();
 
     let column_width = usize::from(area.width) - info_width;
@@ -484,10 +472,10 @@ pub fn heading_bar<B: Backend>(
     }
 
     // show/hide help
-    let color = if info_visible {
-        Color::White
-    } else {
+    let color = if help_visible {
         Color::Black
+    } else {
+        Color::White
     };
     let help_paragraph = Paragraph::new(info_text)
         .block(block(color))

src/ui/gui_state.rs

@@ -181,7 +181,6 @@ pub enum Status {
     Help,
     DockerConnect,
     Error,
-    Normal,
 }
 
 /// Global gui_state, stored in an Arc<Mutex>
@@ -191,7 +190,7 @@ pub struct GuiState {
     heading_map: HashMap<Header, Rect>,
     loading_icon: Loading,
     is_loading: HashSet<Uuid>,
-    status: Status,
+    status: HashSet<Status>,
     pub selected_panel: SelectablePanel,
     pub info_box_text: Option<String>,
 }
@@ -205,7 +204,7 @@ impl GuiState {
             selected_panel: SelectablePanel::Containers,
             is_loading: HashSet::new(),
             info_box_text: None,
-            status: Status::Init,
+            status: HashSet::new(),
         }
     }
 
@@ -253,12 +252,16 @@ impl GuiState {
         };
     }
 
-    pub fn set_status(&mut self, status: Status) {
-        self.status = status
+    pub fn status_push(&mut self, status: Status) {
+        self.status.insert(status);
     }
 
-    pub fn get_status(&self) -> Status {
-        self.status
+    pub fn status_del(&mut self, status: Status) {
+        self.status.remove(&status);
+    }
+
+    pub fn status_contains(&self, status: &[Status]) -> bool {
+        status.iter().any(|i| self.status.contains(i))
     }
 
     /// Change to next selectable panel

src/ui/mod.rs

@@ -85,9 +85,9 @@ async fn run_app<B: Backend + Send>(
     let input_poll_rate = std::time::Duration::from_millis(75);
 
     // Check for docker connect errors before attempting to draw the gui
-    let status = gui_state.lock().get_status();
+    let status_dockerconnect = gui_state.lock().status_contains(&[Status::DockerConnect]);
 
-    if status == Status::DockerConnect {
+    if status_dockerconnect {
         let mut seconds = 5;
         loop {
             if seconds < 1 {
@@ -159,7 +159,7 @@ fn ui<B: Backend>(
     let log_index = app_data.lock().get_selected_log_index();
     let sorted_by = app_data.lock().get_sorted();
 
-    let show_help = gui_state.lock().get_status() == Status::Help;
+    let show_help = gui_state.lock().status_contains(&[Status::Help]);
     let info_text = gui_state.lock().info_box_text.clone();
     let loading_icon = gui_state.lock().get_loading();