From 64d8c658316f85573af9a6b69c2061ee3bfcdca6 Mon Sep 17 00:00:00 2001 From: Alex Clarke Date: Wed, 7 Jan 2026 14:09:12 -0700 Subject: [PATCH] fix: Prevented additional empty slice errors in indexer tables --- src/models/mod.rs | 4 ---- src/models/model_tests.rs | 5 ----- src/ui/radarr_ui/indexers/test_all_indexers_ui.rs | 2 +- src/ui/radarr_ui/library/add_movie_ui.rs | 14 ++++++++------ src/ui/sonarr_ui/indexers/test_all_indexers_ui.rs | 2 +- src/ui/sonarr_ui/library/add_series_ui.rs | 14 ++++++++------ 6 files changed, 18 insertions(+), 23 deletions(-) diff --git a/src/models/mod.rs b/src/models/mod.rs index b887941..3eea7c3 100644 --- a/src/models/mod.rs +++ b/src/models/mod.rs @@ -272,10 +272,6 @@ impl HorizontallyScrollableText { } } } - - pub fn is_empty(&self) -> bool { - self.text.is_empty() - } } #[derive(Clone, PartialEq, Eq, Debug)] diff --git a/src/models/model_tests.rs b/src/models/model_tests.rs index 95b6dd8..1b8dc3e 100644 --- a/src/models/model_tests.rs +++ b/src/models/model_tests.rs @@ -176,11 +176,6 @@ mod tests { assert_str_eq!(horizontally_scrollable_text.text, test_text); } - #[test] - fn test_horizontally_scrollable_text_is_empty() { - assert_is_empty!(HorizontallyScrollableText::from("")) - } - #[test] fn test_horizontally_scrollable_text_scroll_text_left() { let horizontally_scrollable_text = HorizontallyScrollableText::from("Test string"); diff --git a/src/ui/radarr_ui/indexers/test_all_indexers_ui.rs b/src/ui/radarr_ui/indexers/test_all_indexers_ui.rs index 734fc15..ac1a912 100644 --- a/src/ui/radarr_ui/indexers/test_all_indexers_ui.rs +++ b/src/ui/radarr_ui/indexers/test_all_indexers_ui.rs @@ -35,7 +35,7 @@ fn draw_test_all_indexers_test_results(f: &mut Frame<'_>, app: &mut App<'_>, are let block = title_block("Test All Indexers"); let current_selection = - if let Some(test_all_results) = app.data.radarr_data.indexer_test_all_results.as_ref() { + if let Some(test_all_results) = app.data.radarr_data.indexer_test_all_results.as_ref() && !test_all_results.is_empty() { test_all_results.current_selection().clone() } else { IndexerTestResultModalItem::default() diff --git a/src/ui/radarr_ui/library/add_movie_ui.rs b/src/ui/radarr_ui/library/add_movie_ui.rs index eef00b3..ee2becd 100644 --- a/src/ui/radarr_ui/library/add_movie_ui.rs +++ b/src/ui/radarr_ui/library/add_movie_ui.rs @@ -69,12 +69,14 @@ impl DrawUi for AddMovieUi { fn draw_add_movie_search(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { let is_loading = app.is_loading || app.data.radarr_data.add_searched_movies.is_none(); - let current_selection = - if let Some(add_searched_movies) = app.data.radarr_data.add_searched_movies.as_ref() && app.error.is_empty() { - add_searched_movies.current_selection().clone() - } else { - AddMovieSearchResult::default() - }; + let current_selection = if let Some(add_searched_movies) = + app.data.radarr_data.add_searched_movies.as_ref() + && !add_searched_movies.is_empty() + { + add_searched_movies.current_selection().clone() + } else { + AddMovieSearchResult::default() + }; let [search_box_area, results_area] = Layout::vertical([Constraint::Length(3), Constraint::Fill(0)]) diff --git a/src/ui/sonarr_ui/indexers/test_all_indexers_ui.rs b/src/ui/sonarr_ui/indexers/test_all_indexers_ui.rs index 8b0bf20..bfed06a 100644 --- a/src/ui/sonarr_ui/indexers/test_all_indexers_ui.rs +++ b/src/ui/sonarr_ui/indexers/test_all_indexers_ui.rs @@ -34,7 +34,7 @@ impl DrawUi for TestAllIndexersUi { fn draw_test_all_indexers_test_results(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { let is_loading = app.is_loading || app.data.sonarr_data.indexer_test_all_results.is_none(); let current_selection = - if let Some(test_all_results) = app.data.sonarr_data.indexer_test_all_results.as_ref() { + if let Some(test_all_results) = app.data.sonarr_data.indexer_test_all_results.as_ref() && !test_all_results.is_empty() { test_all_results.current_selection().clone() } else { IndexerTestResultModalItem::default() diff --git a/src/ui/sonarr_ui/library/add_series_ui.rs b/src/ui/sonarr_ui/library/add_series_ui.rs index 8fd733c..3efdc9c 100644 --- a/src/ui/sonarr_ui/library/add_series_ui.rs +++ b/src/ui/sonarr_ui/library/add_series_ui.rs @@ -64,12 +64,14 @@ impl DrawUi for AddSeriesUi { fn draw_add_series_search(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) { let is_loading = app.is_loading || app.data.sonarr_data.add_searched_series.is_none(); - let current_selection = - if let Some(add_searched_series) = app.data.sonarr_data.add_searched_series.as_ref() && app.error.is_empty() { - add_searched_series.current_selection().clone() - } else { - AddSeriesSearchResult::default() - }; + let current_selection = if let Some(add_searched_series) = + app.data.sonarr_data.add_searched_series.as_ref() + && !add_searched_series.is_empty() + { + add_searched_series.current_selection().clone() + } else { + AddSeriesSearchResult::default() + }; let [search_box_area, results_area] = Layout::vertical([Constraint::Length(3), Constraint::Fill(0)])