From f5fc44629543a68b2995830ebb39e78259552c3c Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Sun, 2 Oct 2022 00:31:01 +0000 Subject: [PATCH] refactor: use map_or_else --- src/app_data/mod.rs | 12 +++++------ src/docker_data/mod.rs | 5 ++--- src/input_handler/mod.rs | 2 +- src/ui/draw_blocks.rs | 44 ++++++++++++++++++++-------------------- src/ui/mod.rs | 8 +++++++- 5 files changed, 38 insertions(+), 33 deletions(-) diff --git a/src/app_data/mod.rs b/src/app_data/mod.rs index e99b0a7..322bbae 100644 --- a/src/app_data/mod.rs +++ b/src/app_data/mod.rs @@ -66,12 +66,12 @@ impl AppData { pub fn set_sorted(&mut self, x: Option<(Header, SortedOrder)>) { self.sorted_by = x; self.sort_containers(); - self.containers.state.select( - self.containers - .items - .iter() - .position(|i| Some(i.id.clone()) == self.get_selected_container_id()), - ); + self.containers + .state + .select(self.containers.items.iter().position(|i| { + self.get_selected_container_id() + .map_or_else(|| false, |id| i.id == id) + })); } /// Generate a default app_state pub fn default(args: CliArgs) -> Self { diff --git a/src/docker_data/mod.rs b/src/docker_data/mod.rs index 6744f4a..a648abf 100644 --- a/src/docker_data/mod.rs +++ b/src/docker_data/mod.rs @@ -78,9 +78,8 @@ impl DockerData { .cpu_stats .cpu_usage .percpu_usage - .clone() - .unwrap_or_default() - .len() as u64 + .as_ref() + .map_or_else(|| 0, |i| i.len()) as u64 }) as f64; if system_delta > 0.0 && cpu_delta > 0.0 { cpu_percentage = (cpu_delta / system_delta) * online_cpus * 100.0; diff --git a/src/input_handler/mod.rs b/src/input_handler/mod.rs index abbaf3d..91f2418 100644 --- a/src/input_handler/mod.rs +++ b/src/input_handler/mod.rs @@ -137,7 +137,7 @@ impl InputHandler { } /// Handle any keyboard button events - #[allow(clippy::too_many_lines)] + #[allow(clippy::too_many_lines)] async fn button_press(&mut self, key_code: KeyCode) { let show_error = self.app_data.lock().show_error; let show_info = self.gui_state.lock().show_help; diff --git a/src/ui/draw_blocks.rs b/src/ui/draw_blocks.rs index 7532f6c..ee5304e 100644 --- a/src/ui/draw_blocks.rs +++ b/src/ui/draw_blocks.rs @@ -443,7 +443,10 @@ pub fn heading_bar( let column_width = usize::from(area.width) - info_width; let column_width = if column_width > 0 { column_width } else { 1 }; let splits = if has_containers { - vec![Constraint::Min(column_width.try_into().unwrap_or_default()), Constraint::Min(info_width.try_into().unwrap_or_default())] + vec![ + Constraint::Min(column_width.try_into().unwrap_or_default()), + Constraint::Min(info_width.try_into().unwrap_or_default()), + ] } else { vec![Constraint::Percentage(100)] }; @@ -541,19 +544,20 @@ pub fn help_box(f: &mut Frame<'_, B>) { .border_type(BorderType::Rounded) .border_style(Style::default().fg(Color::Black)); - let area = popup( - lines, - max_line_width, - f.size(), - BoxLocation::MiddleCentre, - ); + let area = popup(lines, max_line_width, f.size(), BoxLocation::MiddleCentre); let split_popup = Layout::default() .direction(Direction::Vertical) .constraints( [ Constraint::Max(NAME_TEXT.lines().count().try_into().unwrap_or_default()), - Constraint::Max(description_text.lines().count().try_into().unwrap_or_default()), + Constraint::Max( + description_text + .lines() + .count() + .try_into() + .unwrap_or_default(), + ), Constraint::Max(help_text.lines().count().try_into().unwrap_or_default()), ] .as_ref(), @@ -605,12 +609,7 @@ pub fn error(f: &mut Frame<'_, B>, error: AppError, seconds: Option< .block(block) .alignment(Alignment::Center); - let area = popup( - lines, - max_line_width, - f.size(), - BoxLocation::MiddleCentre, - ); + let area = popup(lines, max_line_width, f.size(), BoxLocation::MiddleCentre); f.render_widget(Clear, area); f.render_widget(paragraph, area); } @@ -634,12 +633,7 @@ pub fn info(f: &mut Frame<'_, B>, text: String) { .block(block) .alignment(Alignment::Center); - let area = popup( - lines, - max_line_width, - f.size(), - BoxLocation::BottomRight, - ); + let area = popup(lines, max_line_width, f.size(), BoxLocation::BottomRight); f.render_widget(Clear, area); f.render_widget(paragraph, area); } @@ -658,8 +652,14 @@ fn popup(text_lines: usize, text_width: usize, r: Rect, box_location: BoxLocatio 1 }; - let v_constraints = box_location.get_vertical_constraints(blank_vertical.try_into().unwrap_or_default(), text_lines.try_into().unwrap_or_default()); - let h_constraints = box_location.get_horizontal_constraints(blank_horizontal.try_into().unwrap_or_default(), text_width.try_into().unwrap_or_default()); + let v_constraints = box_location.get_vertical_constraints( + blank_vertical.try_into().unwrap_or_default(), + text_lines.try_into().unwrap_or_default(), + ); + let h_constraints = box_location.get_horizontal_constraints( + blank_horizontal.try_into().unwrap_or_default(), + text_width.try_into().unwrap_or_default(), + ); let indexes = box_location.get_indexes(); diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 257a70e..b126dbd 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -168,7 +168,13 @@ fn ui( // Split into 3, containers+controls, logs, then graphs let upper_main = Layout::default() .direction(Direction::Vertical) - .constraints([Constraint::Max(height.try_into().unwrap_or_default()), Constraint::Percentage(50)].as_ref()) + .constraints( + [ + Constraint::Max(height.try_into().unwrap_or_default()), + Constraint::Percentage(50), + ] + .as_ref(), + ) .split(whole_layout[1]); let top_split = if has_containers {