From 0205f13e53f3b874d358861c30532f7082aa4120 Mon Sep 17 00:00:00 2001 From: Alex Clarke Date: Sun, 8 Dec 2024 13:08:43 -0700 Subject: [PATCH] refactor(history_handler): Use the new handle_table_event macro --- src/handlers/handler_test_utils.rs | 9 + .../history/history_handler_tests.rs | 28 +- src/handlers/sonarr_handlers/history/mod.rs | 279 +++--------------- .../servarr_data/sonarr/sonarr_test_utils.rs | 7 + 4 files changed, 77 insertions(+), 246 deletions(-) diff --git a/src/handlers/handler_test_utils.rs b/src/handlers/handler_test_utils.rs index e7f6eb2..49e1038 100644 --- a/src/handlers/handler_test_utils.rs +++ b/src/handlers/handler_test_utils.rs @@ -331,6 +331,15 @@ mod test_utils { macro_rules! test_handler_delegation { ($handler:ident, $base:expr, $active_block:expr) => { let mut app = App::default(); + app.data.sonarr_data.history.set_items(vec![$crate::models::sonarr_models::SonarrHistoryItem::default()]); + app.data.sonarr_data.root_folders.set_items(vec![$crate::models::servarr_models::RootFolder::default()]); + app.data.sonarr_data.indexers.set_items(vec![$crate::models::servarr_models::Indexer::default()]); + app.data.sonarr_data.blocklist.set_items(vec![$crate::models::sonarr_models::BlocklistItem::default()]); + app.data.radarr_data.movies.set_items(vec![$crate::models::radarr_models::Movie::default()]); + app.data.radarr_data.collections.set_items(vec![$crate::models::radarr_models::Collection::default()]); + app.data.radarr_data.collection_movies.set_items(vec![$crate::models::radarr_models::Movie::default()]); + app.data.radarr_data.indexers.set_items(vec![$crate::models::servarr_models::Indexer::default()]); + app.data.radarr_data.root_folders.set_items(vec![$crate::models::servarr_models::RootFolder::default()]); let mut series_history = $crate::models::stateful_table::StatefulTable::default(); series_history.set_items(vec![ $crate::models::sonarr_models::SonarrHistoryItem::default(), diff --git a/src/handlers/sonarr_handlers/history/history_handler_tests.rs b/src/handlers/sonarr_handlers/history/history_handler_tests.rs index 2f003ff..b037f37 100644 --- a/src/handlers/sonarr_handlers/history/history_handler_tests.rs +++ b/src/handlers/sonarr_handlers/history/history_handler_tests.rs @@ -205,6 +205,7 @@ mod tests { #[test] fn test_history_search_box_home_end_keys() { let mut app = App::default(); + app.push_navigation_stack(ActiveSonarrBlock::SearchHistory.into()); app .data .sonarr_data @@ -258,6 +259,7 @@ mod tests { #[test] fn test_history_filter_box_home_end_keys() { let mut app = App::default(); + app.push_navigation_stack(ActiveSonarrBlock::FilterHistory.into()); app .data .sonarr_data @@ -413,6 +415,8 @@ mod tests { #[test] fn test_history_search_box_left_right_keys() { let mut app = App::default(); + app.data.sonarr_data.history.set_items(vec![SonarrHistoryItem::default()]); + app.push_navigation_stack(ActiveSonarrBlock::SearchHistory.into()); app.data.sonarr_data.history.search = Some("Test".into()); HistoryHandler::with( @@ -461,6 +465,8 @@ mod tests { #[test] fn test_history_filter_box_left_right_keys() { let mut app = App::default(); + app.data.sonarr_data.history.set_items(vec![SonarrHistoryItem::default()]); + app.push_navigation_stack(ActiveSonarrBlock::FilterHistory.into()); app.data.sonarr_data.history.filter = Some("Test".into()); HistoryHandler::with( @@ -766,6 +772,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::History.into()); app.push_navigation_stack(active_sonarr_block.into()); app.data.sonarr_data = create_test_sonarr_data(); + app.data.sonarr_data.history.set_items(vec![SonarrHistoryItem::default()]); app.data.sonarr_data.history.search = Some("Test".into()); HistoryHandler::with(ESC_KEY, &mut app, active_sonarr_block, None).handle(); @@ -794,6 +801,7 @@ mod tests { filtered_state: Some(TableState::default()), ..StatefulTable::default() }; + app.data.sonarr_data.history.set_items(vec![SonarrHistoryItem::default()]); HistoryHandler::with(ESC_KEY, &mut app, active_sonarr_block, None).handle(); @@ -807,6 +815,7 @@ mod tests { #[test] fn test_esc_history_item_details() { let mut app = App::default(); + app.data.sonarr_data.history.set_items(vec![SonarrHistoryItem::default()]); app.push_navigation_stack(ActiveSonarrBlock::History.into()); app.push_navigation_stack(ActiveSonarrBlock::HistoryItemDetails.into()); @@ -824,6 +833,7 @@ mod tests { #[test] fn test_history_sort_prompt_block_esc() { let mut app = App::default(); + app.data.sonarr_data.history.set_items(vec![SonarrHistoryItem::default()]); app.push_navigation_stack(ActiveSonarrBlock::History.into()); app.push_navigation_stack(ActiveSonarrBlock::HistorySortPrompt.into()); @@ -846,22 +856,12 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::History.into()); app.push_navigation_stack(ActiveSonarrBlock::History.into()); app.data.sonarr_data = create_test_sonarr_data(); - app.data.sonarr_data.history = StatefulTable { - search: Some("Test".into()), - filter: Some("Test".into()), - filtered_items: Some(Vec::new()), - filtered_state: Some(TableState::default()), - ..StatefulTable::default() - }; + app.data.sonarr_data.history.set_items(vec![SonarrHistoryItem::default()]); HistoryHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::History, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::History.into()); assert!(app.error.text.is_empty()); - assert_eq!(app.data.sonarr_data.history.search, None); - assert_eq!(app.data.sonarr_data.history.filter, None); - assert_eq!(app.data.sonarr_data.history.filtered_items, None); - assert_eq!(app.data.sonarr_data.history.filtered_state, None); } } @@ -875,6 +875,7 @@ mod tests { #[test] fn test_search_history_key() { let mut app = App::default(); + app.push_navigation_stack(ActiveSonarrBlock::History.into()); app .data .sonarr_data @@ -927,6 +928,7 @@ mod tests { #[test] fn test_filter_history_key() { let mut app = App::default(); + app.push_navigation_stack(ActiveSonarrBlock::History.into()); app .data .sonarr_data @@ -1047,6 +1049,7 @@ mod tests { #[test] fn test_search_history_box_backspace_key() { let mut app = App::default(); + app.push_navigation_stack(ActiveSonarrBlock::SearchHistory.into()); app.data.sonarr_data.history.search = Some("Test".into()); app .data @@ -1071,6 +1074,7 @@ mod tests { #[test] fn test_filter_history_box_backspace_key() { let mut app = App::default(); + app.push_navigation_stack(ActiveSonarrBlock::FilterHistory.into()); app .data .sonarr_data @@ -1095,6 +1099,7 @@ mod tests { #[test] fn test_search_history_box_char_key() { let mut app = App::default(); + app.push_navigation_stack(ActiveSonarrBlock::SearchHistory.into()); app .data .sonarr_data @@ -1119,6 +1124,7 @@ mod tests { #[test] fn test_filter_history_box_char_key() { let mut app = App::default(); + app.push_navigation_stack(ActiveSonarrBlock::FilterHistory.into()); app .data .sonarr_data diff --git a/src/handlers/sonarr_handlers/history/mod.rs b/src/handlers/sonarr_handlers/history/mod.rs index 575b60c..51c8dc6 100644 --- a/src/handlers/sonarr_handlers/history/mod.rs +++ b/src/handlers/sonarr_handlers/history/mod.rs @@ -2,12 +2,13 @@ use crate::app::key_binding::DEFAULT_KEYBINDINGS; use crate::app::App; use crate::event::Key; use crate::handlers::sonarr_handlers::handle_change_tab_left_right_keys; +use crate::handlers::table_handler::TableHandlingProps; use crate::handlers::{handle_clear_errors, KeyEventHandler}; use crate::models::servarr_data::sonarr::sonarr_data::{ActiveSonarrBlock, HISTORY_BLOCKS}; use crate::models::sonarr_models::SonarrHistoryItem; use crate::models::stateful_table::SortOption; use crate::models::{HorizontallyScrollableText, Scrollable}; -use crate::{handle_text_box_keys, handle_text_box_left_right_keys}; +use crate::handle_table_events; #[cfg(test)] #[path = "history_handler_tests.rs"] @@ -20,7 +21,33 @@ pub(super) struct HistoryHandler<'a, 'b> { _context: Option, } +impl<'a, 'b> HistoryHandler<'a, 'b> { + handle_table_events!( + self, + history, + self.app.data.sonarr_data.history, + SonarrHistoryItem + ); +} + impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for HistoryHandler<'a, 'b> { + fn handle(&mut self) { + let history_table_handling_props = TableHandlingProps::new(ActiveSonarrBlock::History.into()) + .sorting_block(ActiveSonarrBlock::HistorySortPrompt.into()) + .sort_by_fn(|a: &SonarrHistoryItem, b: &SonarrHistoryItem| a.id.cmp(&b.id)) + .sort_options(history_sorting_options()) + .searching_block(ActiveSonarrBlock::SearchHistory.into()) + .search_error_block(ActiveSonarrBlock::SearchHistoryError.into()) + .search_field_fn(|history| &history.source_title.text) + .filtering_block(ActiveSonarrBlock::FilterHistory.into()) + .filter_error_block(ActiveSonarrBlock::FilterHistoryError.into()) + .filter_field_fn(|history| &history.source_title.text); + + if !self.handle_history_table_events(history_table_handling_props) { + self.handle_key_event(); + } + } + fn accepts(active_block: ActiveSonarrBlock) -> bool { HISTORY_BLOCKS.contains(&active_block) } @@ -47,272 +74,54 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for HistoryHandler<'a, ' !self.app.is_loading && !self.app.data.sonarr_data.history.is_empty() } - fn handle_scroll_up(&mut self) { - match self.active_sonarr_block { - ActiveSonarrBlock::History => self.app.data.sonarr_data.history.scroll_up(), - ActiveSonarrBlock::HistorySortPrompt => self - .app - .data - .sonarr_data - .history - .sort - .as_mut() - .unwrap() - .scroll_up(), - _ => (), - } - } + fn handle_scroll_up(&mut self) {} - fn handle_scroll_down(&mut self) { - match self.active_sonarr_block { - ActiveSonarrBlock::History => self.app.data.sonarr_data.history.scroll_down(), - ActiveSonarrBlock::HistorySortPrompt => self - .app - .data - .sonarr_data - .history - .sort - .as_mut() - .unwrap() - .scroll_down(), - _ => (), - } - } + fn handle_scroll_down(&mut self) {} - fn handle_home(&mut self) { - match self.active_sonarr_block { - ActiveSonarrBlock::History => self.app.data.sonarr_data.history.scroll_to_top(), - ActiveSonarrBlock::SearchHistory => { - self - .app - .data - .sonarr_data - .history - .search - .as_mut() - .unwrap() - .scroll_home(); - } - ActiveSonarrBlock::FilterHistory => { - self - .app - .data - .sonarr_data - .history - .filter - .as_mut() - .unwrap() - .scroll_home(); - } - ActiveSonarrBlock::HistorySortPrompt => self - .app - .data - .sonarr_data - .history - .sort - .as_mut() - .unwrap() - .scroll_to_top(), - _ => (), - } - } + fn handle_home(&mut self) {} - fn handle_end(&mut self) { - match self.active_sonarr_block { - ActiveSonarrBlock::History => self.app.data.sonarr_data.history.scroll_to_bottom(), - ActiveSonarrBlock::SearchHistory => self - .app - .data - .sonarr_data - .history - .search - .as_mut() - .unwrap() - .reset_offset(), - ActiveSonarrBlock::FilterHistory => self - .app - .data - .sonarr_data - .history - .filter - .as_mut() - .unwrap() - .reset_offset(), - ActiveSonarrBlock::HistorySortPrompt => self - .app - .data - .sonarr_data - .history - .sort - .as_mut() - .unwrap() - .scroll_to_bottom(), - _ => (), - } - } + fn handle_end(&mut self) {} fn handle_delete(&mut self) {} fn handle_left_right_action(&mut self) { match self.active_sonarr_block { ActiveSonarrBlock::History => handle_change_tab_left_right_keys(self.app, self.key), - ActiveSonarrBlock::SearchHistory => { - handle_text_box_left_right_keys!( - self, - self.key, - self.app.data.sonarr_data.history.search.as_mut().unwrap() - ) - } - ActiveSonarrBlock::FilterHistory => { - handle_text_box_left_right_keys!( - self, - self.key, - self.app.data.sonarr_data.history.filter.as_mut().unwrap() - ) - } _ => {} } } fn handle_submit(&mut self) { - match self.active_sonarr_block { - ActiveSonarrBlock::SearchHistory => { - self.app.pop_navigation_stack(); - self.app.should_ignore_quit_key = false; - - if self.app.data.sonarr_data.history.search.is_some() { - let has_match = self - .app - .data - .sonarr_data - .history - .apply_search(|history| &history.source_title.text); - - if !has_match { - self - .app - .push_navigation_stack(ActiveSonarrBlock::SearchHistoryError.into()); - } - } - } - ActiveSonarrBlock::FilterHistory => { - self.app.pop_navigation_stack(); - self.app.should_ignore_quit_key = false; - - if self.app.data.sonarr_data.history.filter.is_some() { - let has_matches = self - .app - .data - .sonarr_data - .history - .apply_filter(|history| &history.source_title.text); - - if !has_matches { - self - .app - .push_navigation_stack(ActiveSonarrBlock::FilterHistoryError.into()); - } - } - } - ActiveSonarrBlock::HistorySortPrompt => { - self - .app - .data - .sonarr_data - .history - .items - .sort_by(|a, b| a.id.cmp(&b.id)); - self.app.data.sonarr_data.history.apply_sorting(); - - self.app.pop_navigation_stack(); - } - ActiveSonarrBlock::History => { - self - .app - .push_navigation_stack(ActiveSonarrBlock::HistoryItemDetails.into()); - } - _ => (), + if self.active_sonarr_block == ActiveSonarrBlock::History { + self + .app + .push_navigation_stack(ActiveSonarrBlock::HistoryItemDetails.into()); } } fn handle_esc(&mut self) { - match self.active_sonarr_block { - ActiveSonarrBlock::FilterHistory | ActiveSonarrBlock::FilterHistoryError => { - self.app.pop_navigation_stack(); - self.app.data.sonarr_data.history.reset_filter(); - self.app.should_ignore_quit_key = false; - } - ActiveSonarrBlock::SearchHistory | ActiveSonarrBlock::SearchHistoryError => { - self.app.pop_navigation_stack(); - self.app.data.sonarr_data.history.reset_search(); - self.app.should_ignore_quit_key = false; - } - ActiveSonarrBlock::HistoryItemDetails | ActiveSonarrBlock::HistorySortPrompt => { - self.app.pop_navigation_stack(); - } - _ => { - self.app.data.sonarr_data.history.reset_search(); - self.app.data.sonarr_data.history.reset_filter(); - handle_clear_errors(self.app); - } + if self.active_sonarr_block == ActiveSonarrBlock::HistoryItemDetails { + self.app.pop_navigation_stack(); + } else { + handle_clear_errors(self.app); } } fn handle_char_key_event(&mut self) { let key = self.key; - match self.active_sonarr_block { - ActiveSonarrBlock::History => match self.key { - _ if key == DEFAULT_KEYBINDINGS.search.key => { - self - .app - .push_navigation_stack(ActiveSonarrBlock::SearchHistory.into()); - self.app.data.sonarr_data.history.search = Some(HorizontallyScrollableText::default()); - self.app.should_ignore_quit_key = true; - } - _ if key == DEFAULT_KEYBINDINGS.filter.key => { - self - .app - .push_navigation_stack(ActiveSonarrBlock::FilterHistory.into()); - self.app.data.sonarr_data.history.reset_filter(); - self.app.data.sonarr_data.history.filter = Some(HorizontallyScrollableText::default()); - self.app.should_ignore_quit_key = true; - } + if self.active_sonarr_block == ActiveSonarrBlock::History { + match self.key { _ if key == DEFAULT_KEYBINDINGS.refresh.key => { self.app.should_refresh = true; } - _ if key == DEFAULT_KEYBINDINGS.sort.key => { - self - .app - .data - .sonarr_data - .history - .sorting(history_sorting_options()); - self - .app - .push_navigation_stack(ActiveSonarrBlock::HistorySortPrompt.into()); - } _ => (), - }, - ActiveSonarrBlock::SearchHistory => { - handle_text_box_keys!( - self, - key, - self.app.data.sonarr_data.history.search.as_mut().unwrap() - ) } - ActiveSonarrBlock::FilterHistory => { - handle_text_box_keys!( - self, - key, - self.app.data.sonarr_data.history.filter.as_mut().unwrap() - ) - } - _ => (), } } } -pub(in crate::handlers::sonarr_handlers) fn history_sorting_options() -> Vec> { +pub(in crate::handlers::sonarr_handlers) fn history_sorting_options( +) -> Vec> { vec![ SortOption { name: "Source Title", diff --git a/src/models/servarr_data/sonarr/sonarr_test_utils.rs b/src/models/servarr_data/sonarr/sonarr_test_utils.rs index bb7b669..2ba4dea 100644 --- a/src/models/servarr_data/sonarr/sonarr_test_utils.rs +++ b/src/models/servarr_data/sonarr/sonarr_test_utils.rs @@ -9,6 +9,8 @@ pub mod utils { stateful_table::StatefulTable, HorizontallyScrollableText, ScrollableText, }; + use crate::models::servarr_models::{Indexer, RootFolder}; + use crate::models::sonarr_models::{BlocklistItem, Series}; pub fn create_test_sonarr_data<'a>() -> SonarrData<'a> { let mut episode_details_modal = EpisodeDetailsModal { @@ -46,6 +48,11 @@ pub mod utils { add_searched_series: Some(StatefulTable::default()), ..SonarrData::default() }; + sonarr_data.series.set_items(vec![Series::default()]); + sonarr_data.history.set_items(vec![SonarrHistoryItem::default()]); + sonarr_data.blocklist.set_items(vec![BlocklistItem::default()]); + sonarr_data.root_folders.set_items(vec![RootFolder::default()]); + sonarr_data.indexers.set_items(vec![Indexer::default()]); sonarr_data.series_info_tabs.index = 1; sonarr_data .add_searched_series