diff --git a/src/handlers/handler_test_utils.rs b/src/handlers/handler_test_utils.rs index b3e8986..ec6d7ef 100644 --- a/src/handlers/handler_test_utils.rs +++ b/src/handlers/handler_test_utils.rs @@ -110,14 +110,14 @@ mod test_utils { .$data_ref .set_items(vec!["Test 1".to_owned(), "Test 2".to_owned()]); - $handler::with(&key, &mut app, &$block, &$context).handle(); + $handler::new(&key, &mut app, &$block, &$context).handle(); pretty_assertions::assert_str_eq!( app.data.$servarr_data.$data_ref.current_selection(), "Test 2" ); - $handler::with(&key, &mut app, &$block, &$context).handle(); + $handler::new(&key, &mut app, &$block, &$context).handle(); pretty_assertions::assert_str_eq!( app.data.$servarr_data.$data_ref.current_selection(), @@ -137,14 +137,14 @@ mod test_utils { .$data_ref .set_items(simple_stateful_iterable_vec!($items)); - $handler::with(key, &mut app, $block, $context).handle(); + $handler::new(key, &mut app, $block, $context).handle(); pretty_assertions::assert_str_eq!( app.data.$servarr_data.$data_ref.current_selection().$field, "Test 2" ); - $handler::with(key, &mut app, $block, $context).handle(); + $handler::new(key, &mut app, $block, $context).handle(); pretty_assertions::assert_str_eq!( app.data.$servarr_data.$data_ref.current_selection().$field, @@ -160,14 +160,14 @@ mod test_utils { app.push_navigation_stack($block.into()); app.data.$servarr_data.$data_ref.set_items($items); - $handler::with(key, &mut app, $block, $context).handle(); + $handler::new(key, &mut app, $block, $context).handle(); pretty_assertions::assert_str_eq!( app.data.$servarr_data.$data_ref.current_selection().$field, "Test 2" ); - $handler::with(key, &mut app, $block, $context).handle(); + $handler::new(key, &mut app, $block, $context).handle(); pretty_assertions::assert_str_eq!( app.data.$servarr_data.$data_ref.current_selection().$field, @@ -183,7 +183,7 @@ mod test_utils { app.push_navigation_stack($block.into()); app.data.$servarr_data.$data_ref.set_items($items); - $handler::with(key, &mut app, $block, $context).handle(); + $handler::new(key, &mut app, $block, $context).handle(); pretty_assertions::assert_str_eq!( app @@ -196,7 +196,7 @@ mod test_utils { "Test 2" ); - $handler::with(key, &mut app, $block, $context).handle(); + $handler::new(key, &mut app, $block, $context).handle(); pretty_assertions::assert_str_eq!( app @@ -225,14 +225,14 @@ mod test_utils { "Test 3".to_owned(), ]); - $handler::with(DEFAULT_KEYBINDINGS.end.key, &mut app, $block, $context).handle(); + $handler::new(DEFAULT_KEYBINDINGS.end.key, &mut app, $block, $context).handle(); pretty_assertions::assert_str_eq!( app.data.$servarr_data.$data_ref.current_selection(), "Test 3" ); - $handler::with(DEFAULT_KEYBINDINGS.home.key, &mut app, $block, $context).handle(); + $handler::new(DEFAULT_KEYBINDINGS.home.key, &mut app, $block, $context).handle(); pretty_assertions::assert_str_eq!( app.data.$servarr_data.$data_ref.current_selection(), @@ -252,14 +252,14 @@ mod test_utils { .$data_ref .set_items(extended_stateful_iterable_vec!($items)); - $handler::with(DEFAULT_KEYBINDINGS.end.key, &mut app, $block, $context).handle(); + $handler::new(DEFAULT_KEYBINDINGS.end.key, &mut app, $block, $context).handle(); pretty_assertions::assert_str_eq!( app.data.$servarr_data.$data_ref.current_selection().$field, "Test 3" ); - $handler::with(DEFAULT_KEYBINDINGS.home.key, &mut app, $block, $context).handle(); + $handler::new(DEFAULT_KEYBINDINGS.home.key, &mut app, $block, $context).handle(); pretty_assertions::assert_str_eq!( app.data.$servarr_data.$data_ref.current_selection().$field, @@ -275,14 +275,14 @@ mod test_utils { app.push_navigation_stack($block.into()); app.data.$servarr_data.$data_ref.set_items($items); - $handler::with(DEFAULT_KEYBINDINGS.end.key, &mut app, $block, $context).handle(); + $handler::new(DEFAULT_KEYBINDINGS.end.key, &mut app, $block, $context).handle(); pretty_assertions::assert_str_eq!( app.data.$servarr_data.$data_ref.current_selection().$field, "Test 3" ); - $handler::with(DEFAULT_KEYBINDINGS.home.key, &mut app, $block, $context).handle(); + $handler::new(DEFAULT_KEYBINDINGS.home.key, &mut app, $block, $context).handle(); pretty_assertions::assert_str_eq!( app.data.$servarr_data.$data_ref.current_selection().$field, @@ -298,7 +298,7 @@ mod test_utils { app.push_navigation_stack($block.into()); app.data.$servarr_data.$data_ref.set_items($items); - $handler::with(DEFAULT_KEYBINDINGS.end.key, &mut app, $block, $context).handle(); + $handler::new(DEFAULT_KEYBINDINGS.end.key, &mut app, $block, $context).handle(); pretty_assertions::assert_str_eq!( app @@ -311,7 +311,7 @@ mod test_utils { "Test 3" ); - $handler::with(DEFAULT_KEYBINDINGS.home.key, &mut app, $block, $context).handle(); + $handler::new(DEFAULT_KEYBINDINGS.home.key, &mut app, $block, $context).handle(); pretty_assertions::assert_str_eq!( app @@ -417,7 +417,7 @@ mod test_utils { app.push_navigation_stack($base.into()); app.push_navigation_stack($active_block.into()); - $handler::with(DEFAULT_KEYBINDINGS.esc.key, &mut app, $active_block, None).handle(); + $handler::new(DEFAULT_KEYBINDINGS.esc.key, &mut app, $active_block, None).handle(); pretty_assertions::assert_eq!(app.get_current_route(), $base.into()); }; @@ -428,13 +428,13 @@ mod test_utils { ($handler:ident, $block:expr, $expected_block:expr) => { let mut app = App::default(); - $handler::with(DELETE_KEY, &mut app, $block, None).handle(); + $handler::new(DELETE_KEY, &mut app, $block, None).handle(); pretty_assertions::assert_eq!(app.get_current_route(), $expected_block.into()); }; ($handler:ident, $app:expr, $block:expr, $expected_block:expr) => { - $handler::with(DELETE_KEY, &mut $app, $block, None).handle(); + $handler::new(DELETE_KEY, &mut $app, $block, None).handle(); pretty_assertions::assert_eq!($app.get_current_route(), $expected_block.into()); }; @@ -446,7 +446,7 @@ mod test_utils { let mut app = App::default(); app.push_navigation_stack($block.into()); - $handler::with(DEFAULT_KEYBINDINGS.refresh.key, &mut app, $block, None).handle(); + $handler::new(DEFAULT_KEYBINDINGS.refresh.key, &mut app, $block, None).handle(); pretty_assertions::assert_eq!(app.get_current_route(), $block.into()); assert!(app.should_refresh); diff --git a/src/handlers/mod.rs b/src/handlers/mod.rs index 184000e..518d01b 100644 --- a/src/handlers/mod.rs +++ b/src/handlers/mod.rs @@ -69,7 +69,7 @@ pub trait KeyEventHandler<'a, 'b, T: Into + Copy> { } fn accepts(active_block: T) -> bool; - fn with(key: Key, app: &'a mut App<'b>, active_block: T, context: Option) -> Self; + fn new(key: Key, app: &'a mut App<'b>, active_block: T, context: Option) -> Self; fn get_key(&self) -> Key; fn is_ready(&self) -> bool; fn handle_scroll_up(&mut self); @@ -97,10 +97,10 @@ pub fn handle_events(key: Key, app: &mut App<'_>) { } else { match app.get_current_route() { Route::Radarr(active_radarr_block, context) => { - RadarrHandler::with(key, app, active_radarr_block, context).handle() + RadarrHandler::new(key, app, active_radarr_block, context).handle() } Route::Sonarr(active_sonarr_block, context) => { - SonarrHandler::with(key, app, active_sonarr_block, context).handle() + SonarrHandler::new(key, app, active_sonarr_block, context).handle() } _ => (), } diff --git a/src/handlers/radarr_handlers/blocklist/blocklist_handler_tests.rs b/src/handlers/radarr_handlers/blocklist/blocklist_handler_tests.rs index 17d6388..4916e00 100644 --- a/src/handlers/radarr_handlers/blocklist/blocklist_handler_tests.rs +++ b/src/handlers/radarr_handlers/blocklist/blocklist_handler_tests.rs @@ -27,7 +27,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.blocklist.set_items(blocklist_vec()); - BlocklistHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::Blocklist, None).handle(); + BlocklistHandler::new(DELETE_KEY, &mut app, ActiveRadarrBlock::Blocklist, None).handle(); assert_eq!( app.get_current_route(), @@ -42,7 +42,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into()); app.data.radarr_data.blocklist.set_items(blocklist_vec()); - BlocklistHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::Blocklist, None).handle(); + BlocklistHandler::new(DELETE_KEY, &mut app, ActiveRadarrBlock::Blocklist, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Blocklist.into()); } @@ -60,7 +60,7 @@ mod tests { app.is_loading = is_ready; app.data.radarr_data.main_tabs.set_index(3); - BlocklistHandler::with( + BlocklistHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::Blocklist, @@ -81,7 +81,7 @@ mod tests { app.is_loading = is_ready; app.data.radarr_data.main_tabs.set_index(3); - BlocklistHandler::with( + BlocklistHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::Blocklist, @@ -110,11 +110,11 @@ mod tests { ) { let mut app = App::default(); - BlocklistHandler::with(key, &mut app, active_radarr_block, None).handle(); + BlocklistHandler::new(key, &mut app, active_radarr_block, None).handle(); assert!(app.data.radarr_data.prompt_confirm); - BlocklistHandler::with(key, &mut app, active_radarr_block, None).handle(); + BlocklistHandler::new(key, &mut app, active_radarr_block, None).handle(); assert!(!app.data.radarr_data.prompt_confirm); } @@ -136,7 +136,7 @@ mod tests { app.data.radarr_data.blocklist.set_items(blocklist_vec()); app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into()); - BlocklistHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Blocklist, None).handle(); + BlocklistHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Blocklist, None).handle(); assert_eq!( app.get_current_route(), @@ -151,7 +151,7 @@ mod tests { app.data.radarr_data.blocklist.set_items(blocklist_vec()); app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into()); - BlocklistHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Blocklist, None).handle(); + BlocklistHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Blocklist, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Blocklist.into()); } @@ -178,7 +178,7 @@ mod tests { app.push_navigation_stack(base_route.into()); app.push_navigation_stack(prompt_block.into()); - BlocklistHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + BlocklistHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(app.data.radarr_data.prompt_confirm); assert_eq!( @@ -201,7 +201,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into()); app.push_navigation_stack(prompt_block.into()); - BlocklistHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + BlocklistHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(!app.data.radarr_data.prompt_confirm); assert_eq!(app.data.radarr_data.prompt_confirm_action, None); @@ -237,7 +237,7 @@ mod tests { app.push_navigation_stack(prompt_block.into()); app.data.radarr_data.prompt_confirm = true; - BlocklistHandler::with(ESC_KEY, &mut app, prompt_block, None).handle(); + BlocklistHandler::new(ESC_KEY, &mut app, prompt_block, None).handle(); assert_eq!(app.get_current_route(), base_block.into()); assert!(!app.data.radarr_data.prompt_confirm); @@ -249,7 +249,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into()); app.push_navigation_stack(ActiveRadarrBlock::BlocklistItemDetails.into()); - BlocklistHandler::with( + BlocklistHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::BlocklistItemDetails, @@ -268,7 +268,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into()); app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into()); - DownloadsHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::Blocklist, None).handle(); + DownloadsHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::Blocklist, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Blocklist.into()); assert!(app.error.text.is_empty()); @@ -289,7 +289,7 @@ mod tests { app.data.radarr_data.blocklist.set_items(blocklist_vec()); app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into()); - BlocklistHandler::with( + BlocklistHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveRadarrBlock::Blocklist, @@ -308,7 +308,7 @@ mod tests { app.data.radarr_data.blocklist.set_items(blocklist_vec()); app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into()); - BlocklistHandler::with( + BlocklistHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveRadarrBlock::Blocklist, @@ -325,7 +325,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.blocklist.set_items(blocklist_vec()); - BlocklistHandler::with( + BlocklistHandler::new( DEFAULT_KEYBINDINGS.clear.key, &mut app, ActiveRadarrBlock::Blocklist, @@ -346,7 +346,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Blocklist.into()); app.data.radarr_data.blocklist.set_items(blocklist_vec()); - BlocklistHandler::with( + BlocklistHandler::new( DEFAULT_KEYBINDINGS.clear.key, &mut app, ActiveRadarrBlock::Blocklist, @@ -378,7 +378,7 @@ mod tests { app.push_navigation_stack(base_route.into()); app.push_navigation_stack(prompt_block.into()); - BlocklistHandler::with( + BlocklistHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, prompt_block, @@ -546,7 +546,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.blocklist.set_items(blocklist_vec()); - let blocklist_item_id = BlocklistHandler::with( + let blocklist_item_id = BlocklistHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Blocklist, @@ -562,7 +562,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = BlocklistHandler::with( + let handler = BlocklistHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Blocklist, @@ -577,7 +577,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = BlocklistHandler::with( + let handler = BlocklistHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Blocklist, @@ -597,7 +597,7 @@ mod tests { .blocklist .set_items(vec![BlocklistItem::default()]); - let handler = BlocklistHandler::with( + let handler = BlocklistHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Blocklist, diff --git a/src/handlers/radarr_handlers/blocklist/mod.rs b/src/handlers/radarr_handlers/blocklist/mod.rs index f1fc57a..677b4c1 100644 --- a/src/handlers/radarr_handlers/blocklist/mod.rs +++ b/src/handlers/radarr_handlers/blocklist/mod.rs @@ -51,7 +51,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for BlocklistHandler<'a, BLOCKLIST_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/collections/collection_details_handler.rs b/src/handlers/radarr_handlers/collections/collection_details_handler.rs index 1d13768..dbc1f95 100644 --- a/src/handlers/radarr_handlers/collections/collection_details_handler.rs +++ b/src/handlers/radarr_handlers/collections/collection_details_handler.rs @@ -46,7 +46,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionDetailsHan COLLECTION_DETAILS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs b/src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs index c23a644..95cc8a9 100644 --- a/src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs +++ b/src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs @@ -42,7 +42,7 @@ mod tests { .selected_block .set_index(0, ADD_MOVIE_SELECTION_BLOCKS.len() - 1); - CollectionDetailsHandler::with( + CollectionDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::CollectionDetails, @@ -113,7 +113,7 @@ mod tests { .collection_movies .set_items(vec![CollectionMovie::default()]); - CollectionDetailsHandler::with( + CollectionDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::CollectionDetails, @@ -142,7 +142,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - CollectionDetailsHandler::with( + CollectionDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::CollectionDetails, @@ -176,7 +176,7 @@ mod tests { .collection_movies .set_items(vec![CollectionMovie::default()]); - CollectionDetailsHandler::with( + CollectionDetailsHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::CollectionDetails, @@ -197,7 +197,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::CollectionDetails.into()); app.push_navigation_stack(ActiveRadarrBlock::ViewMovieOverview.into()); - CollectionDetailsHandler::with( + CollectionDetailsHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::ViewMovieOverview, @@ -251,7 +251,7 @@ mod tests { }]); app.data.radarr_data = radarr_data; - CollectionDetailsHandler::with( + CollectionDetailsHandler::new( DEFAULT_KEYBINDINGS.edit.key, &mut app, ActiveRadarrBlock::CollectionDetails, @@ -283,7 +283,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = CollectionDetailsHandler::with( + let handler = CollectionDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::CollectionDetails, @@ -298,7 +298,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = CollectionDetailsHandler::with( + let handler = CollectionDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::CollectionDetails, @@ -318,7 +318,7 @@ mod tests { .collection_movies .set_items(vec![CollectionMovie::default()]); - let handler = CollectionDetailsHandler::with( + let handler = CollectionDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::CollectionDetails, diff --git a/src/handlers/radarr_handlers/collections/collections_handler_tests.rs b/src/handlers/radarr_handlers/collections/collections_handler_tests.rs index a5d72ae..4e6f8ce 100644 --- a/src/handlers/radarr_handlers/collections/collections_handler_tests.rs +++ b/src/handlers/radarr_handlers/collections/collections_handler_tests.rs @@ -32,7 +32,7 @@ mod tests { app.is_loading = is_ready; app.data.radarr_data.main_tabs.set_index(1); - CollectionsHandler::with( + CollectionsHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::Collections, @@ -53,7 +53,7 @@ mod tests { app.is_loading = is_ready; app.data.radarr_data.main_tabs.set_index(1); - CollectionsHandler::with( + CollectionsHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::Collections, @@ -74,7 +74,7 @@ mod tests { ) { let mut app = App::default(); - CollectionsHandler::with( + CollectionsHandler::new( key, &mut app, ActiveRadarrBlock::UpdateAllCollectionsPrompt, @@ -84,7 +84,7 @@ mod tests { assert!(app.data.radarr_data.prompt_confirm); - CollectionsHandler::with( + CollectionsHandler::new( key, &mut app, ActiveRadarrBlock::UpdateAllCollectionsPrompt, @@ -114,7 +114,7 @@ mod tests { .collections .set_items(vec![Collection::default()]); - CollectionsHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Collections, None).handle(); + CollectionsHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Collections, None).handle(); assert_eq!( app.get_current_route(), @@ -133,7 +133,7 @@ mod tests { .collections .set_items(vec![Collection::default()]); - CollectionsHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Collections, None).handle(); + CollectionsHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Collections, None).handle(); assert_eq!( app.get_current_route(), @@ -153,7 +153,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Collections.into()); app.push_navigation_stack(ActiveRadarrBlock::UpdateAllCollectionsPrompt.into()); - CollectionsHandler::with( + CollectionsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::UpdateAllCollectionsPrompt, @@ -183,7 +183,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Collections.into()); app.push_navigation_stack(ActiveRadarrBlock::UpdateAllCollectionsPrompt.into()); - CollectionsHandler::with( + CollectionsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::UpdateAllCollectionsPrompt, @@ -216,7 +216,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::UpdateAllCollectionsPrompt.into()); app.data.radarr_data.prompt_confirm = true; - CollectionsHandler::with( + CollectionsHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::UpdateAllCollectionsPrompt, @@ -240,7 +240,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Collections.into()); app.data.radarr_data = create_test_radarr_data(); - CollectionsHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::Collections, None).handle(); + CollectionsHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::Collections, None).handle(); assert_eq!( app.get_current_route(), @@ -286,7 +286,7 @@ mod tests { }]); app.data.radarr_data = radarr_data; - CollectionsHandler::with( + CollectionsHandler::new( DEFAULT_KEYBINDINGS.edit.key, &mut app, ActiveRadarrBlock::Collections, @@ -310,7 +310,7 @@ mod tests { .collections .set_items(vec![Collection::default()]); - CollectionsHandler::with( + CollectionsHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveRadarrBlock::Collections, @@ -335,7 +335,7 @@ mod tests { .collections .set_items(vec![Collection::default()]); - CollectionsHandler::with( + CollectionsHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveRadarrBlock::Collections, @@ -359,7 +359,7 @@ mod tests { .collections .set_items(vec![Collection::default()]); - CollectionsHandler::with( + CollectionsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveRadarrBlock::Collections, @@ -385,7 +385,7 @@ mod tests { .collections .set_items(vec![Collection::default()]); - CollectionsHandler::with( + CollectionsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveRadarrBlock::Collections, @@ -411,7 +411,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Collections.into()); app.push_navigation_stack(ActiveRadarrBlock::UpdateAllCollectionsPrompt.into()); - CollectionsHandler::with( + CollectionsHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveRadarrBlock::UpdateAllCollectionsPrompt, @@ -594,7 +594,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = CollectionsHandler::with( + let handler = CollectionsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Collections, @@ -609,7 +609,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = CollectionsHandler::with( + let handler = CollectionsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Collections, @@ -629,7 +629,7 @@ mod tests { .collections .set_items(vec![Collection::default()]); - let handler = CollectionsHandler::with( + let handler = CollectionsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Collections, diff --git a/src/handlers/radarr_handlers/collections/edit_collection_handler.rs b/src/handlers/radarr_handlers/collections/edit_collection_handler.rs index e33d3c0..a20494d 100644 --- a/src/handlers/radarr_handlers/collections/edit_collection_handler.rs +++ b/src/handlers/radarr_handlers/collections/edit_collection_handler.rs @@ -70,7 +70,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditCollectionHandle EDIT_COLLECTION_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs b/src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs index cb741dc..e854f67 100644 --- a/src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs +++ b/src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs @@ -45,7 +45,7 @@ mod tests { if key == Key::Up { for i in (0..minimum_availability_vec.len()).rev() { - EditCollectionHandler::with( + EditCollectionHandler::new( key, &mut app, ActiveRadarrBlock::EditCollectionSelectMinimumAvailability, @@ -67,7 +67,7 @@ mod tests { } } else { for i in 0..minimum_availability_vec.len() { - EditCollectionHandler::with( + EditCollectionHandler::new( key, &mut app, ActiveRadarrBlock::EditCollectionSelectMinimumAvailability, @@ -105,7 +105,7 @@ mod tests { .quality_profile_list .set_items(vec!["Test 1".to_owned(), "Test 2".to_owned()]); - EditCollectionHandler::with( + EditCollectionHandler::new( key, &mut app, ActiveRadarrBlock::EditCollectionSelectQualityProfile, @@ -125,7 +125,7 @@ mod tests { "Test 2" ); - EditCollectionHandler::with( + EditCollectionHandler::new( key, &mut app, ActiveRadarrBlock::EditCollectionSelectQualityProfile, @@ -154,7 +154,7 @@ mod tests { BlockSelectionState::new(EDIT_COLLECTION_SELECTION_BLOCKS); app.data.radarr_data.selected_block.down(); - EditCollectionHandler::with(key, &mut app, ActiveRadarrBlock::EditCollectionPrompt, None) + EditCollectionHandler::new(key, &mut app, ActiveRadarrBlock::EditCollectionPrompt, None) .handle(); if key == Key::Up { @@ -181,7 +181,7 @@ mod tests { BlockSelectionState::new(EDIT_COLLECTION_SELECTION_BLOCKS); app.data.radarr_data.selected_block.down(); - EditCollectionHandler::with(key, &mut app, ActiveRadarrBlock::EditCollectionPrompt, None) + EditCollectionHandler::new(key, &mut app, ActiveRadarrBlock::EditCollectionPrompt, None) .handle(); assert_eq!( @@ -215,7 +215,7 @@ mod tests { .minimum_availability_list .set_items(minimum_availability_vec.clone()); - EditCollectionHandler::with( + EditCollectionHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::EditCollectionSelectMinimumAvailability, @@ -235,7 +235,7 @@ mod tests { &minimum_availability_vec[minimum_availability_vec.len() - 1] ); - EditCollectionHandler::with( + EditCollectionHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::EditCollectionSelectMinimumAvailability, @@ -273,7 +273,7 @@ mod tests { "Test 3".to_owned(), ]); - EditCollectionHandler::with( + EditCollectionHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::EditCollectionSelectQualityProfile, @@ -293,7 +293,7 @@ mod tests { "Test 3" ); - EditCollectionHandler::with( + EditCollectionHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::EditCollectionSelectQualityProfile, @@ -322,7 +322,7 @@ mod tests { ..EditCollectionModal::default() }); - EditCollectionHandler::with( + EditCollectionHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::EditCollectionRootFolderPathInput, @@ -343,7 +343,7 @@ mod tests { 4 ); - EditCollectionHandler::with( + EditCollectionHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::EditCollectionRootFolderPathInput, @@ -378,12 +378,12 @@ mod tests { fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) { let mut app = App::default(); - EditCollectionHandler::with(key, &mut app, ActiveRadarrBlock::EditCollectionPrompt, None) + EditCollectionHandler::new(key, &mut app, ActiveRadarrBlock::EditCollectionPrompt, None) .handle(); assert!(app.data.radarr_data.prompt_confirm); - EditCollectionHandler::with(key, &mut app, ActiveRadarrBlock::EditCollectionPrompt, None) + EditCollectionHandler::new(key, &mut app, ActiveRadarrBlock::EditCollectionPrompt, None) .handle(); assert!(!app.data.radarr_data.prompt_confirm); @@ -397,7 +397,7 @@ mod tests { ..EditCollectionModal::default() }); - EditCollectionHandler::with( + EditCollectionHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::EditCollectionRootFolderPathInput, @@ -418,7 +418,7 @@ mod tests { 1 ); - EditCollectionHandler::with( + EditCollectionHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::EditCollectionRootFolderPathInput, @@ -465,7 +465,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::EditCollectionPrompt.into()); app.push_navigation_stack(ActiveRadarrBlock::EditCollectionRootFolderPathInput.into()); - EditCollectionHandler::with( + EditCollectionHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditCollectionRootFolderPathInput, @@ -503,7 +503,7 @@ mod tests { .selected_block .set_index(0, EDIT_COLLECTION_SELECTION_BLOCKS.len() - 1); - EditCollectionHandler::with( + EditCollectionHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditCollectionPrompt, @@ -560,7 +560,7 @@ mod tests { .selected_block .set_index(0, EDIT_COLLECTION_SELECTION_BLOCKS.len() - 1); - EditCollectionHandler::with( + EditCollectionHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditCollectionPrompt, @@ -596,7 +596,7 @@ mod tests { .selected_block .set_index(0, EDIT_COLLECTION_SELECTION_BLOCKS.len() - 1); - EditCollectionHandler::with( + EditCollectionHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditCollectionPrompt, @@ -624,7 +624,7 @@ mod tests { BlockSelectionState::new(EDIT_COLLECTION_SELECTION_BLOCKS); app.push_navigation_stack(current_route); - EditCollectionHandler::with( + EditCollectionHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditCollectionPrompt, @@ -644,7 +644,7 @@ mod tests { Some(true) ); - EditCollectionHandler::with( + EditCollectionHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditCollectionPrompt, @@ -682,7 +682,7 @@ mod tests { .set_index(0, EDIT_COLLECTION_SELECTION_BLOCKS.len() - 2); app.push_navigation_stack(current_route); - EditCollectionHandler::with( + EditCollectionHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditCollectionPrompt, @@ -702,7 +702,7 @@ mod tests { Some(true) ); - EditCollectionHandler::with( + EditCollectionHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditCollectionPrompt, @@ -744,7 +744,7 @@ mod tests { BlockSelectionState::new(EDIT_COLLECTION_SELECTION_BLOCKS); app.data.radarr_data.selected_block.set_index(0, index); - EditCollectionHandler::with( + EditCollectionHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditCollectionPrompt, @@ -777,7 +777,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::EditCollectionPrompt.into()); app.push_navigation_stack(active_radarr_block.into()); - EditCollectionHandler::with( + EditCollectionHandler::new( SUBMIT_KEY, &mut app, active_radarr_block, @@ -815,7 +815,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::EditCollectionPrompt.into()); app.push_navigation_stack(ActiveRadarrBlock::EditCollectionRootFolderPathInput.into()); - EditCollectionHandler::with( + EditCollectionHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::EditCollectionRootFolderPathInput, @@ -837,7 +837,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::EditCollectionPrompt.into()); app.data.radarr_data = create_test_radarr_data(); - EditCollectionHandler::with( + EditCollectionHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::EditCollectionPrompt, @@ -870,7 +870,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Collections.into()); app.push_navigation_stack(active_radarr_block.into()); - EditCollectionHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle(); + EditCollectionHandler::new(ESC_KEY, &mut app, active_radarr_block, None).handle(); assert_eq!( app.get_current_route(), @@ -899,7 +899,7 @@ mod tests { ..EditCollectionModal::default() }); - EditCollectionHandler::with( + EditCollectionHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveRadarrBlock::EditCollectionRootFolderPathInput, @@ -925,7 +925,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default()); - EditCollectionHandler::with( + EditCollectionHandler::new( Key::Char('h'), &mut app, ActiveRadarrBlock::EditCollectionRootFolderPathInput, @@ -987,7 +987,7 @@ mod tests { .selected_block .set_index(0, EDIT_COLLECTION_SELECTION_BLOCKS.len() - 1); - EditCollectionHandler::with( + EditCollectionHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveRadarrBlock::EditCollectionPrompt, @@ -1051,7 +1051,7 @@ mod tests { search_on_add: Some(false), }; - let edit_collection_params = EditCollectionHandler::with( + let edit_collection_params = EditCollectionHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::EditCollectionPrompt, @@ -1068,7 +1068,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = EditCollectionHandler::with( + let handler = EditCollectionHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::EditCollectionPrompt, @@ -1083,7 +1083,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = EditCollectionHandler::with( + let handler = EditCollectionHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::EditCollectionPrompt, @@ -1099,7 +1099,7 @@ mod tests { app.is_loading = false; app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default()); - let handler = EditCollectionHandler::with( + let handler = EditCollectionHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::EditCollectionPrompt, diff --git a/src/handlers/radarr_handlers/collections/mod.rs b/src/handlers/radarr_handlers/collections/mod.rs index 265a03d..0db3edb 100644 --- a/src/handlers/radarr_handlers/collections/mod.rs +++ b/src/handlers/radarr_handlers/collections/mod.rs @@ -55,7 +55,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<' if !self.handle_collections_table_events(collections_table_handling_config) { match self.active_radarr_block { _ if CollectionDetailsHandler::accepts(self.active_radarr_block) => { - CollectionDetailsHandler::with( + CollectionDetailsHandler::new( self.key, self.app, self.active_radarr_block, @@ -64,7 +64,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<' .handle(); } _ if EditCollectionHandler::accepts(self.active_radarr_block) => { - EditCollectionHandler::with(self.key, self.app, self.active_radarr_block, self.context) + EditCollectionHandler::new(self.key, self.app, self.active_radarr_block, self.context) .handle(); } _ => self.handle_key_event(), @@ -78,7 +78,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<' || COLLECTIONS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/downloads/downloads_handler_tests.rs b/src/handlers/radarr_handlers/downloads/downloads_handler_tests.rs index 0323916..cca2e2e 100644 --- a/src/handlers/radarr_handlers/downloads/downloads_handler_tests.rs +++ b/src/handlers/radarr_handlers/downloads/downloads_handler_tests.rs @@ -28,7 +28,7 @@ mod tests { .downloads .set_items(vec![DownloadRecord::default()]); - DownloadsHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::Downloads, None).handle(); + DownloadsHandler::new(DELETE_KEY, &mut app, ActiveRadarrBlock::Downloads, None).handle(); assert_eq!( app.get_current_route(), @@ -47,7 +47,7 @@ mod tests { .downloads .set_items(vec![DownloadRecord::default()]); - DownloadsHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::Downloads, None).handle(); + DownloadsHandler::new(DELETE_KEY, &mut app, ActiveRadarrBlock::Downloads, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Downloads.into()); } @@ -65,7 +65,7 @@ mod tests { app.is_loading = is_ready; app.data.radarr_data.main_tabs.set_index(2); - DownloadsHandler::with( + DownloadsHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::Downloads, @@ -89,7 +89,7 @@ mod tests { app.is_loading = is_ready; app.data.radarr_data.main_tabs.set_index(2); - DownloadsHandler::with( + DownloadsHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::Downloads, @@ -115,11 +115,11 @@ mod tests { ) { let mut app = App::default(); - DownloadsHandler::with(key, &mut app, active_radarr_block, None).handle(); + DownloadsHandler::new(key, &mut app, active_radarr_block, None).handle(); assert!(app.data.radarr_data.prompt_confirm); - DownloadsHandler::with(key, &mut app, active_radarr_block, None).handle(); + DownloadsHandler::new(key, &mut app, active_radarr_block, None).handle(); assert!(!app.data.radarr_data.prompt_confirm); } @@ -161,7 +161,7 @@ mod tests { app.push_navigation_stack(base_route.into()); app.push_navigation_stack(prompt_block.into()); - DownloadsHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + DownloadsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(app.data.radarr_data.prompt_confirm); assert_eq!( @@ -187,7 +187,7 @@ mod tests { app.push_navigation_stack(base_route.into()); app.push_navigation_stack(prompt_block.into()); - DownloadsHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + DownloadsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(!app.data.radarr_data.prompt_confirm); assert_eq!(app.data.radarr_data.prompt_confirm_action, None); @@ -215,7 +215,7 @@ mod tests { app.push_navigation_stack(prompt_block.into()); app.data.radarr_data.prompt_confirm = true; - DownloadsHandler::with(ESC_KEY, &mut app, prompt_block, None).handle(); + DownloadsHandler::new(ESC_KEY, &mut app, prompt_block, None).handle(); assert_eq!(app.get_current_route(), base_block.into()); assert!(!app.data.radarr_data.prompt_confirm); @@ -229,7 +229,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Downloads.into()); app.push_navigation_stack(ActiveRadarrBlock::Downloads.into()); - DownloadsHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::Downloads, None).handle(); + DownloadsHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::Downloads, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Downloads.into()); assert!(app.error.text.is_empty()); @@ -253,7 +253,7 @@ mod tests { .downloads .set_items(vec![DownloadRecord::default()]); - DownloadsHandler::with( + DownloadsHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveRadarrBlock::Downloads, @@ -278,7 +278,7 @@ mod tests { .downloads .set_items(vec![DownloadRecord::default()]); - DownloadsHandler::with( + DownloadsHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveRadarrBlock::Downloads, @@ -299,7 +299,7 @@ mod tests { .set_items(vec![DownloadRecord::default()]); app.push_navigation_stack(ActiveRadarrBlock::Downloads.into()); - DownloadsHandler::with( + DownloadsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveRadarrBlock::Downloads, @@ -322,7 +322,7 @@ mod tests { .downloads .set_items(vec![DownloadRecord::default()]); - DownloadsHandler::with( + DownloadsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveRadarrBlock::Downloads, @@ -359,7 +359,7 @@ mod tests { app.push_navigation_stack(base_route.into()); app.push_navigation_stack(prompt_block.into()); - DownloadsHandler::with( + DownloadsHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, prompt_block, @@ -396,7 +396,7 @@ mod tests { .downloads .set_items(vec![download_record()]); - let download_id = DownloadsHandler::with( + let download_id = DownloadsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Downloads, @@ -412,7 +412,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = DownloadsHandler::with( + let handler = DownloadsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Downloads, @@ -427,7 +427,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = DownloadsHandler::with( + let handler = DownloadsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Downloads, @@ -447,7 +447,7 @@ mod tests { .radarr_data .downloads .set_items(vec![DownloadRecord::default()]); - let handler = DownloadsHandler::with( + let handler = DownloadsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Downloads, diff --git a/src/handlers/radarr_handlers/downloads/mod.rs b/src/handlers/radarr_handlers/downloads/mod.rs index 8a5246a..daa2480 100644 --- a/src/handlers/radarr_handlers/downloads/mod.rs +++ b/src/handlers/radarr_handlers/downloads/mod.rs @@ -47,7 +47,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DownloadsHandler<'a, DOWNLOADS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/indexers/edit_indexer_handler.rs b/src/handlers/radarr_handlers/indexers/edit_indexer_handler.rs index b197c4b..04ca108 100644 --- a/src/handlers/radarr_handlers/indexers/edit_indexer_handler.rs +++ b/src/handlers/radarr_handlers/indexers/edit_indexer_handler.rs @@ -79,7 +79,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditIndexerHandler<' EDIT_INDEXER_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/indexers/edit_indexer_handler_tests.rs b/src/handlers/radarr_handlers/indexers/edit_indexer_handler_tests.rs index cd912c4..25c667a 100644 --- a/src/handlers/radarr_handlers/indexers/edit_indexer_handler_tests.rs +++ b/src/handlers/radarr_handlers/indexers/edit_indexer_handler_tests.rs @@ -29,7 +29,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( key, &mut app, ActiveRadarrBlock::EditIndexerPriorityInput, @@ -60,7 +60,7 @@ mod tests { 0 ); - EditIndexerHandler::with( + EditIndexerHandler::new( Key::Up, &mut app, ActiveRadarrBlock::EditIndexerPriorityInput, @@ -79,7 +79,7 @@ mod tests { 1 ); - EditIndexerHandler::with( + EditIndexerHandler::new( key, &mut app, ActiveRadarrBlock::EditIndexerPriorityInput, @@ -108,7 +108,7 @@ mod tests { BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS); app.data.radarr_data.selected_block.down(); - EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); if key == Key::Up { assert_eq!( @@ -135,7 +135,7 @@ mod tests { BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS); app.data.radarr_data.selected_block.down(); - EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); assert_eq!( app.data.radarr_data.selected_block.get_active_block(), @@ -162,7 +162,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::EditIndexerNameInput, @@ -183,7 +183,7 @@ mod tests { 4 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::EditIndexerNameInput, @@ -214,7 +214,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::EditIndexerUrlInput, @@ -235,7 +235,7 @@ mod tests { 4 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::EditIndexerUrlInput, @@ -266,7 +266,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::EditIndexerApiKeyInput, @@ -287,7 +287,7 @@ mod tests { 4 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::EditIndexerApiKeyInput, @@ -318,7 +318,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::EditIndexerSeedRatioInput, @@ -339,7 +339,7 @@ mod tests { 4 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::EditIndexerSeedRatioInput, @@ -370,7 +370,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::EditIndexerTagsInput, @@ -391,7 +391,7 @@ mod tests { 4 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::EditIndexerTagsInput, @@ -436,11 +436,11 @@ mod tests { BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS); app.data.radarr_data.selected_block.y = EDIT_INDEXER_TORRENT_SELECTION_BLOCKS.len() - 1; - EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); assert!(app.data.radarr_data.prompt_confirm); - EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); assert!(!app.data.radarr_data.prompt_confirm); } @@ -483,14 +483,14 @@ mod tests { left_block ); - EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); assert_eq!( app.data.radarr_data.selected_block.get_active_block(), right_block ); - EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); assert_eq!( app.data.radarr_data.selected_block.get_active_block(), @@ -536,14 +536,14 @@ mod tests { left_block ); - EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); assert_eq!( app.data.radarr_data.selected_block.get_active_block(), right_block ); - EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); assert_eq!( app.data.radarr_data.selected_block.get_active_block(), @@ -567,14 +567,14 @@ mod tests { ActiveRadarrBlock::EditIndexerPriorityInput ); - EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); assert_eq!( app.data.radarr_data.selected_block.get_active_block(), ActiveRadarrBlock::EditIndexerConfirmPrompt ); - EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle(); assert_eq!( app.data.radarr_data.selected_block.get_active_block(), @@ -592,7 +592,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::EditIndexerNameInput, @@ -613,7 +613,7 @@ mod tests { 1 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::EditIndexerNameInput, @@ -644,7 +644,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::EditIndexerUrlInput, @@ -665,7 +665,7 @@ mod tests { 1 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::EditIndexerUrlInput, @@ -696,7 +696,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::EditIndexerApiKeyInput, @@ -717,7 +717,7 @@ mod tests { 1 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::EditIndexerApiKeyInput, @@ -748,7 +748,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::EditIndexerSeedRatioInput, @@ -769,7 +769,7 @@ mod tests { 1 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::EditIndexerSeedRatioInput, @@ -800,7 +800,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::EditIndexerTagsInput, @@ -821,7 +821,7 @@ mod tests { 1 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::EditIndexerTagsInput, @@ -873,7 +873,7 @@ mod tests { .set_index(0, EDIT_INDEXER_TORRENT_SELECTION_BLOCKS.len() - 1); app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -927,7 +927,7 @@ mod tests { }; app.data.radarr_data.prompt_confirm = true; - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -953,7 +953,7 @@ mod tests { app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); app.data.radarr_data.prompt_confirm = true; - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -993,7 +993,7 @@ mod tests { .selected_block .set_index(starting_x, starting_y); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -1015,7 +1015,7 @@ mod tests { BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS); app.data.radarr_data.selected_block.set_index(0, 4); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -1040,7 +1040,7 @@ mod tests { app.data.radarr_data.selected_block.set_index(0, 1); app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -1061,7 +1061,7 @@ mod tests { .enable_rss .unwrap()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -1093,7 +1093,7 @@ mod tests { app.data.radarr_data.selected_block.set_index(0, 2); app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -1114,7 +1114,7 @@ mod tests { .enable_automatic_search .unwrap()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -1146,7 +1146,7 @@ mod tests { app.data.radarr_data.selected_block.set_index(0, 3); app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -1167,7 +1167,7 @@ mod tests { .enable_interactive_search .unwrap()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -1201,7 +1201,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into()); app.push_navigation_stack(ActiveRadarrBlock::EditIndexerNameInput.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerNameInput, @@ -1237,7 +1237,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into()); app.push_navigation_stack(ActiveRadarrBlock::EditIndexerUrlInput.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerUrlInput, @@ -1273,7 +1273,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into()); app.push_navigation_stack(ActiveRadarrBlock::EditIndexerApiKeyInput.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerApiKeyInput, @@ -1309,7 +1309,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into()); app.push_navigation_stack(ActiveRadarrBlock::EditIndexerSeedRatioInput.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerSeedRatioInput, @@ -1345,7 +1345,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into()); app.push_navigation_stack(ActiveRadarrBlock::EditIndexerTagsInput.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditIndexerTagsInput, @@ -1388,7 +1388,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into()); app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -1419,7 +1419,7 @@ mod tests { app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); app.should_ignore_quit_key = true; - EditIndexerHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle(); + EditIndexerHandler::new(ESC_KEY, &mut app, active_radarr_block, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into()); assert!(!app.should_ignore_quit_key); @@ -1449,7 +1449,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveRadarrBlock::EditIndexerNameInput, @@ -1479,7 +1479,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveRadarrBlock::EditIndexerUrlInput, @@ -1509,7 +1509,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveRadarrBlock::EditIndexerApiKeyInput, @@ -1539,7 +1539,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveRadarrBlock::EditIndexerSeedRatioInput, @@ -1569,7 +1569,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveRadarrBlock::EditIndexerTagsInput, @@ -1596,7 +1596,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( Key::Char('h'), &mut app, ActiveRadarrBlock::EditIndexerNameInput, @@ -1623,7 +1623,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( Key::Char('h'), &mut app, ActiveRadarrBlock::EditIndexerUrlInput, @@ -1650,7 +1650,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( Key::Char('h'), &mut app, ActiveRadarrBlock::EditIndexerApiKeyInput, @@ -1677,7 +1677,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( Key::Char('h'), &mut app, ActiveRadarrBlock::EditIndexerSeedRatioInput, @@ -1704,7 +1704,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( Key::Char('h'), &mut app, ActiveRadarrBlock::EditIndexerTagsInput, @@ -1764,7 +1764,7 @@ mod tests { ..EditIndexerParams::default() }; - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -1823,7 +1823,7 @@ mod tests { ..EditIndexerParams::default() }; - let edit_indexer_params = EditIndexerHandler::with( + let edit_indexer_params = EditIndexerHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -1841,7 +1841,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); app.is_loading = true; - let handler = EditIndexerHandler::with( + let handler = EditIndexerHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -1857,7 +1857,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); app.is_loading = false; - let handler = EditIndexerHandler::with( + let handler = EditIndexerHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, @@ -1874,7 +1874,7 @@ mod tests { app.is_loading = false; app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - let handler = EditIndexerHandler::with( + let handler = EditIndexerHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, diff --git a/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler.rs b/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler.rs index b8d73ef..82b6431 100644 --- a/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler.rs +++ b/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler.rs @@ -33,7 +33,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl INDEXER_SETTINGS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs b/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs index df09b83..a3ba029 100644 --- a/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs +++ b/src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs @@ -29,7 +29,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.indexer_settings = Some(IndexerSettings::default()); - IndexerSettingsHandler::with($key, &mut app, $block, None).handle(); + IndexerSettingsHandler::new($key, &mut app, $block, None).handle(); if $key == Key::Up { assert_eq!( @@ -66,7 +66,7 @@ mod tests { 0 ); - IndexerSettingsHandler::with(Key::Up, &mut app, $block, None).handle(); + IndexerSettingsHandler::new(Key::Up, &mut app, $block, None).handle(); assert_eq!( app @@ -79,7 +79,7 @@ mod tests { 1 ); - IndexerSettingsHandler::with($key, &mut app, $block, None).handle(); + IndexerSettingsHandler::new($key, &mut app, $block, None).handle(); assert_eq!( app .data @@ -103,7 +103,7 @@ mod tests { BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS); app.data.radarr_data.selected_block.down(); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( key, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -135,7 +135,7 @@ mod tests { BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS); app.data.radarr_data.selected_block.down(); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( key, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -219,7 +219,7 @@ mod tests { ..IndexerSettings::default() }); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput, @@ -240,7 +240,7 @@ mod tests { 4 ); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput, @@ -281,7 +281,7 @@ mod tests { BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS); app.data.radarr_data.selected_block.y = INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1; - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( key, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -291,7 +291,7 @@ mod tests { assert!(app.data.radarr_data.prompt_confirm); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( key, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -339,7 +339,7 @@ mod tests { left_block ); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( key, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -352,7 +352,7 @@ mod tests { right_block ); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( key, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -374,7 +374,7 @@ mod tests { ..IndexerSettings::default() }); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput, @@ -395,7 +395,7 @@ mod tests { 1 ); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput, @@ -448,7 +448,7 @@ mod tests { .set_index(0, INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1); app.data.radarr_data.indexer_settings = Some(IndexerSettings::default()); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -477,7 +477,7 @@ mod tests { app.data.radarr_data.indexer_settings = Some(indexer_settings()); app.data.radarr_data.prompt_confirm = true; - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -503,7 +503,7 @@ mod tests { app.data.radarr_data.indexer_settings = Some(IndexerSettings::default()); app.data.radarr_data.prompt_confirm = true; - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -540,7 +540,7 @@ mod tests { .selected_block .set_index(x_index, y_index); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -567,7 +567,7 @@ mod tests { .selected_block .set_index(index.1, index.0); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -590,7 +590,7 @@ mod tests { BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS); app.data.radarr_data.selected_block.set_index(1, 2); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -614,7 +614,7 @@ mod tests { app.data.radarr_data.selected_block.set_index(0, 3); app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into()); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -636,7 +636,7 @@ mod tests { .prefer_indexer_flags ); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -668,7 +668,7 @@ mod tests { app.data.radarr_data.selected_block.set_index(1, 3); app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into()); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -690,7 +690,7 @@ mod tests { .allow_hardcoded_subs ); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -726,7 +726,7 @@ mod tests { ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput.into(), ); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput, @@ -766,7 +766,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into()); app.push_navigation_stack(active_radarr_block.into()); - IndexerSettingsHandler::with(SUBMIT_KEY, &mut app, active_radarr_block, None).handle(); + IndexerSettingsHandler::new(SUBMIT_KEY, &mut app, active_radarr_block, None).handle(); assert_eq!( app.get_current_route(), @@ -793,7 +793,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into()); app.data.radarr_data.indexer_settings = Some(IndexerSettings::default()); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -816,7 +816,7 @@ mod tests { app.data.radarr_data.indexer_settings = Some(IndexerSettings::default()); app.should_ignore_quit_key = true; - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput, @@ -849,7 +849,7 @@ mod tests { app.push_navigation_stack(active_radarr_block.into()); app.data.radarr_data.indexer_settings = Some(IndexerSettings::default()); - IndexerSettingsHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle(); + IndexerSettingsHandler::new(ESC_KEY, &mut app, active_radarr_block, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into()); assert_eq!( @@ -880,7 +880,7 @@ mod tests { ..IndexerSettings::default() }); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput, @@ -906,7 +906,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.indexer_settings = Some(IndexerSettings::default()); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( Key::Char('h'), &mut app, ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput, @@ -941,7 +941,7 @@ mod tests { .set_index(0, INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1); app.data.radarr_data.indexer_settings = Some(indexer_settings()); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -975,7 +975,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.indexer_settings = Some(indexer_settings()); - let body = IndexerSettingsHandler::with( + let body = IndexerSettingsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -992,7 +992,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = IndexerSettingsHandler::with( + let handler = IndexerSettingsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -1007,7 +1007,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = IndexerSettingsHandler::with( + let handler = IndexerSettingsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, @@ -1023,7 +1023,7 @@ mod tests { app.is_loading = false; app.data.radarr_data.indexer_settings = Some(IndexerSettings::default()); - let handler = IndexerSettingsHandler::with( + let handler = IndexerSettingsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::AllIndexerSettingsPrompt, diff --git a/src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs b/src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs index 2097e35..a4f0f1d 100644 --- a/src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs +++ b/src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs @@ -32,7 +32,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle(); + IndexersHandler::new(DELETE_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle(); assert_eq!( app.get_current_route(), @@ -51,7 +51,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle(); + IndexersHandler::new(DELETE_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into()); } @@ -69,7 +69,7 @@ mod tests { app.is_loading = is_ready; app.data.radarr_data.main_tabs.set_index(5); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::Indexers, @@ -93,7 +93,7 @@ mod tests { app.is_loading = is_ready; app.data.radarr_data.main_tabs.set_index(5); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::Indexers, @@ -114,11 +114,11 @@ mod tests { ) { let mut app = App::default(); - IndexersHandler::with(key, &mut app, ActiveRadarrBlock::DeleteIndexerPrompt, None).handle(); + IndexersHandler::new(key, &mut app, ActiveRadarrBlock::DeleteIndexerPrompt, None).handle(); assert!(app.data.radarr_data.prompt_confirm); - IndexersHandler::with(key, &mut app, ActiveRadarrBlock::DeleteIndexerPrompt, None).handle(); + IndexersHandler::new(key, &mut app, ActiveRadarrBlock::DeleteIndexerPrompt, None).handle(); assert!(!app.data.radarr_data.prompt_confirm); } @@ -194,7 +194,7 @@ mod tests { radarr_data.indexers.set_items(vec![indexer]); app.data.radarr_data = radarr_data; - IndexersHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle(); + IndexersHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle(); assert_eq!( app.get_current_route(), @@ -232,7 +232,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle(); + IndexersHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into()); assert_eq!(app.data.radarr_data.edit_indexer_modal, None); @@ -246,7 +246,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); app.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into()); - IndexersHandler::with( + IndexersHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::DeleteIndexerPrompt, @@ -273,7 +273,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); app.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into()); - IndexersHandler::with( + IndexersHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::DeleteIndexerPrompt, @@ -302,7 +302,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into()); app.data.radarr_data.prompt_confirm = true; - IndexersHandler::with( + IndexersHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::DeleteIndexerPrompt, @@ -322,7 +322,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); app.push_navigation_stack(ActiveRadarrBlock::TestIndexer.into()); - IndexersHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::TestIndexer, None).handle(); + IndexersHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::TestIndexer, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into()); assert_eq!(app.data.radarr_data.indexer_test_errors, None); @@ -336,7 +336,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); - IndexersHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle(); + IndexersHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into()); assert!(app.error.text.is_empty()); @@ -363,7 +363,7 @@ mod tests { .set_items(vec![Indexer::default()]); app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveRadarrBlock::Indexers, @@ -386,7 +386,7 @@ mod tests { .set_items(vec![Indexer::default()]); app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveRadarrBlock::Indexers, @@ -407,7 +407,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.settings.key, &mut app, ActiveRadarrBlock::Indexers, @@ -436,7 +436,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.settings.key, &mut app, ActiveRadarrBlock::Indexers, @@ -456,7 +456,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.test.key, &mut app, ActiveRadarrBlock::Indexers, @@ -481,7 +481,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.test.key, &mut app, ActiveRadarrBlock::Indexers, @@ -501,7 +501,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.test_all.key, &mut app, ActiveRadarrBlock::Indexers, @@ -526,7 +526,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.test_all.key, &mut app, ActiveRadarrBlock::Indexers, @@ -544,7 +544,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Indexers.into()); app.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into()); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveRadarrBlock::DeleteIndexerPrompt, @@ -638,7 +638,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.indexers.set_items(vec![indexer()]); - let indexer_id = IndexersHandler::with( + let indexer_id = IndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Indexers, @@ -654,7 +654,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = IndexersHandler::with( + let handler = IndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Indexers, @@ -669,7 +669,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = IndexersHandler::with( + let handler = IndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Indexers, @@ -689,7 +689,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - let handler = IndexersHandler::with( + let handler = IndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Indexers, diff --git a/src/handlers/radarr_handlers/indexers/mod.rs b/src/handlers/radarr_handlers/indexers/mod.rs index 7d64f53..15b7078 100644 --- a/src/handlers/radarr_handlers/indexers/mod.rs +++ b/src/handlers/radarr_handlers/indexers/mod.rs @@ -47,15 +47,15 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a, if !self.handle_indexers_table_events(indexer_table_handling_config) { match self.active_radarr_block { _ if EditIndexerHandler::accepts(self.active_radarr_block) => { - EditIndexerHandler::with(self.key, self.app, self.active_radarr_block, self.context) + EditIndexerHandler::new(self.key, self.app, self.active_radarr_block, self.context) .handle() } _ if IndexerSettingsHandler::accepts(self.active_radarr_block) => { - IndexerSettingsHandler::with(self.key, self.app, self.active_radarr_block, self.context) + IndexerSettingsHandler::new(self.key, self.app, self.active_radarr_block, self.context) .handle() } _ if TestAllIndexersHandler::accepts(self.active_radarr_block) => { - TestAllIndexersHandler::with(self.key, self.app, self.active_radarr_block, self.context) + TestAllIndexersHandler::new(self.key, self.app, self.active_radarr_block, self.context) .handle() } _ => self.handle_key_event(), @@ -70,7 +70,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a, || INDEXERS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/indexers/test_all_indexers_handler.rs b/src/handlers/radarr_handlers/indexers/test_all_indexers_handler.rs index 1b4297e..2aa96d8 100644 --- a/src/handlers/radarr_handlers/indexers/test_all_indexers_handler.rs +++ b/src/handlers/radarr_handlers/indexers/test_all_indexers_handler.rs @@ -48,7 +48,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for TestAllIndexersHandl active_block == ActiveRadarrBlock::TestAllIndexers } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/indexers/test_all_indexers_handler_tests.rs b/src/handlers/radarr_handlers/indexers/test_all_indexers_handler_tests.rs index 31a93d7..866b7de 100644 --- a/src/handlers/radarr_handlers/indexers/test_all_indexers_handler_tests.rs +++ b/src/handlers/radarr_handlers/indexers/test_all_indexers_handler_tests.rs @@ -23,7 +23,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::TestAllIndexers.into()); app.data.radarr_data.indexer_test_all_results = Some(StatefulTable::default()); - TestAllIndexersHandler::with( + TestAllIndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::TestAllIndexers, @@ -53,7 +53,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = TestAllIndexersHandler::with( + let handler = TestAllIndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::TestAllIndexers, @@ -68,7 +68,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = TestAllIndexersHandler::with( + let handler = TestAllIndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::TestAllIndexers, @@ -84,7 +84,7 @@ mod tests { app.is_loading = false; app.data.radarr_data.indexer_test_all_results = Some(StatefulTable::default()); - let handler = TestAllIndexersHandler::with( + let handler = TestAllIndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::TestAllIndexers, @@ -102,7 +102,7 @@ mod tests { indexer_test_results.set_items(vec![IndexerTestResultModalItem::default()]); app.data.radarr_data.indexer_test_all_results = Some(indexer_test_results); - let handler = TestAllIndexersHandler::with( + let handler = TestAllIndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::TestAllIndexers, diff --git a/src/handlers/radarr_handlers/library/add_movie_handler.rs b/src/handlers/radarr_handlers/library/add_movie_handler.rs index 586b5f9..34ee87d 100644 --- a/src/handlers/radarr_handlers/library/add_movie_handler.rs +++ b/src/handlers/radarr_handlers/library/add_movie_handler.rs @@ -139,7 +139,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a, ADD_MOVIE_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/library/add_movie_handler_tests.rs b/src/handlers/radarr_handlers/library/add_movie_handler_tests.rs index 0075b84..ec4cf48 100644 --- a/src/handlers/radarr_handlers/library/add_movie_handler_tests.rs +++ b/src/handlers/radarr_handlers/library/add_movie_handler_tests.rs @@ -50,7 +50,7 @@ mod tests { if key == Key::Up { for i in (0..monitor_vec.len()).rev() { - AddMovieHandler::with( + AddMovieHandler::new( key, &mut app, ActiveRadarrBlock::AddMovieSelectMonitor, @@ -72,7 +72,7 @@ mod tests { } } else { for i in 0..monitor_vec.len() { - AddMovieHandler::with( + AddMovieHandler::new( key, &mut app, ActiveRadarrBlock::AddMovieSelectMonitor, @@ -113,7 +113,7 @@ mod tests { if key == Key::Up { for i in (0..minimum_availability_vec.len()).rev() { - AddMovieHandler::with( + AddMovieHandler::new( key, &mut app, ActiveRadarrBlock::AddMovieSelectMinimumAvailability, @@ -135,7 +135,7 @@ mod tests { } } else { for i in 0..minimum_availability_vec.len() { - AddMovieHandler::with( + AddMovieHandler::new( key, &mut app, ActiveRadarrBlock::AddMovieSelectMinimumAvailability, @@ -173,7 +173,7 @@ mod tests { .quality_profile_list .set_items(vec!["Test 1".to_owned(), "Test 2".to_owned()]); - AddMovieHandler::with( + AddMovieHandler::new( key, &mut app, ActiveRadarrBlock::AddMovieSelectQualityProfile, @@ -193,7 +193,7 @@ mod tests { "Test 2" ); - AddMovieHandler::with( + AddMovieHandler::new( key, &mut app, ActiveRadarrBlock::AddMovieSelectQualityProfile, @@ -229,7 +229,7 @@ mod tests { .root_folder_list .set_items(simple_stateful_iterable_vec!(RootFolder, String, path)); - AddMovieHandler::with( + AddMovieHandler::new( key, &mut app, ActiveRadarrBlock::AddMovieSelectRootFolder, @@ -250,7 +250,7 @@ mod tests { "Test 2" ); - AddMovieHandler::with( + AddMovieHandler::new( key, &mut app, ActiveRadarrBlock::AddMovieSelectRootFolder, @@ -278,7 +278,7 @@ mod tests { app.data.radarr_data.selected_block = BlockSelectionState::new(ADD_MOVIE_SELECTION_BLOCKS); app.data.radarr_data.selected_block.down(); - AddMovieHandler::with(key, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle(); + AddMovieHandler::new(key, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle(); if key == Key::Up { assert_eq!( @@ -300,7 +300,7 @@ mod tests { app.data.radarr_data.selected_block = BlockSelectionState::new(ADD_MOVIE_SELECTION_BLOCKS); app.data.radarr_data.selected_block.down(); - AddMovieHandler::with(key, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle(); + AddMovieHandler::new(key, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle(); assert_eq!( app.data.radarr_data.selected_block.get_active_block(), @@ -333,7 +333,7 @@ mod tests { .monitor_list .set_items(monitor_vec.clone()); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::AddMovieSelectMonitor, @@ -353,7 +353,7 @@ mod tests { &monitor_vec[monitor_vec.len() - 1] ); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::AddMovieSelectMonitor, @@ -388,7 +388,7 @@ mod tests { .minimum_availability_list .set_items(minimum_availability_vec.clone()); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::AddMovieSelectMinimumAvailability, @@ -408,7 +408,7 @@ mod tests { &minimum_availability_vec[minimum_availability_vec.len() - 1] ); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::AddMovieSelectMinimumAvailability, @@ -446,7 +446,7 @@ mod tests { "Test 3".to_owned(), ]); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::AddMovieSelectQualityProfile, @@ -466,7 +466,7 @@ mod tests { "Test 3" ); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::AddMovieSelectQualityProfile, @@ -500,7 +500,7 @@ mod tests { .root_folder_list .set_items(extended_stateful_iterable_vec!(RootFolder, String, path)); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::AddMovieSelectRootFolder, @@ -521,7 +521,7 @@ mod tests { "Test 3" ); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::AddMovieSelectRootFolder, @@ -548,7 +548,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.add_movie_search = Some("Test".into()); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::AddMovieSearchInput, @@ -568,7 +568,7 @@ mod tests { 4 ); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::AddMovieSearchInput, @@ -597,7 +597,7 @@ mod tests { ..AddMovieModal::default() }); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::AddMovieTagsInput, @@ -618,7 +618,7 @@ mod tests { 4 ); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::AddMovieTagsInput, @@ -653,11 +653,11 @@ mod tests { fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) { let mut app = App::default(); - AddMovieHandler::with(key, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle(); + AddMovieHandler::new(key, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle(); assert!(app.data.radarr_data.prompt_confirm); - AddMovieHandler::with(key, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle(); + AddMovieHandler::new(key, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle(); assert!(!app.data.radarr_data.prompt_confirm); } @@ -667,7 +667,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.add_movie_search = Some("Test".into()); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::AddMovieSearchInput, @@ -687,7 +687,7 @@ mod tests { 1 ); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::AddMovieSearchInput, @@ -716,7 +716,7 @@ mod tests { ..AddMovieModal::default() }); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::AddMovieTagsInput, @@ -737,7 +737,7 @@ mod tests { 1 ); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::AddMovieTagsInput, @@ -785,7 +785,7 @@ mod tests { app.should_ignore_quit_key = true; app.data.radarr_data.add_movie_search = Some("test".into()); - AddMovieHandler::with( + AddMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AddMovieSearchInput, @@ -807,7 +807,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchInput.into()); app.should_ignore_quit_key = true; - AddMovieHandler::with( + AddMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AddMovieSearchInput, @@ -831,7 +831,7 @@ mod tests { app.data.radarr_data.quality_profile_map = BiMap::from_iter([(1, "B - Test 2".to_owned()), (0, "A - Test 1".to_owned())]); - AddMovieHandler::with( + AddMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AddMovieSearchResults, @@ -896,7 +896,7 @@ mod tests { let mut add_searched_movies = StatefulTable::default(); add_searched_movies.set_items(vec![AddMovieSearchResult::default()]); - AddMovieHandler::with( + AddMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AddMovieSearchResults, @@ -915,7 +915,7 @@ mod tests { fn test_add_movie_search_results_submit_does_nothing_on_empty_table() { let mut app = App::default(); app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchResults.into()); - AddMovieHandler::with( + AddMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AddMovieSearchResults, @@ -941,7 +941,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - AddMovieHandler::with( + AddMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AddMovieSearchResults, @@ -967,7 +967,7 @@ mod tests { .selected_block .set_index(0, ADD_MOVIE_SELECTION_BLOCKS.len() - 1); - AddMovieHandler::with( + AddMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AddMoviePrompt, @@ -1041,7 +1041,7 @@ mod tests { None }; - AddMovieHandler::with( + AddMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AddMoviePrompt, @@ -1078,7 +1078,7 @@ mod tests { app.data.radarr_data.selected_block = BlockSelectionState::new(ADD_MOVIE_SELECTION_BLOCKS); app.data.radarr_data.selected_block.set_index(0, y_index); - AddMovieHandler::with( + AddMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AddMoviePrompt, @@ -1112,7 +1112,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into()); app.push_navigation_stack(active_radarr_block.into()); - AddMovieHandler::with( + AddMovieHandler::new( SUBMIT_KEY, &mut app, active_radarr_block, @@ -1152,7 +1152,7 @@ mod tests { app.should_ignore_quit_key = true; app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchInput.into()); - AddMovieHandler::with( + AddMovieHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::AddMovieSearchInput, @@ -1173,7 +1173,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into()); app.push_navigation_stack(ActiveRadarrBlock::AddMovieTagsInput.into()); - AddMovieHandler::with( + AddMovieHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::AddMovieTagsInput, @@ -1206,7 +1206,7 @@ mod tests { )); app.data.radarr_data.add_searched_movies = Some(add_searched_movies); - AddMovieHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle(); + AddMovieHandler::new(ESC_KEY, &mut app, active_radarr_block, None).handle(); assert_eq!( app.get_current_route(), @@ -1223,7 +1223,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchResults.into()); app.push_navigation_stack(ActiveRadarrBlock::AddMovieAlreadyInLibrary.into()); - AddMovieHandler::with( + AddMovieHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::AddMovieAlreadyInLibrary, @@ -1245,7 +1245,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchResults.into()); app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into()); - AddMovieHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle(); + AddMovieHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::AddMoviePrompt, None).handle(); assert!(!app.data.radarr_data.prompt_confirm); assert_eq!( @@ -1263,7 +1263,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into()); app.push_navigation_stack(ActiveRadarrBlock::AddMovieTagsInput.into()); - AddMovieHandler::with( + AddMovieHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::AddMovieTagsInput, @@ -1304,7 +1304,7 @@ mod tests { .into(), ); - AddMovieHandler::with( + AddMovieHandler::new( ESC_KEY, &mut app, active_radarr_block, @@ -1346,7 +1346,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.add_movie_search = Some("Test".into()); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveRadarrBlock::AddMovieSearchInput, @@ -1368,7 +1368,7 @@ mod tests { ..AddMovieModal::default() }); - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveRadarrBlock::AddMovieTagsInput, @@ -1394,7 +1394,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.add_movie_search = Some(HorizontallyScrollableText::default()); - AddMovieHandler::with( + AddMovieHandler::new( Key::Char('h'), &mut app, ActiveRadarrBlock::AddMovieSearchInput, @@ -1413,7 +1413,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.add_movie_modal = Some(AddMovieModal::default()); - AddMovieHandler::with( + AddMovieHandler::new( Key::Char('h'), &mut app, ActiveRadarrBlock::AddMovieTagsInput, @@ -1495,7 +1495,7 @@ mod tests { None }; - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveRadarrBlock::AddMoviePrompt, @@ -1528,7 +1528,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.add_searched_movies = None; - AddMovieHandler::with( + AddMovieHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::AddMovieSearchResults, @@ -1586,7 +1586,7 @@ mod tests { None }; - let actual_add_movie_body = AddMovieHandler::with( + let actual_add_movie_body = AddMovieHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveRadarrBlock::AddMoviePrompt, @@ -1602,7 +1602,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = AddMovieHandler::with( + let handler = AddMovieHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::AddMoviePrompt, @@ -1617,7 +1617,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = AddMovieHandler::with( + let handler = AddMovieHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::AddMoviePrompt, diff --git a/src/handlers/radarr_handlers/library/delete_movie_handler.rs b/src/handlers/radarr_handlers/library/delete_movie_handler.rs index be44f50..4ac994c 100644 --- a/src/handlers/radarr_handlers/library/delete_movie_handler.rs +++ b/src/handlers/radarr_handlers/library/delete_movie_handler.rs @@ -37,7 +37,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for DeleteMovieHandler<' DELETE_MOVIE_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs b/src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs index b267aba..b127720 100644 --- a/src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs +++ b/src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs @@ -27,7 +27,7 @@ mod tests { app.data.radarr_data.selected_block = BlockSelectionState::new(DELETE_MOVIE_SELECTION_BLOCKS); app.data.radarr_data.selected_block.down(); - DeleteMovieHandler::with(key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, None).handle(); + DeleteMovieHandler::new(key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, None).handle(); if key == Key::Up { assert_eq!( @@ -51,7 +51,7 @@ mod tests { app.data.radarr_data.selected_block = BlockSelectionState::new(DELETE_MOVIE_SELECTION_BLOCKS); app.data.radarr_data.selected_block.down(); - DeleteMovieHandler::with(key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, None).handle(); + DeleteMovieHandler::new(key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, None).handle(); assert_eq!( app.data.radarr_data.selected_block.get_active_block(), @@ -69,11 +69,11 @@ mod tests { fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) { let mut app = App::default(); - DeleteMovieHandler::with(key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, None).handle(); + DeleteMovieHandler::new(key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, None).handle(); assert!(app.data.radarr_data.prompt_confirm); - DeleteMovieHandler::with(key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, None).handle(); + DeleteMovieHandler::new(key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, None).handle(); assert!(!app.data.radarr_data.prompt_confirm); } @@ -104,7 +104,7 @@ mod tests { app.data.radarr_data.delete_movie_files = true; app.data.radarr_data.add_list_exclusion = true; - DeleteMovieHandler::with( + DeleteMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, @@ -140,7 +140,7 @@ mod tests { .selected_block .set_index(0, DELETE_MOVIE_SELECTION_BLOCKS.len() - 1); - DeleteMovieHandler::with( + DeleteMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, @@ -169,7 +169,7 @@ mod tests { app.data.radarr_data.delete_movie_files = true; app.data.radarr_data.add_list_exclusion = true; - DeleteMovieHandler::with( + DeleteMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, @@ -195,7 +195,7 @@ mod tests { app.data.radarr_data.selected_block = BlockSelectionState::new(DELETE_MOVIE_SELECTION_BLOCKS); app.push_navigation_stack(ActiveRadarrBlock::DeleteMoviePrompt.into()); - DeleteMovieHandler::with( + DeleteMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, @@ -206,7 +206,7 @@ mod tests { assert_eq!(app.get_current_route(), current_route); assert_eq!(app.data.radarr_data.delete_movie_files, true); - DeleteMovieHandler::with( + DeleteMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, @@ -236,7 +236,7 @@ mod tests { app.data.radarr_data.delete_movie_files = true; app.data.radarr_data.add_list_exclusion = true; - DeleteMovieHandler::with( + DeleteMovieHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, @@ -282,7 +282,7 @@ mod tests { .selected_block .set_index(0, DELETE_MOVIE_SELECTION_BLOCKS.len() - 1); - DeleteMovieHandler::with( + DeleteMovieHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, @@ -325,7 +325,7 @@ mod tests { add_list_exclusion: true, }; - let delete_movie_params = DeleteMovieHandler::with( + let delete_movie_params = DeleteMovieHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, @@ -343,7 +343,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = DeleteMovieHandler::with( + let handler = DeleteMovieHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, @@ -358,7 +358,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = DeleteMovieHandler::with( + let handler = DeleteMovieHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::DeleteMoviePrompt, diff --git a/src/handlers/radarr_handlers/library/edit_movie_handler.rs b/src/handlers/radarr_handlers/library/edit_movie_handler.rs index 47ce109..3dc167c 100644 --- a/src/handlers/radarr_handlers/library/edit_movie_handler.rs +++ b/src/handlers/radarr_handlers/library/edit_movie_handler.rs @@ -76,7 +76,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditMovieHandler<'a, EDIT_MOVIE_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/library/edit_movie_handler_tests.rs b/src/handlers/radarr_handlers/library/edit_movie_handler_tests.rs index 1e3bf48..478ff37 100644 --- a/src/handlers/radarr_handlers/library/edit_movie_handler_tests.rs +++ b/src/handlers/radarr_handlers/library/edit_movie_handler_tests.rs @@ -43,7 +43,7 @@ mod tests { if key == Key::Up { for i in (0..minimum_availability_vec.len()).rev() { - EditMovieHandler::with( + EditMovieHandler::new( key, &mut app, ActiveRadarrBlock::EditMovieSelectMinimumAvailability, @@ -65,7 +65,7 @@ mod tests { } } else { for i in 0..minimum_availability_vec.len() { - EditMovieHandler::with( + EditMovieHandler::new( key, &mut app, ActiveRadarrBlock::EditMovieSelectMinimumAvailability, @@ -103,7 +103,7 @@ mod tests { .quality_profile_list .set_items(vec!["Test 1".to_owned(), "Test 2".to_owned()]); - EditMovieHandler::with( + EditMovieHandler::new( key, &mut app, ActiveRadarrBlock::EditMovieSelectQualityProfile, @@ -123,7 +123,7 @@ mod tests { "Test 2" ); - EditMovieHandler::with( + EditMovieHandler::new( key, &mut app, ActiveRadarrBlock::EditMovieSelectQualityProfile, @@ -151,7 +151,7 @@ mod tests { app.data.radarr_data.selected_block = BlockSelectionState::new(EDIT_MOVIE_SELECTION_BLOCKS); app.data.radarr_data.selected_block.down(); - EditMovieHandler::with(key, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle(); + EditMovieHandler::new(key, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle(); if key == Key::Up { assert_eq!( @@ -174,7 +174,7 @@ mod tests { app.data.radarr_data.selected_block = BlockSelectionState::new(EDIT_MOVIE_SELECTION_BLOCKS); app.data.radarr_data.selected_block.down(); - EditMovieHandler::with(key, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle(); + EditMovieHandler::new(key, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle(); assert_eq!( app.data.radarr_data.selected_block.get_active_block(), @@ -206,7 +206,7 @@ mod tests { .minimum_availability_list .set_items(minimum_availability_vec.clone()); - EditMovieHandler::with( + EditMovieHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::EditMovieSelectMinimumAvailability, @@ -226,7 +226,7 @@ mod tests { &minimum_availability_vec[minimum_availability_vec.len() - 1] ); - EditMovieHandler::with( + EditMovieHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::EditMovieSelectMinimumAvailability, @@ -264,7 +264,7 @@ mod tests { "Test 3".to_owned(), ]); - EditMovieHandler::with( + EditMovieHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::EditMovieSelectQualityProfile, @@ -284,7 +284,7 @@ mod tests { "Test 3" ); - EditMovieHandler::with( + EditMovieHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::EditMovieSelectQualityProfile, @@ -313,7 +313,7 @@ mod tests { ..EditMovieModal::default() }); - EditMovieHandler::with( + EditMovieHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::EditMoviePathInput, @@ -334,7 +334,7 @@ mod tests { 4 ); - EditMovieHandler::with( + EditMovieHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::EditMoviePathInput, @@ -364,7 +364,7 @@ mod tests { ..EditMovieModal::default() }); - EditMovieHandler::with( + EditMovieHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::EditMovieTagsInput, @@ -385,7 +385,7 @@ mod tests { 4 ); - EditMovieHandler::with( + EditMovieHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::EditMovieTagsInput, @@ -420,11 +420,11 @@ mod tests { fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) { let mut app = App::default(); - EditMovieHandler::with(key, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle(); + EditMovieHandler::new(key, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle(); assert!(app.data.radarr_data.prompt_confirm); - EditMovieHandler::with(key, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle(); + EditMovieHandler::new(key, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle(); assert!(!app.data.radarr_data.prompt_confirm); } @@ -437,7 +437,7 @@ mod tests { ..EditMovieModal::default() }); - EditMovieHandler::with( + EditMovieHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::EditMoviePathInput, @@ -458,7 +458,7 @@ mod tests { 1 ); - EditMovieHandler::with( + EditMovieHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::EditMoviePathInput, @@ -488,7 +488,7 @@ mod tests { ..EditMovieModal::default() }); - EditMovieHandler::with( + EditMovieHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::EditMovieTagsInput, @@ -509,7 +509,7 @@ mod tests { 1 ); - EditMovieHandler::with( + EditMovieHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::EditMovieTagsInput, @@ -556,7 +556,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into()); app.push_navigation_stack(ActiveRadarrBlock::EditMoviePathInput.into()); - EditMovieHandler::with( + EditMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditMoviePathInput, @@ -591,7 +591,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into()); app.push_navigation_stack(ActiveRadarrBlock::EditMoviePathInput.into()); - EditMovieHandler::with( + EditMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditMovieTagsInput, @@ -628,7 +628,7 @@ mod tests { .selected_block .set_index(0, EDIT_MOVIE_SELECTION_BLOCKS.len() - 1); - EditMovieHandler::with( + EditMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditMoviePrompt, @@ -681,7 +681,7 @@ mod tests { .selected_block .set_index(0, EDIT_MOVIE_SELECTION_BLOCKS.len() - 1); - EditMovieHandler::with( + EditMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditMoviePrompt, @@ -707,7 +707,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into()); app.data.radarr_data.prompt_confirm = true; - EditMovieHandler::with( + EditMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditMoviePrompt, @@ -734,7 +734,7 @@ mod tests { app.data.radarr_data.selected_block = BlockSelectionState::new(EDIT_MOVIE_SELECTION_BLOCKS); app.push_navigation_stack(current_route); - EditMovieHandler::with( + EditMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditMoviePrompt, @@ -754,7 +754,7 @@ mod tests { Some(true) ); - EditMovieHandler::with( + EditMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditMoviePrompt, @@ -796,7 +796,7 @@ mod tests { app.data.radarr_data.selected_block = BlockSelectionState::new(EDIT_MOVIE_SELECTION_BLOCKS); app.data.radarr_data.selected_block.set_index(0, y_index); - EditMovieHandler::with( + EditMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditMoviePrompt, @@ -834,7 +834,7 @@ mod tests { app.data.radarr_data.selected_block = BlockSelectionState::new(EDIT_MOVIE_SELECTION_BLOCKS); app.data.radarr_data.selected_block.set_index(0, y_index); - EditMovieHandler::with( + EditMovieHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::EditMoviePrompt, @@ -869,7 +869,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into()); app.push_navigation_stack(active_radarr_block.into()); - EditMovieHandler::with( + EditMovieHandler::new( SUBMIT_KEY, &mut app, active_radarr_block, @@ -915,7 +915,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into()); app.push_navigation_stack(active_radarr_block.into()); - EditMovieHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle(); + EditMovieHandler::new(ESC_KEY, &mut app, active_radarr_block, None).handle(); assert!(!app.should_ignore_quit_key); assert_eq!( @@ -931,7 +931,7 @@ mod tests { app.data.radarr_data = create_test_radarr_data(); app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default()); - EditMovieHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle(); + EditMovieHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::EditMoviePrompt, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into()); @@ -953,7 +953,7 @@ mod tests { app.data.radarr_data = create_test_radarr_data(); app.push_navigation_stack(active_radarr_block.into()); - EditMovieHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle(); + EditMovieHandler::new(ESC_KEY, &mut app, active_radarr_block, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into()); } @@ -977,7 +977,7 @@ mod tests { ..EditMovieModal::default() }); - EditMovieHandler::with( + EditMovieHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveRadarrBlock::EditMoviePathInput, @@ -1006,7 +1006,7 @@ mod tests { ..EditMovieModal::default() }); - EditMovieHandler::with( + EditMovieHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveRadarrBlock::EditMovieTagsInput, @@ -1032,7 +1032,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default()); - EditMovieHandler::with( + EditMovieHandler::new( Key::Char('h'), &mut app, ActiveRadarrBlock::EditMoviePathInput, @@ -1058,7 +1058,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default()); - EditMovieHandler::with( + EditMovieHandler::new( Key::Char('h'), &mut app, ActiveRadarrBlock::EditMovieTagsInput, @@ -1119,7 +1119,7 @@ mod tests { .selected_block .set_index(0, EDIT_MOVIE_SELECTION_BLOCKS.len() - 1); - EditMovieHandler::with( + EditMovieHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveRadarrBlock::EditMoviePrompt, @@ -1180,7 +1180,7 @@ mod tests { ..EditMovieParams::default() }; - let edit_movie_params = EditMovieHandler::with( + let edit_movie_params = EditMovieHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::EditMoviePrompt, @@ -1197,7 +1197,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = EditMovieHandler::with( + let handler = EditMovieHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::EditMoviePrompt, @@ -1212,7 +1212,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = EditMovieHandler::with( + let handler = EditMovieHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::EditMoviePrompt, @@ -1228,7 +1228,7 @@ mod tests { app.is_loading = false; app.data.radarr_data.edit_movie_modal = Some(EditMovieModal::default()); - let handler = EditMovieHandler::with( + let handler = EditMovieHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::EditMoviePrompt, diff --git a/src/handlers/radarr_handlers/library/library_handler_tests.rs b/src/handlers/radarr_handlers/library/library_handler_tests.rs index 7999519..ea62099 100644 --- a/src/handlers/radarr_handlers/library/library_handler_tests.rs +++ b/src/handlers/radarr_handlers/library/library_handler_tests.rs @@ -60,7 +60,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - LibraryHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::Movies, None).handle(); + LibraryHandler::new(DELETE_KEY, &mut app, ActiveRadarrBlock::Movies, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into()); } @@ -78,7 +78,7 @@ mod tests { app.is_loading = is_ready; app.data.radarr_data.main_tabs.set_index(0); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::Movies, @@ -99,7 +99,7 @@ mod tests { app.is_loading = is_ready; app.data.radarr_data.main_tabs.set_index(0); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::Movies, @@ -123,7 +123,7 @@ mod tests { ) { let mut app = App::default(); - LibraryHandler::with( + LibraryHandler::new( key, &mut app, ActiveRadarrBlock::UpdateAllMoviesPrompt, @@ -133,7 +133,7 @@ mod tests { assert!(app.data.radarr_data.prompt_confirm); - LibraryHandler::with( + LibraryHandler::new( key, &mut app, ActiveRadarrBlock::UpdateAllMoviesPrompt, @@ -163,7 +163,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - LibraryHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Movies, None).handle(); + LibraryHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Movies, None).handle(); assert_eq!( app.get_current_route(), @@ -182,7 +182,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - LibraryHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Movies, None).handle(); + LibraryHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Movies, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into()); } @@ -199,7 +199,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Movies.into()); app.push_navigation_stack(ActiveRadarrBlock::UpdateAllMoviesPrompt.into()); - LibraryHandler::with( + LibraryHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::UpdateAllMoviesPrompt, @@ -226,7 +226,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Movies.into()); app.push_navigation_stack(ActiveRadarrBlock::UpdateAllMoviesPrompt.into()); - LibraryHandler::with( + LibraryHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::UpdateAllMoviesPrompt, @@ -258,7 +258,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::UpdateAllMoviesPrompt.into()); app.data.radarr_data.prompt_confirm = true; - LibraryHandler::with( + LibraryHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::UpdateAllMoviesPrompt, @@ -286,7 +286,7 @@ mod tests { ..StatefulTable::default() }; - LibraryHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::Movies, None).handle(); + LibraryHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::Movies, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into()); assert!(app.error.text.is_empty()); @@ -319,7 +319,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.add.key, &mut app, ActiveRadarrBlock::Movies, @@ -346,7 +346,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.add.key, &mut app, ActiveRadarrBlock::Movies, @@ -379,7 +379,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.edit.key, &mut app, ActiveRadarrBlock::Movies, @@ -400,7 +400,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveRadarrBlock::Movies, @@ -425,7 +425,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveRadarrBlock::Movies, @@ -446,7 +446,7 @@ mod tests { .set_items(vec![Movie::default()]); app.push_navigation_stack(ActiveRadarrBlock::Movies.into()); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveRadarrBlock::Movies, @@ -469,7 +469,7 @@ mod tests { .set_items(vec![Movie::default()]); app.push_navigation_stack(ActiveRadarrBlock::Movies.into()); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveRadarrBlock::Movies, @@ -492,7 +492,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Movies.into()); app.push_navigation_stack(ActiveRadarrBlock::UpdateAllMoviesPrompt.into()); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveRadarrBlock::UpdateAllMoviesPrompt, @@ -782,7 +782,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = LibraryHandler::with( + let handler = LibraryHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Movies, @@ -797,7 +797,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = LibraryHandler::with( + let handler = LibraryHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Movies, @@ -817,7 +817,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - let handler = LibraryHandler::with( + let handler = LibraryHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Movies, diff --git a/src/handlers/radarr_handlers/library/mod.rs b/src/handlers/radarr_handlers/library/mod.rs index d116e17..301b521 100644 --- a/src/handlers/radarr_handlers/library/mod.rs +++ b/src/handlers/radarr_handlers/library/mod.rs @@ -54,19 +54,19 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, ' if !self.handle_movies_table_events(movie_table_handling_config) { match self.active_radarr_block { _ if AddMovieHandler::accepts(self.active_radarr_block) => { - AddMovieHandler::with(self.key, self.app, self.active_radarr_block, self.context) + AddMovieHandler::new(self.key, self.app, self.active_radarr_block, self.context) .handle(); } _ if DeleteMovieHandler::accepts(self.active_radarr_block) => { - DeleteMovieHandler::with(self.key, self.app, self.active_radarr_block, self.context) + DeleteMovieHandler::new(self.key, self.app, self.active_radarr_block, self.context) .handle(); } _ if EditMovieHandler::accepts(self.active_radarr_block) => { - EditMovieHandler::with(self.key, self.app, self.active_radarr_block, self.context) + EditMovieHandler::new(self.key, self.app, self.active_radarr_block, self.context) .handle(); } _ if MovieDetailsHandler::accepts(self.active_radarr_block) => { - MovieDetailsHandler::with(self.key, self.app, self.active_radarr_block, self.context) + MovieDetailsHandler::new(self.key, self.app, self.active_radarr_block, self.context) .handle(); } _ => self.handle_key_event(), @@ -82,7 +82,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, ' || LIBRARY_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/library/movie_details_handler.rs b/src/handlers/radarr_handlers/library/movie_details_handler.rs index a379952..8b740b4 100644 --- a/src/handlers/radarr_handlers/library/movie_details_handler.rs +++ b/src/handlers/radarr_handlers/library/movie_details_handler.rs @@ -136,7 +136,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler< MOVIE_DETAILS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/library/movie_details_handler_tests.rs b/src/handlers/radarr_handlers/library/movie_details_handler_tests.rs index 66f321d..2a686c5 100644 --- a/src/handlers/radarr_handlers/library/movie_details_handler_tests.rs +++ b/src/handlers/radarr_handlers/library/movie_details_handler_tests.rs @@ -37,7 +37,7 @@ mod tests { ..MovieDetailsModal::default() }); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.up.key, &mut app, ActiveRadarrBlock::MovieDetails, @@ -57,7 +57,7 @@ mod tests { 0 ); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.down.key, &mut app, ActiveRadarrBlock::MovieDetails, @@ -87,7 +87,7 @@ mod tests { ..MovieDetailsModal::default() }); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.up.key, &mut app, ActiveRadarrBlock::MovieDetails, @@ -107,7 +107,7 @@ mod tests { 0 ); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.down.key, &mut app, ActiveRadarrBlock::MovieDetails, @@ -144,7 +144,7 @@ mod tests { }; app.data.radarr_data.movie_details_modal = Some(movie_details_modal); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::MovieDetails, @@ -164,7 +164,7 @@ mod tests { 1 ); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::MovieDetails, @@ -195,7 +195,7 @@ mod tests { }; app.data.radarr_data.movie_details_modal = Some(movie_details_modal); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::MovieDetails, @@ -215,7 +215,7 @@ mod tests { 0 ); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::MovieDetails, @@ -255,11 +255,11 @@ mod tests { ) { let mut app = App::default(); - MovieDetailsHandler::with(key, &mut app, active_radarr_block, None).handle(); + MovieDetailsHandler::new(key, &mut app, active_radarr_block, None).handle(); assert!(app.data.radarr_data.prompt_confirm); - MovieDetailsHandler::with(key, &mut app, active_radarr_block, None).handle(); + MovieDetailsHandler::new(key, &mut app, active_radarr_block, None).handle(); assert!(!app.data.radarr_data.prompt_confirm); } @@ -288,7 +288,7 @@ mod tests { .position(|tab_route| tab_route.route == right_block.into()) .unwrap_or_default(); - MovieDetailsHandler::with(DEFAULT_KEYBINDINGS.left.key, &mut app, right_block, None).handle(); + MovieDetailsHandler::new(DEFAULT_KEYBINDINGS.left.key, &mut app, right_block, None).handle(); assert_eq!( app.get_current_route(), @@ -296,7 +296,7 @@ mod tests { ); assert_eq!(app.get_current_route(), left_block.into()); - MovieDetailsHandler::with(DEFAULT_KEYBINDINGS.right.key, &mut app, left_block, None).handle(); + MovieDetailsHandler::new(DEFAULT_KEYBINDINGS.right.key, &mut app, left_block, None).handle(); assert_eq!( app.get_current_route(), @@ -330,7 +330,7 @@ mod tests { app.data.radarr_data.movie_details_modal = Some(modal); app.push_navigation_stack(ActiveRadarrBlock::ManualSearch.into()); - MovieDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::ManualSearch, None) + MovieDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::ManualSearch, None) .handle(); assert_eq!( @@ -349,7 +349,7 @@ mod tests { }); app.push_navigation_stack(ActiveRadarrBlock::ManualSearch.into()); - MovieDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::ManualSearch, None) + MovieDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::ManualSearch, None) .handle(); assert_eq!( @@ -390,7 +390,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::MovieDetails.into()); app.push_navigation_stack(prompt_block.into()); - MovieDetailsHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + MovieDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(app.data.radarr_data.prompt_confirm); assert_eq!( @@ -420,7 +420,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::MovieDetails.into()); app.push_navigation_stack(prompt_block.into()); - MovieDetailsHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + MovieDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(!app.data.radarr_data.prompt_confirm); assert_eq!( @@ -461,7 +461,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Movies.into()); app.push_navigation_stack(active_radarr_block.into()); - MovieDetailsHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle(); + MovieDetailsHandler::new(ESC_KEY, &mut app, active_radarr_block, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into()); assert_movie_info_tabs_reset!(app.data.radarr_data); @@ -484,7 +484,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Movies.into()); app.push_navigation_stack(prompt_block.into()); - MovieDetailsHandler::with(ESC_KEY, &mut app, prompt_block, None).handle(); + MovieDetailsHandler::new(ESC_KEY, &mut app, prompt_block, None).handle(); assert!(!app.data.radarr_data.prompt_confirm); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into()); @@ -536,7 +536,7 @@ mod tests { .set_items(vec![RadarrRelease::default()]); app.data.radarr_data.movie_details_modal = Some(modal); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.auto_search.key, &mut app, active_radarr_block, @@ -570,7 +570,7 @@ mod tests { ..MovieDetailsModal::default() }); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.auto_search.key, &mut app, active_radarr_block, @@ -620,7 +620,7 @@ mod tests { ..MovieDetailsModal::default() }); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.edit.key, &mut app, active_radarr_block, @@ -659,7 +659,7 @@ mod tests { .set_items(vec![RadarrRelease::default()]); app.data.radarr_data.movie_details_modal = Some(modal); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, active_radarr_block, @@ -693,7 +693,7 @@ mod tests { ..MovieDetailsModal::default() }); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, active_radarr_block, @@ -731,7 +731,7 @@ mod tests { .set_items(vec![RadarrRelease::default()]); app.data.radarr_data.movie_details_modal = Some(modal); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, active_radarr_block, @@ -764,7 +764,7 @@ mod tests { ..MovieDetailsModal::default() }); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, active_radarr_block, @@ -808,7 +808,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::MovieDetails.into()); app.push_navigation_stack(prompt_block.into()); - MovieDetailsHandler::with( + MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, prompt_block, @@ -843,7 +843,7 @@ mod tests { movie_id: 1, }; - let body = MovieDetailsHandler::with( + let body = MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::ManualSearchConfirmPrompt, @@ -859,7 +859,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.movies.set_items(vec![movie()]); - let movie_id = MovieDetailsHandler::with( + let movie_id = MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::AutomaticallySearchMoviePrompt, @@ -1071,7 +1071,7 @@ mod tests { .set_items(vec![RadarrRelease::default()]); app.data.radarr_data.movie_details_modal = Some(modal); - let handler = MovieDetailsHandler::with( + let handler = MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, movie_details_block, @@ -1087,7 +1087,7 @@ mod tests { app.is_loading = false; app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default()); - let handler = MovieDetailsHandler::with( + let handler = MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::MovieDetails, @@ -1106,7 +1106,7 @@ mod tests { ..MovieDetailsModal::default() }); - let handler = MovieDetailsHandler::with( + let handler = MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::MovieDetails, @@ -1126,7 +1126,7 @@ mod tests { .set_items(vec![MovieHistoryItem::default()]); app.data.radarr_data.movie_details_modal = Some(modal); - let handler = MovieDetailsHandler::with( + let handler = MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::MovieHistory, @@ -1144,7 +1144,7 @@ mod tests { modal.movie_cast.set_items(vec![Credit::default()]); app.data.radarr_data.movie_details_modal = Some(modal); - let handler = MovieDetailsHandler::with( + let handler = MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Cast, @@ -1162,7 +1162,7 @@ mod tests { modal.movie_crew.set_items(vec![Credit::default()]); app.data.radarr_data.movie_details_modal = Some(modal); - let handler = MovieDetailsHandler::with( + let handler = MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::Crew, @@ -1182,7 +1182,7 @@ mod tests { .set_items(vec![RadarrRelease::default()]); app.data.radarr_data.movie_details_modal = Some(modal); - let handler = MovieDetailsHandler::with( + let handler = MovieDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::ManualSearch, diff --git a/src/handlers/radarr_handlers/mod.rs b/src/handlers/radarr_handlers/mod.rs index 1f14d74..bc4ed1d 100644 --- a/src/handlers/radarr_handlers/mod.rs +++ b/src/handlers/radarr_handlers/mod.rs @@ -37,27 +37,27 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RadarrHandler<'a, 'b fn handle(&mut self) { match self.active_radarr_block { _ if LibraryHandler::accepts(self.active_radarr_block) => { - LibraryHandler::with(self.key, self.app, self.active_radarr_block, self.context).handle(); + LibraryHandler::new(self.key, self.app, self.active_radarr_block, self.context).handle(); } _ if CollectionsHandler::accepts(self.active_radarr_block) => { - CollectionsHandler::with(self.key, self.app, self.active_radarr_block, self.context) + CollectionsHandler::new(self.key, self.app, self.active_radarr_block, self.context) .handle() } _ if IndexersHandler::accepts(self.active_radarr_block) => { - IndexersHandler::with(self.key, self.app, self.active_radarr_block, self.context).handle() + IndexersHandler::new(self.key, self.app, self.active_radarr_block, self.context).handle() } _ if SystemHandler::accepts(self.active_radarr_block) => { - SystemHandler::with(self.key, self.app, self.active_radarr_block, self.context).handle() + SystemHandler::new(self.key, self.app, self.active_radarr_block, self.context).handle() } _ if DownloadsHandler::accepts(self.active_radarr_block) => { - DownloadsHandler::with(self.key, self.app, self.active_radarr_block, self.context).handle() + DownloadsHandler::new(self.key, self.app, self.active_radarr_block, self.context).handle() } _ if RootFoldersHandler::accepts(self.active_radarr_block) => { - RootFoldersHandler::with(self.key, self.app, self.active_radarr_block, self.context) + RootFoldersHandler::new(self.key, self.app, self.active_radarr_block, self.context) .handle() } _ if BlocklistHandler::accepts(self.active_radarr_block) => { - BlocklistHandler::with(self.key, self.app, self.active_radarr_block, self.context).handle() + BlocklistHandler::new(self.key, self.app, self.active_radarr_block, self.context).handle() } _ => self.handle_key_event(), } @@ -67,7 +67,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RadarrHandler<'a, 'b true } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/radarr_handler_test_utils.rs b/src/handlers/radarr_handlers/radarr_handler_test_utils.rs index 5c18dee..6e486f5 100644 --- a/src/handlers/radarr_handlers/radarr_handler_test_utils.rs +++ b/src/handlers/radarr_handlers/radarr_handler_test_utils.rs @@ -35,7 +35,7 @@ pub(in crate::handlers::radarr_handlers) mod utils { }]); app.data.radarr_data = radarr_data; - $handler::with(DEFAULT_KEYBINDINGS.edit.key, &mut app, $block, None).handle(); + $handler::new(DEFAULT_KEYBINDINGS.edit.key, &mut app, $block, None).handle(); assert_eq!( app.get_current_route(), @@ -149,7 +149,7 @@ pub(in crate::handlers::radarr_handlers) mod utils { }]); app.data.radarr_data = radarr_data; - $handler::with(DEFAULT_KEYBINDINGS.edit.key, &mut app, $block, None).handle(); + $handler::new(DEFAULT_KEYBINDINGS.edit.key, &mut app, $block, None).handle(); assert_eq!( app.get_current_route(), diff --git a/src/handlers/radarr_handlers/radarr_handler_tests.rs b/src/handlers/radarr_handlers/radarr_handler_tests.rs index 758677c..b516a4b 100644 --- a/src/handlers/radarr_handlers/radarr_handler_tests.rs +++ b/src/handlers/radarr_handlers/radarr_handler_tests.rs @@ -222,7 +222,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = RadarrHandler::with( + let handler = RadarrHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::System, diff --git a/src/handlers/radarr_handlers/root_folders/mod.rs b/src/handlers/radarr_handlers/root_folders/mod.rs index 6e8aa97..cbf8a3a 100644 --- a/src/handlers/radarr_handlers/root_folders/mod.rs +++ b/src/handlers/radarr_handlers/root_folders/mod.rs @@ -70,7 +70,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<' ROOT_FOLDERS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs b/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs index 984c243..7b4c0a8 100644 --- a/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs +++ b/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs @@ -30,7 +30,7 @@ mod tests { .set_items(vec![RootFolder::default()]); app.data.radarr_data.edit_root_folder = Some("Test".into()); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::AddRootFolderPrompt, @@ -50,7 +50,7 @@ mod tests { 4 ); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::AddRootFolderPrompt, @@ -88,7 +88,7 @@ mod tests { .root_folders .set_items(vec![RootFolder::default()]); - RootFoldersHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::RootFolders, None).handle(); + RootFoldersHandler::new(DELETE_KEY, &mut app, ActiveRadarrBlock::RootFolders, None).handle(); assert_eq!( app.get_current_route(), @@ -107,7 +107,7 @@ mod tests { .root_folders .set_items(vec![RootFolder::default()]); - RootFoldersHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::RootFolders, None).handle(); + RootFoldersHandler::new(DELETE_KEY, &mut app, ActiveRadarrBlock::RootFolders, None).handle(); assert_eq!( app.get_current_route(), @@ -130,7 +130,7 @@ mod tests { app.is_loading = is_ready; app.data.radarr_data.main_tabs.set_index(4); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::RootFolders, @@ -151,7 +151,7 @@ mod tests { app.is_loading = is_ready; app.data.radarr_data.main_tabs.set_index(4); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::RootFolders, @@ -172,7 +172,7 @@ mod tests { ) { let mut app = App::default(); - RootFoldersHandler::with( + RootFoldersHandler::new( key, &mut app, ActiveRadarrBlock::DeleteRootFolderPrompt, @@ -182,7 +182,7 @@ mod tests { assert!(app.data.radarr_data.prompt_confirm); - RootFoldersHandler::with( + RootFoldersHandler::new( key, &mut app, ActiveRadarrBlock::DeleteRootFolderPrompt, @@ -198,7 +198,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.edit_root_folder = Some("Test".into()); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::AddRootFolderPrompt, @@ -218,7 +218,7 @@ mod tests { 1 ); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::AddRootFolderPrompt, @@ -266,7 +266,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into()); app.push_navigation_stack(ActiveRadarrBlock::AddRootFolderPrompt.into()); - RootFoldersHandler::with( + RootFoldersHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AddRootFolderPrompt, @@ -295,7 +295,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into()); app.push_navigation_stack(ActiveRadarrBlock::AddRootFolderPrompt.into()); - RootFoldersHandler::with( + RootFoldersHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::AddRootFolderPrompt, @@ -324,7 +324,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into()); app.push_navigation_stack(ActiveRadarrBlock::DeleteRootFolderPrompt.into()); - RootFoldersHandler::with( + RootFoldersHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::DeleteRootFolderPrompt, @@ -354,7 +354,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into()); app.push_navigation_stack(ActiveRadarrBlock::DeleteRootFolderPrompt.into()); - RootFoldersHandler::with( + RootFoldersHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::DeleteRootFolderPrompt, @@ -385,7 +385,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::DeleteRootFolderPrompt.into()); app.data.radarr_data.prompt_confirm = true; - RootFoldersHandler::with( + RootFoldersHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::DeleteRootFolderPrompt, @@ -408,7 +408,7 @@ mod tests { app.data.radarr_data.edit_root_folder = Some("/nfs/test".into()); app.should_ignore_quit_key = true; - RootFoldersHandler::with( + RootFoldersHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::AddRootFolderPrompt, @@ -434,7 +434,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into()); app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into()); - RootFoldersHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::RootFolders, None).handle(); + RootFoldersHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::RootFolders, None).handle(); assert_eq!( app.get_current_route(), @@ -460,7 +460,7 @@ mod tests { .root_folders .set_items(vec![RootFolder::default()]); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.add.key, &mut app, ActiveRadarrBlock::RootFolders, @@ -487,7 +487,7 @@ mod tests { .root_folders .set_items(vec![RootFolder::default()]); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.add.key, &mut app, ActiveRadarrBlock::RootFolders, @@ -513,7 +513,7 @@ mod tests { .set_items(vec![RootFolder::default()]); app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into()); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveRadarrBlock::RootFolders, @@ -539,7 +539,7 @@ mod tests { .set_items(vec![RootFolder::default()]); app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into()); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveRadarrBlock::RootFolders, @@ -564,7 +564,7 @@ mod tests { .set_items(vec![RootFolder::default()]); app.data.radarr_data.edit_root_folder = Some("/nfs/test".into()); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveRadarrBlock::AddRootFolderPrompt, @@ -588,7 +588,7 @@ mod tests { .set_items(vec![RootFolder::default()]); app.data.radarr_data.edit_root_folder = Some(HorizontallyScrollableText::default()); - RootFoldersHandler::with( + RootFoldersHandler::new( Key::Char('h'), &mut app, ActiveRadarrBlock::AddRootFolderPrompt, @@ -613,7 +613,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into()); app.push_navigation_stack(ActiveRadarrBlock::DeleteRootFolderPrompt.into()); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveRadarrBlock::DeleteRootFolderPrompt, @@ -652,7 +652,7 @@ mod tests { path: "/nfs/test".to_owned(), }; - let actual_add_root_folder_body = RootFoldersHandler::with( + let actual_add_root_folder_body = RootFoldersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::RootFolders, @@ -673,7 +673,7 @@ mod tests { .root_folders .set_items(vec![root_folder()]); - let root_folder_id = RootFoldersHandler::with( + let root_folder_id = RootFoldersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::RootFolders, @@ -689,7 +689,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = RootFoldersHandler::with( + let handler = RootFoldersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::RootFolders, @@ -704,7 +704,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = RootFoldersHandler::with( + let handler = RootFoldersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::RootFolders, @@ -724,7 +724,7 @@ mod tests { .radarr_data .root_folders .set_items(vec![RootFolder::default()]); - let handler = RootFoldersHandler::with( + let handler = RootFoldersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::RootFolders, diff --git a/src/handlers/radarr_handlers/system/mod.rs b/src/handlers/radarr_handlers/system/mod.rs index bf94dd9..7652b36 100644 --- a/src/handlers/radarr_handlers/system/mod.rs +++ b/src/handlers/radarr_handlers/system/mod.rs @@ -24,7 +24,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for SystemHandler<'a, 'b fn handle(&mut self) { match self.active_radarr_block { _ if SystemDetailsHandler::accepts(self.active_radarr_block) => { - SystemDetailsHandler::with(self.key, self.app, self.active_radarr_block, self.context) + SystemDetailsHandler::new(self.key, self.app, self.active_radarr_block, self.context) .handle() } _ => self.handle_key_event(), @@ -35,7 +35,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for SystemHandler<'a, 'b SystemDetailsHandler::accepts(active_block) || active_block == ActiveRadarrBlock::System } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/system/system_details_handler.rs b/src/handlers/radarr_handlers/system/system_details_handler.rs index 4052635..861f346 100644 --- a/src/handlers/radarr_handlers/system/system_details_handler.rs +++ b/src/handlers/radarr_handlers/system/system_details_handler.rs @@ -36,7 +36,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for SystemDetailsHandler SYSTEM_DETAILS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, diff --git a/src/handlers/radarr_handlers/system/system_details_handler_tests.rs b/src/handlers/radarr_handlers/system/system_details_handler_tests.rs index e12a610..a4ab5c2 100644 --- a/src/handlers/radarr_handlers/system/system_details_handler_tests.rs +++ b/src/handlers/radarr_handlers/system/system_details_handler_tests.rs @@ -51,14 +51,14 @@ mod tests { text )); - SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemLogs, None).handle(); + SystemDetailsHandler::new(key, &mut app, ActiveRadarrBlock::SystemLogs, None).handle(); assert_str_eq!( app.data.radarr_data.log_details.current_selection().text, "Test 1" ); - SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemLogs, None).handle(); + SystemDetailsHandler::new(key, &mut app, ActiveRadarrBlock::SystemLogs, None).handle(); assert_str_eq!( app.data.radarr_data.log_details.current_selection().text, @@ -78,14 +78,14 @@ mod tests { .tasks .set_items(simple_stateful_iterable_vec!(RadarrTask, String, name)); - SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemTasks, None).handle(); + SystemDetailsHandler::new(key, &mut app, ActiveRadarrBlock::SystemTasks, None).handle(); assert_str_eq!( app.data.radarr_data.tasks.current_selection().name, "Test 2" ); - SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemTasks, None).handle(); + SystemDetailsHandler::new(key, &mut app, ActiveRadarrBlock::SystemTasks, None).handle(); assert_str_eq!( app.data.radarr_data.tasks.current_selection().name, @@ -106,14 +106,14 @@ mod tests { .tasks .set_items(simple_stateful_iterable_vec!(RadarrTask, String, name)); - SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemTasks, None).handle(); + SystemDetailsHandler::new(key, &mut app, ActiveRadarrBlock::SystemTasks, None).handle(); assert_str_eq!( app.data.radarr_data.tasks.current_selection().name, "Test 1" ); - SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemTasks, None).handle(); + SystemDetailsHandler::new(key, &mut app, ActiveRadarrBlock::SystemTasks, None).handle(); assert_str_eq!( app.data.radarr_data.tasks.current_selection().name, @@ -133,7 +133,7 @@ mod tests { .queued_events .set_items(simple_stateful_iterable_vec!(QueueEvent, String, name)); - SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, None) + SystemDetailsHandler::new(key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, None) .handle(); assert_str_eq!( @@ -141,7 +141,7 @@ mod tests { "Test 2" ); - SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, None) + SystemDetailsHandler::new(key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, None) .handle(); assert_str_eq!( @@ -163,7 +163,7 @@ mod tests { .queued_events .set_items(simple_stateful_iterable_vec!(QueueEvent, String, name)); - SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, None) + SystemDetailsHandler::new(key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, None) .handle(); assert_str_eq!( @@ -171,7 +171,7 @@ mod tests { "Test 1" ); - SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, None) + SystemDetailsHandler::new(key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, None) .handle(); assert_str_eq!( @@ -185,7 +185,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.up.key, &mut app, ActiveRadarrBlock::SystemUpdates, @@ -195,7 +195,7 @@ mod tests { assert_eq!(app.data.radarr_data.updates.offset, 0); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.down.key, &mut app, ActiveRadarrBlock::SystemUpdates, @@ -212,7 +212,7 @@ mod tests { app.is_loading = true; app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.up.key, &mut app, ActiveRadarrBlock::SystemUpdates, @@ -222,7 +222,7 @@ mod tests { assert_eq!(app.data.radarr_data.updates.offset, 0); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.down.key, &mut app, ActiveRadarrBlock::SystemUpdates, @@ -266,7 +266,7 @@ mod tests { text )); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::SystemLogs, @@ -279,7 +279,7 @@ mod tests { "Test 1" ); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::SystemLogs, @@ -304,7 +304,7 @@ mod tests { .tasks .set_items(extended_stateful_iterable_vec!(RadarrTask, String, name)); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::SystemTasks, @@ -317,7 +317,7 @@ mod tests { "Test 3" ); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::SystemTasks, @@ -343,7 +343,7 @@ mod tests { .tasks .set_items(extended_stateful_iterable_vec!(RadarrTask, String, name)); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::SystemTasks, @@ -356,7 +356,7 @@ mod tests { "Test 1" ); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::SystemTasks, @@ -381,7 +381,7 @@ mod tests { .queued_events .set_items(extended_stateful_iterable_vec!(QueueEvent, String, name)); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, @@ -394,7 +394,7 @@ mod tests { "Test 3" ); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, @@ -420,7 +420,7 @@ mod tests { .queued_events .set_items(extended_stateful_iterable_vec!(QueueEvent, String, name)); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, @@ -433,7 +433,7 @@ mod tests { "Test 1" ); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, @@ -452,7 +452,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::SystemUpdates, @@ -462,7 +462,7 @@ mod tests { assert_eq!(app.data.radarr_data.updates.offset, 1); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::SystemUpdates, @@ -479,7 +479,7 @@ mod tests { app.is_loading = true; app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::SystemUpdates, @@ -489,7 +489,7 @@ mod tests { assert_eq!(app.data.radarr_data.updates.offset, 0); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::SystemUpdates, @@ -517,7 +517,7 @@ mod tests { .log_details .set_items(vec!["t1".into(), "t22".into()]); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, active_radarr_block, @@ -528,7 +528,7 @@ mod tests { assert_eq!(app.data.radarr_data.log_details.items[0].to_string(), "t1"); assert_eq!(app.data.radarr_data.log_details.items[1].to_string(), "t22"); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, active_radarr_block, @@ -539,7 +539,7 @@ mod tests { assert_eq!(app.data.radarr_data.log_details.items[0].to_string(), "1"); assert_eq!(app.data.radarr_data.log_details.items[1].to_string(), "22"); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, active_radarr_block, @@ -550,7 +550,7 @@ mod tests { assert_eq!(app.data.radarr_data.log_details.items[0].to_string(), ""); assert_eq!(app.data.radarr_data.log_details.items[1].to_string(), "2"); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, active_radarr_block, @@ -561,7 +561,7 @@ mod tests { assert_eq!(app.data.radarr_data.log_details.items[0].to_string(), ""); assert_eq!(app.data.radarr_data.log_details.items[1].to_string(), ""); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, active_radarr_block, @@ -572,7 +572,7 @@ mod tests { assert_eq!(app.data.radarr_data.log_details.items[0].to_string(), ""); assert_eq!(app.data.radarr_data.log_details.items[1].to_string(), ""); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, active_radarr_block, @@ -583,7 +583,7 @@ mod tests { assert_eq!(app.data.radarr_data.log_details.items[0].to_string(), "1"); assert_eq!(app.data.radarr_data.log_details.items[1].to_string(), "2"); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, active_radarr_block, @@ -594,7 +594,7 @@ mod tests { assert_eq!(app.data.radarr_data.log_details.items[0].to_string(), "t1"); assert_eq!(app.data.radarr_data.log_details.items[1].to_string(), "22"); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, active_radarr_block, @@ -612,7 +612,7 @@ mod tests { ) { let mut app = App::default(); - SystemDetailsHandler::with( + SystemDetailsHandler::new( key, &mut app, ActiveRadarrBlock::SystemTaskStartConfirmPrompt, @@ -622,7 +622,7 @@ mod tests { assert!(app.data.radarr_data.prompt_confirm); - SystemDetailsHandler::with( + SystemDetailsHandler::new( key, &mut app, ActiveRadarrBlock::SystemTaskStartConfirmPrompt, @@ -648,7 +648,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned()); - SystemDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SystemTasks, None) + SystemDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SystemTasks, None) .handle(); assert_eq!( @@ -664,7 +664,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::SystemTasks.into()); app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned()); - SystemDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SystemTasks, None) + SystemDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SystemTasks, None) .handle(); assert_eq!( @@ -685,7 +685,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::SystemTasks.into()); app.push_navigation_stack(ActiveRadarrBlock::SystemTaskStartConfirmPrompt.into()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::SystemTaskStartConfirmPrompt, @@ -711,7 +711,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::SystemTasks.into()); app.push_navigation_stack(ActiveRadarrBlock::SystemTaskStartConfirmPrompt.into()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::SystemTaskStartConfirmPrompt, @@ -754,7 +754,7 @@ mod tests { .log_details .set_items(vec![HorizontallyScrollableText::default()]); - SystemDetailsHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::SystemLogs, None).handle(); + SystemDetailsHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::SystemLogs, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::System.into()); assert!(app.data.radarr_data.log_details.items.is_empty()); @@ -772,7 +772,7 @@ mod tests { .tasks .set_items(vec![RadarrTask::default()]); - SystemDetailsHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::SystemTasks, None).handle(); + SystemDetailsHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::SystemTasks, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::System.into()); } @@ -789,7 +789,7 @@ mod tests { .queued_events .set_items(vec![QueueEvent::default()]); - SystemDetailsHandler::with( + SystemDetailsHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::SystemQueuedEvents, @@ -807,7 +807,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::System.into()); app.push_navigation_stack(ActiveRadarrBlock::SystemUpdates.into()); - SystemDetailsHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::SystemUpdates, None) + SystemDetailsHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::SystemUpdates, None) .handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::System.into()); @@ -820,7 +820,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::SystemTaskStartConfirmPrompt.into()); app.data.radarr_data.prompt_confirm = true; - SystemDetailsHandler::with( + SystemDetailsHandler::new( ESC_KEY, &mut app, ActiveRadarrBlock::SystemTaskStartConfirmPrompt, @@ -858,7 +858,7 @@ mod tests { app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned()); app.push_navigation_stack(active_radarr_block.into()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, active_radarr_block, @@ -885,7 +885,7 @@ mod tests { app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned()); app.push_navigation_stack(active_radarr_block.into()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, active_radarr_block, @@ -908,7 +908,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::SystemTasks.into()); app.push_navigation_stack(ActiveRadarrBlock::SystemTaskStartConfirmPrompt.into()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveRadarrBlock::SystemTaskStartConfirmPrompt, @@ -947,7 +947,7 @@ mod tests { ..RadarrTask::default() }]); - let task_name = SystemDetailsHandler::with( + let task_name = SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::SystemTasks, @@ -963,7 +963,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = SystemDetailsHandler::with( + let handler = SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::SystemUpdates, @@ -978,7 +978,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = SystemDetailsHandler::with( + let handler = SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::SystemUpdates, @@ -998,7 +998,7 @@ mod tests { .log_details .set_items(vec![HorizontallyScrollableText::default()]); - let handler = SystemDetailsHandler::with( + let handler = SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::SystemUpdates, @@ -1018,7 +1018,7 @@ mod tests { .tasks .set_items(vec![RadarrTask::default()]); - let handler = SystemDetailsHandler::with( + let handler = SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::SystemTasks, @@ -1034,7 +1034,7 @@ mod tests { app.is_loading = false; app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned()); - let handler = SystemDetailsHandler::with( + let handler = SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveRadarrBlock::SystemUpdates, diff --git a/src/handlers/radarr_handlers/system/system_handler_tests.rs b/src/handlers/radarr_handlers/system/system_handler_tests.rs index 46d3cba..3cae944 100644 --- a/src/handlers/radarr_handlers/system/system_handler_tests.rs +++ b/src/handlers/radarr_handlers/system/system_handler_tests.rs @@ -26,7 +26,7 @@ mod tests { app.is_loading = is_ready; app.data.radarr_data.main_tabs.set_index(6); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::System, @@ -47,7 +47,7 @@ mod tests { app.is_loading = is_ready; app.data.radarr_data.main_tabs.set_index(6); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::System, @@ -78,7 +78,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::System.into()); app.push_navigation_stack(ActiveRadarrBlock::System.into()); - SystemHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::System, None).handle(); + SystemHandler::new(ESC_KEY, &mut app, ActiveRadarrBlock::System, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::System.into()); assert!(app.error.text.is_empty()); @@ -110,7 +110,7 @@ mod tests { .tasks .set_items(vec![RadarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveRadarrBlock::System, @@ -144,7 +144,7 @@ mod tests { .tasks .set_items(vec![RadarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveRadarrBlock::System, @@ -173,7 +173,7 @@ mod tests { .tasks .set_items(vec![RadarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.events.key, &mut app, ActiveRadarrBlock::System, @@ -207,7 +207,7 @@ mod tests { .tasks .set_items(vec![RadarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.events.key, &mut app, ActiveRadarrBlock::System, @@ -237,7 +237,7 @@ mod tests { .set_items(vec![RadarrTask::default()]); app.push_navigation_stack(ActiveRadarrBlock::System.into()); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveRadarrBlock::System, @@ -270,7 +270,7 @@ mod tests { .set_items(vec![RadarrTask::default()]); app.push_navigation_stack(ActiveRadarrBlock::System.into()); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveRadarrBlock::System, @@ -300,7 +300,7 @@ mod tests { .tasks .set_items(vec![RadarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.logs.key, &mut app, ActiveRadarrBlock::System, @@ -342,7 +342,7 @@ mod tests { .tasks .set_items(vec![RadarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.logs.key, &mut app, ActiveRadarrBlock::System, @@ -372,7 +372,7 @@ mod tests { .tasks .set_items(vec![RadarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.tasks.key, &mut app, ActiveRadarrBlock::System, @@ -406,7 +406,7 @@ mod tests { .tasks .set_items(vec![RadarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.tasks.key, &mut app, ActiveRadarrBlock::System, @@ -455,7 +455,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let system_handler = SystemHandler::with( + let system_handler = SystemHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveRadarrBlock::System, @@ -480,7 +480,7 @@ mod tests { .queued_events .set_items(vec![QueueEvent::default()]); - let system_handler = SystemHandler::with( + let system_handler = SystemHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveRadarrBlock::System, @@ -501,7 +501,7 @@ mod tests { .queued_events .set_items(vec![QueueEvent::default()]); - let system_handler = SystemHandler::with( + let system_handler = SystemHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveRadarrBlock::System, @@ -522,7 +522,7 @@ mod tests { .tasks .set_items(vec![RadarrTask::default()]); - let system_handler = SystemHandler::with( + let system_handler = SystemHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveRadarrBlock::System, @@ -548,7 +548,7 @@ mod tests { .queued_events .set_items(vec![QueueEvent::default()]); - let system_handler = SystemHandler::with( + let system_handler = SystemHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveRadarrBlock::System, diff --git a/src/handlers/sonarr_handlers/blocklist/blocklist_handler_tests.rs b/src/handlers/sonarr_handlers/blocklist/blocklist_handler_tests.rs index 7e1db51..0d1fbab 100644 --- a/src/handlers/sonarr_handlers/blocklist/blocklist_handler_tests.rs +++ b/src/handlers/sonarr_handlers/blocklist/blocklist_handler_tests.rs @@ -28,7 +28,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into()); app.data.sonarr_data.blocklist.set_items(blocklist_vec()); - BlocklistHandler::with(DELETE_KEY, &mut app, ActiveSonarrBlock::Blocklist, None).handle(); + BlocklistHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::Blocklist, None).handle(); assert_eq!( app.get_current_route(), @@ -43,7 +43,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into()); app.data.sonarr_data.blocklist.set_items(blocklist_vec()); - BlocklistHandler::with(DELETE_KEY, &mut app, ActiveSonarrBlock::Blocklist, None).handle(); + BlocklistHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::Blocklist, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Blocklist.into()); } @@ -62,7 +62,7 @@ mod tests { app.is_loading = is_ready; app.data.sonarr_data.main_tabs.set_index(2); - BlocklistHandler::with( + BlocklistHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::Blocklist, @@ -84,7 +84,7 @@ mod tests { app.is_loading = is_ready; app.data.sonarr_data.main_tabs.set_index(2); - BlocklistHandler::with( + BlocklistHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::Blocklist, @@ -111,11 +111,11 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into()); - BlocklistHandler::with(key, &mut app, active_sonarr_block, None).handle(); + BlocklistHandler::new(key, &mut app, active_sonarr_block, None).handle(); assert!(app.data.sonarr_data.prompt_confirm); - BlocklistHandler::with(key, &mut app, active_sonarr_block, None).handle(); + BlocklistHandler::new(key, &mut app, active_sonarr_block, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); } @@ -137,7 +137,7 @@ mod tests { app.data.sonarr_data.blocklist.set_items(blocklist_vec()); app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into()); - BlocklistHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Blocklist, None).handle(); + BlocklistHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Blocklist, None).handle(); assert_eq!( app.get_current_route(), @@ -152,7 +152,7 @@ mod tests { app.data.sonarr_data.blocklist.set_items(blocklist_vec()); app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into()); - BlocklistHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Blocklist, None).handle(); + BlocklistHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Blocklist, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Blocklist.into()); } @@ -179,7 +179,7 @@ mod tests { app.push_navigation_stack(base_route.into()); app.push_navigation_stack(prompt_block.into()); - BlocklistHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + BlocklistHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(app.data.sonarr_data.prompt_confirm); assert_eq!( @@ -202,7 +202,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into()); app.push_navigation_stack(prompt_block.into()); - BlocklistHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + BlocklistHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); assert_eq!(app.data.sonarr_data.prompt_confirm_action, None); @@ -236,7 +236,7 @@ mod tests { app.push_navigation_stack(prompt_block.into()); app.data.sonarr_data.prompt_confirm = true; - BlocklistHandler::with(ESC_KEY, &mut app, prompt_block, None).handle(); + BlocklistHandler::new(ESC_KEY, &mut app, prompt_block, None).handle(); assert_eq!(app.get_current_route(), base_block.into()); assert!(!app.data.sonarr_data.prompt_confirm); @@ -248,7 +248,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into()); app.push_navigation_stack(ActiveSonarrBlock::BlocklistItemDetails.into()); - BlocklistHandler::with( + BlocklistHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::BlocklistItemDetails, @@ -267,7 +267,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into()); app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into()); - BlocklistHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::Blocklist, None).handle(); + BlocklistHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::Blocklist, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Blocklist.into()); assert!(app.error.text.is_empty()); @@ -288,7 +288,7 @@ mod tests { app.data.sonarr_data.blocklist.set_items(blocklist_vec()); app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into()); - BlocklistHandler::with( + BlocklistHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveSonarrBlock::Blocklist, @@ -307,7 +307,7 @@ mod tests { app.data.sonarr_data.blocklist.set_items(blocklist_vec()); app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into()); - BlocklistHandler::with( + BlocklistHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveSonarrBlock::Blocklist, @@ -325,7 +325,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into()); app.data.sonarr_data.blocklist.set_items(blocklist_vec()); - BlocklistHandler::with( + BlocklistHandler::new( DEFAULT_KEYBINDINGS.clear.key, &mut app, ActiveSonarrBlock::Blocklist, @@ -346,7 +346,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into()); app.data.sonarr_data.blocklist.set_items(blocklist_vec()); - BlocklistHandler::with( + BlocklistHandler::new( DEFAULT_KEYBINDINGS.clear.key, &mut app, ActiveSonarrBlock::Blocklist, @@ -378,7 +378,7 @@ mod tests { app.push_navigation_stack(base_route.into()); app.push_navigation_stack(prompt_block.into()); - BlocklistHandler::with( + BlocklistHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, prompt_block, @@ -518,7 +518,7 @@ mod tests { let mut app = App::default(); app.data.sonarr_data.blocklist.set_items(blocklist_vec()); - let blocklist_item_id = BlocklistHandler::with( + let blocklist_item_id = BlocklistHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::Blocklist, @@ -535,7 +535,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into()); app.is_loading = true; - let handler = BlocklistHandler::with( + let handler = BlocklistHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::Blocklist, @@ -551,7 +551,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Blocklist.into()); app.is_loading = false; - let handler = BlocklistHandler::with( + let handler = BlocklistHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::Blocklist, @@ -572,7 +572,7 @@ mod tests { .blocklist .set_items(vec![BlocklistItem::default()]); - let handler = BlocklistHandler::with( + let handler = BlocklistHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::Blocklist, diff --git a/src/handlers/sonarr_handlers/blocklist/mod.rs b/src/handlers/sonarr_handlers/blocklist/mod.rs index e36b061..2b4e935 100644 --- a/src/handlers/sonarr_handlers/blocklist/mod.rs +++ b/src/handlers/sonarr_handlers/blocklist/mod.rs @@ -51,7 +51,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for BlocklistHandler<'a, BLOCKLIST_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/downloads/downloads_handler_tests.rs b/src/handlers/sonarr_handlers/downloads/downloads_handler_tests.rs index 7c39053..ca10805 100644 --- a/src/handlers/sonarr_handlers/downloads/downloads_handler_tests.rs +++ b/src/handlers/sonarr_handlers/downloads/downloads_handler_tests.rs @@ -29,7 +29,7 @@ mod tests { .downloads .set_items(vec![DownloadRecord::default()]); - DownloadsHandler::with(DELETE_KEY, &mut app, ActiveSonarrBlock::Downloads, None).handle(); + DownloadsHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::Downloads, None).handle(); assert_eq!( app.get_current_route(), @@ -48,7 +48,7 @@ mod tests { .downloads .set_items(vec![DownloadRecord::default()]); - DownloadsHandler::with(DELETE_KEY, &mut app, ActiveSonarrBlock::Downloads, None).handle(); + DownloadsHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::Downloads, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Downloads.into()); } @@ -67,7 +67,7 @@ mod tests { app.is_loading = is_ready; app.data.sonarr_data.main_tabs.set_index(1); - DownloadsHandler::with( + DownloadsHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::Downloads, @@ -89,7 +89,7 @@ mod tests { app.is_loading = is_ready; app.data.sonarr_data.main_tabs.set_index(1); - DownloadsHandler::with( + DownloadsHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::Downloads, @@ -116,11 +116,11 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::Downloads.into()); - DownloadsHandler::with(key, &mut app, active_sonarr_block, None).handle(); + DownloadsHandler::new(key, &mut app, active_sonarr_block, None).handle(); assert!(app.data.sonarr_data.prompt_confirm); - DownloadsHandler::with(key, &mut app, active_sonarr_block, None).handle(); + DownloadsHandler::new(key, &mut app, active_sonarr_block, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); } @@ -162,7 +162,7 @@ mod tests { app.push_navigation_stack(base_route.into()); app.push_navigation_stack(prompt_block.into()); - DownloadsHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + DownloadsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(app.data.sonarr_data.prompt_confirm); assert_eq!( @@ -188,7 +188,7 @@ mod tests { app.push_navigation_stack(base_route.into()); app.push_navigation_stack(prompt_block.into()); - DownloadsHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + DownloadsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); assert_eq!(app.data.sonarr_data.prompt_confirm_action, None); @@ -216,7 +216,7 @@ mod tests { app.push_navigation_stack(prompt_block.into()); app.data.sonarr_data.prompt_confirm = true; - DownloadsHandler::with(ESC_KEY, &mut app, prompt_block, None).handle(); + DownloadsHandler::new(ESC_KEY, &mut app, prompt_block, None).handle(); assert_eq!(app.get_current_route(), base_block.into()); assert!(!app.data.sonarr_data.prompt_confirm); @@ -230,7 +230,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Downloads.into()); app.push_navigation_stack(ActiveSonarrBlock::Downloads.into()); - DownloadsHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::Downloads, None).handle(); + DownloadsHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::Downloads, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Downloads.into()); assert!(app.error.text.is_empty()); @@ -255,7 +255,7 @@ mod tests { .downloads .set_items(vec![DownloadRecord::default()]); - DownloadsHandler::with( + DownloadsHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveSonarrBlock::Downloads, @@ -280,7 +280,7 @@ mod tests { .downloads .set_items(vec![DownloadRecord::default()]); - DownloadsHandler::with( + DownloadsHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveSonarrBlock::Downloads, @@ -301,7 +301,7 @@ mod tests { .set_items(vec![DownloadRecord::default()]); app.push_navigation_stack(ActiveSonarrBlock::Downloads.into()); - DownloadsHandler::with( + DownloadsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveSonarrBlock::Downloads, @@ -324,7 +324,7 @@ mod tests { .downloads .set_items(vec![DownloadRecord::default()]); - DownloadsHandler::with( + DownloadsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveSonarrBlock::Downloads, @@ -361,7 +361,7 @@ mod tests { app.push_navigation_stack(base_route.into()); app.push_navigation_stack(prompt_block.into()); - DownloadsHandler::with( + DownloadsHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, prompt_block, @@ -398,7 +398,7 @@ mod tests { .downloads .set_items(vec![download_record()]); - let download_id = DownloadsHandler::with( + let download_id = DownloadsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::Downloads, @@ -415,7 +415,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Downloads.into()); app.is_loading = true; - let handler = DownloadsHandler::with( + let handler = DownloadsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::Downloads, @@ -431,7 +431,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Downloads.into()); app.is_loading = false; - let handler = DownloadsHandler::with( + let handler = DownloadsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::Downloads, @@ -452,7 +452,7 @@ mod tests { .sonarr_data .downloads .set_items(vec![DownloadRecord::default()]); - let handler = DownloadsHandler::with( + let handler = DownloadsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::Downloads, diff --git a/src/handlers/sonarr_handlers/downloads/mod.rs b/src/handlers/sonarr_handlers/downloads/mod.rs index 8edf0d0..00211bb 100644 --- a/src/handlers/sonarr_handlers/downloads/mod.rs +++ b/src/handlers/sonarr_handlers/downloads/mod.rs @@ -47,7 +47,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for DownloadsHandler<'a, DOWNLOADS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/history/history_handler_tests.rs b/src/handlers/sonarr_handlers/history/history_handler_tests.rs index c932f20..ab41c95 100644 --- a/src/handlers/sonarr_handlers/history/history_handler_tests.rs +++ b/src/handlers/sonarr_handlers/history/history_handler_tests.rs @@ -28,7 +28,7 @@ mod tests { app.is_loading = is_ready; app.data.sonarr_data.main_tabs.set_index(3); - HistoryHandler::with( + HistoryHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::History, @@ -50,7 +50,7 @@ mod tests { app.is_loading = is_ready; app.data.sonarr_data.main_tabs.set_index(3); - HistoryHandler::with( + HistoryHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::History, @@ -82,7 +82,7 @@ mod tests { app.data.sonarr_data.history.set_items(history_vec()); app.push_navigation_stack(ActiveSonarrBlock::History.into()); - HistoryHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::History, None).handle(); + HistoryHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::History, None).handle(); assert_eq!( app.get_current_route(), @@ -97,7 +97,7 @@ mod tests { app.data.sonarr_data.history.set_items(history_vec()); app.push_navigation_stack(ActiveSonarrBlock::History.into()); - HistoryHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::History, None).handle(); + HistoryHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::History, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::History.into()); } @@ -124,7 +124,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::History.into()); app.push_navigation_stack(ActiveSonarrBlock::HistoryItemDetails.into()); - HistoryHandler::with( + HistoryHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::HistoryItemDetails, @@ -149,7 +149,7 @@ mod tests { .history .set_items(vec![SonarrHistoryItem::default()]); - HistoryHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::History, None).handle(); + HistoryHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::History, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::History.into()); assert!(app.error.text.is_empty()); @@ -167,7 +167,7 @@ mod tests { app.data.sonarr_data.history.set_items(history_vec()); app.push_navigation_stack(ActiveSonarrBlock::History.into()); - HistoryHandler::with( + HistoryHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveSonarrBlock::History, @@ -186,7 +186,7 @@ mod tests { app.data.sonarr_data.history.set_items(history_vec()); app.push_navigation_stack(ActiveSonarrBlock::History.into()); - HistoryHandler::with( + HistoryHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveSonarrBlock::History, @@ -312,7 +312,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::History.into()); app.is_loading = true; - let handler = HistoryHandler::with( + let handler = HistoryHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::History, @@ -328,7 +328,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::History.into()); app.is_loading = false; - let handler = HistoryHandler::with( + let handler = HistoryHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::History, @@ -349,7 +349,7 @@ mod tests { .history .set_items(vec![SonarrHistoryItem::default()]); - let handler = HistoryHandler::with( + let handler = HistoryHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::History, diff --git a/src/handlers/sonarr_handlers/history/mod.rs b/src/handlers/sonarr_handlers/history/mod.rs index 2ad58a6..d0bd399 100644 --- a/src/handlers/sonarr_handlers/history/mod.rs +++ b/src/handlers/sonarr_handlers/history/mod.rs @@ -52,7 +52,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for HistoryHandler<'a, ' HISTORY_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/indexers/edit_indexer_handler.rs b/src/handlers/sonarr_handlers/indexers/edit_indexer_handler.rs index 7e5cf98..c2eea19 100644 --- a/src/handlers/sonarr_handlers/indexers/edit_indexer_handler.rs +++ b/src/handlers/sonarr_handlers/indexers/edit_indexer_handler.rs @@ -78,7 +78,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EditIndexerHandler<' EDIT_INDEXER_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/indexers/edit_indexer_handler_tests.rs b/src/handlers/sonarr_handlers/indexers/edit_indexer_handler_tests.rs index 100658e..a4f922a 100644 --- a/src/handlers/sonarr_handlers/indexers/edit_indexer_handler_tests.rs +++ b/src/handlers/sonarr_handlers/indexers/edit_indexer_handler_tests.rs @@ -29,7 +29,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( key, &mut app, ActiveSonarrBlock::EditIndexerPriorityInput, @@ -60,7 +60,7 @@ mod tests { 0 ); - EditIndexerHandler::with( + EditIndexerHandler::new( Key::Up, &mut app, ActiveSonarrBlock::EditIndexerPriorityInput, @@ -79,7 +79,7 @@ mod tests { 1 ); - EditIndexerHandler::with( + EditIndexerHandler::new( key, &mut app, ActiveSonarrBlock::EditIndexerPriorityInput, @@ -108,7 +108,7 @@ mod tests { BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.down(); - EditIndexerHandler::with(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); if key == Key::Up { assert_eq!( @@ -135,7 +135,7 @@ mod tests { BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.down(); - EditIndexerHandler::with(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); assert_eq!( app.data.sonarr_data.selected_block.get_active_block(), @@ -162,7 +162,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::EditIndexerNameInput, @@ -183,7 +183,7 @@ mod tests { 4 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::EditIndexerNameInput, @@ -214,7 +214,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::EditIndexerUrlInput, @@ -235,7 +235,7 @@ mod tests { 4 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::EditIndexerUrlInput, @@ -266,7 +266,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::EditIndexerApiKeyInput, @@ -287,7 +287,7 @@ mod tests { 4 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::EditIndexerApiKeyInput, @@ -318,7 +318,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::EditIndexerSeedRatioInput, @@ -339,7 +339,7 @@ mod tests { 4 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::EditIndexerSeedRatioInput, @@ -370,7 +370,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::EditIndexerTagsInput, @@ -391,7 +391,7 @@ mod tests { 4 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::EditIndexerTagsInput, @@ -436,11 +436,11 @@ mod tests { BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.y = EDIT_INDEXER_TORRENT_SELECTION_BLOCKS.len() - 1; - EditIndexerHandler::with(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); assert!(app.data.sonarr_data.prompt_confirm); - EditIndexerHandler::with(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); } @@ -483,14 +483,14 @@ mod tests { left_block ); - EditIndexerHandler::with(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); assert_eq!( app.data.sonarr_data.selected_block.get_active_block(), right_block ); - EditIndexerHandler::with(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); assert_eq!( app.data.sonarr_data.selected_block.get_active_block(), @@ -536,14 +536,14 @@ mod tests { left_block ); - EditIndexerHandler::with(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); assert_eq!( app.data.sonarr_data.selected_block.get_active_block(), right_block ); - EditIndexerHandler::with(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); assert_eq!( app.data.sonarr_data.selected_block.get_active_block(), @@ -567,14 +567,14 @@ mod tests { ActiveSonarrBlock::EditIndexerPriorityInput ); - EditIndexerHandler::with(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); assert_eq!( app.data.sonarr_data.selected_block.get_active_block(), ActiveSonarrBlock::EditIndexerConfirmPrompt ); - EditIndexerHandler::with(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); + EditIndexerHandler::new(key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, None).handle(); assert_eq!( app.data.sonarr_data.selected_block.get_active_block(), @@ -592,7 +592,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::EditIndexerNameInput, @@ -613,7 +613,7 @@ mod tests { 1 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::EditIndexerNameInput, @@ -644,7 +644,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::EditIndexerUrlInput, @@ -665,7 +665,7 @@ mod tests { 1 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::EditIndexerUrlInput, @@ -696,7 +696,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::EditIndexerApiKeyInput, @@ -717,7 +717,7 @@ mod tests { 1 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::EditIndexerApiKeyInput, @@ -748,7 +748,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::EditIndexerSeedRatioInput, @@ -769,7 +769,7 @@ mod tests { 1 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::EditIndexerSeedRatioInput, @@ -800,7 +800,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::EditIndexerTagsInput, @@ -821,7 +821,7 @@ mod tests { 1 ); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::EditIndexerTagsInput, @@ -873,7 +873,7 @@ mod tests { .set_index(0, EDIT_INDEXER_TORRENT_SELECTION_BLOCKS.len() - 1); app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -927,7 +927,7 @@ mod tests { }; app.data.sonarr_data.prompt_confirm = true; - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -953,7 +953,7 @@ mod tests { app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); app.data.sonarr_data.prompt_confirm = true; - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -993,7 +993,7 @@ mod tests { .selected_block .set_index(starting_x, starting_y); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -1015,7 +1015,7 @@ mod tests { BlockSelectionState::new(EDIT_INDEXER_TORRENT_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.set_index(0, 4); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -1040,7 +1040,7 @@ mod tests { app.data.sonarr_data.selected_block.set_index(0, 1); app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -1061,7 +1061,7 @@ mod tests { .enable_rss .unwrap()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -1093,7 +1093,7 @@ mod tests { app.data.sonarr_data.selected_block.set_index(0, 2); app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -1114,7 +1114,7 @@ mod tests { .enable_automatic_search .unwrap()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -1146,7 +1146,7 @@ mod tests { app.data.sonarr_data.selected_block.set_index(0, 3); app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -1167,7 +1167,7 @@ mod tests { .enable_interactive_search .unwrap()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -1201,7 +1201,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into()); app.push_navigation_stack(ActiveSonarrBlock::EditIndexerNameInput.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerNameInput, @@ -1237,7 +1237,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into()); app.push_navigation_stack(ActiveSonarrBlock::EditIndexerUrlInput.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerUrlInput, @@ -1273,7 +1273,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into()); app.push_navigation_stack(ActiveSonarrBlock::EditIndexerApiKeyInput.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerApiKeyInput, @@ -1309,7 +1309,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into()); app.push_navigation_stack(ActiveSonarrBlock::EditIndexerSeedRatioInput.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerSeedRatioInput, @@ -1345,7 +1345,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into()); app.push_navigation_stack(ActiveSonarrBlock::EditIndexerTagsInput.into()); - EditIndexerHandler::with( + EditIndexerHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditIndexerTagsInput, @@ -1388,7 +1388,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EditIndexerPrompt.into()); app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -1419,7 +1419,7 @@ mod tests { app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); app.should_ignore_quit_key = true; - EditIndexerHandler::with(ESC_KEY, &mut app, active_sonarr_block, None).handle(); + EditIndexerHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into()); assert!(!app.should_ignore_quit_key); @@ -1449,7 +1449,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveSonarrBlock::EditIndexerNameInput, @@ -1479,7 +1479,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveSonarrBlock::EditIndexerUrlInput, @@ -1509,7 +1509,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveSonarrBlock::EditIndexerApiKeyInput, @@ -1539,7 +1539,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveSonarrBlock::EditIndexerSeedRatioInput, @@ -1569,7 +1569,7 @@ mod tests { ..EditIndexerModal::default() }); - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveSonarrBlock::EditIndexerTagsInput, @@ -1596,7 +1596,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( Key::Char('h'), &mut app, ActiveSonarrBlock::EditIndexerNameInput, @@ -1623,7 +1623,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( Key::Char('h'), &mut app, ActiveSonarrBlock::EditIndexerUrlInput, @@ -1650,7 +1650,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( Key::Char('h'), &mut app, ActiveSonarrBlock::EditIndexerApiKeyInput, @@ -1677,7 +1677,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( Key::Char('h'), &mut app, ActiveSonarrBlock::EditIndexerSeedRatioInput, @@ -1704,7 +1704,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - EditIndexerHandler::with( + EditIndexerHandler::new( Key::Char('h'), &mut app, ActiveSonarrBlock::EditIndexerTagsInput, @@ -1764,7 +1764,7 @@ mod tests { ..EditIndexerParams::default() }; - EditIndexerHandler::with( + EditIndexerHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -1823,7 +1823,7 @@ mod tests { ..EditIndexerParams::default() }; - let params = EditIndexerHandler::with( + let params = EditIndexerHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -1841,7 +1841,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.is_loading = true; - let handler = EditIndexerHandler::with( + let handler = EditIndexerHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -1857,7 +1857,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.is_loading = false; - let handler = EditIndexerHandler::with( + let handler = EditIndexerHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, @@ -1874,7 +1874,7 @@ mod tests { app.is_loading = false; app.data.sonarr_data.edit_indexer_modal = Some(EditIndexerModal::default()); - let handler = EditIndexerHandler::with( + let handler = EditIndexerHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::EditIndexerPrompt, diff --git a/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler.rs b/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler.rs index 31ea228..f1cd505 100644 --- a/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler.rs +++ b/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler.rs @@ -42,7 +42,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for IndexerSettingsHandl INDEXER_SETTINGS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler_tests.rs b/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler_tests.rs index ef33b99..62319f4 100644 --- a/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler_tests.rs +++ b/src/handlers/sonarr_handlers/indexers/edit_indexer_settings_handler_tests.rs @@ -30,7 +30,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.data.sonarr_data.indexer_settings = Some(IndexerSettings::default()); - IndexerSettingsHandler::with($key, &mut app, $block, None).handle(); + IndexerSettingsHandler::new($key, &mut app, $block, None).handle(); if $key == Key::Up { assert_eq!( @@ -67,7 +67,7 @@ mod tests { 0 ); - IndexerSettingsHandler::with(Key::Up, &mut app, $block, None).handle(); + IndexerSettingsHandler::new(Key::Up, &mut app, $block, None).handle(); assert_eq!( app @@ -80,7 +80,7 @@ mod tests { 1 ); - IndexerSettingsHandler::with($key, &mut app, $block, None).handle(); + IndexerSettingsHandler::new($key, &mut app, $block, None).handle(); assert_eq!( app .data @@ -105,7 +105,7 @@ mod tests { BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.down(); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( key, &mut app, ActiveSonarrBlock::AllIndexerSettingsPrompt, @@ -138,7 +138,7 @@ mod tests { BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.down(); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( key, &mut app, ActiveSonarrBlock::AllIndexerSettingsPrompt, @@ -209,7 +209,7 @@ mod tests { BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.y = INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1; - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( key, &mut app, ActiveSonarrBlock::AllIndexerSettingsPrompt, @@ -219,7 +219,7 @@ mod tests { assert!(app.data.sonarr_data.prompt_confirm); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( key, &mut app, ActiveSonarrBlock::AllIndexerSettingsPrompt, @@ -261,7 +261,7 @@ mod tests { .set_index(0, INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1); app.data.sonarr_data.indexer_settings = Some(IndexerSettings::default()); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AllIndexerSettingsPrompt, @@ -290,7 +290,7 @@ mod tests { app.data.sonarr_data.indexer_settings = Some(indexer_settings()); app.data.sonarr_data.prompt_confirm = true; - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AllIndexerSettingsPrompt, @@ -316,7 +316,7 @@ mod tests { app.data.sonarr_data.indexer_settings = Some(IndexerSettings::default()); app.data.sonarr_data.prompt_confirm = true; - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AllIndexerSettingsPrompt, @@ -348,7 +348,7 @@ mod tests { BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.set_index(0, y_index); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AllIndexerSettingsPrompt, @@ -372,7 +372,7 @@ mod tests { BlockSelectionState::new(INDEXER_SETTINGS_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.set_index(0, y_index); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AllIndexerSettingsPrompt, @@ -402,7 +402,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::AllIndexerSettingsPrompt.into()); app.push_navigation_stack(active_sonarr_block.into()); - IndexerSettingsHandler::with(SUBMIT_KEY, &mut app, active_sonarr_block, None).handle(); + IndexerSettingsHandler::new(SUBMIT_KEY, &mut app, active_sonarr_block, None).handle(); assert_eq!( app.get_current_route(), @@ -429,7 +429,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::AllIndexerSettingsPrompt.into()); app.data.sonarr_data.indexer_settings = Some(IndexerSettings::default()); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::AllIndexerSettingsPrompt, @@ -457,7 +457,7 @@ mod tests { app.push_navigation_stack(active_sonarr_block.into()); app.data.sonarr_data.indexer_settings = Some(IndexerSettings::default()); - IndexerSettingsHandler::with(ESC_KEY, &mut app, active_sonarr_block, None).handle(); + IndexerSettingsHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into()); assert_eq!( @@ -492,7 +492,7 @@ mod tests { .set_index(0, INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1); app.data.sonarr_data.indexer_settings = Some(indexer_settings()); - IndexerSettingsHandler::with( + IndexerSettingsHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveSonarrBlock::AllIndexerSettingsPrompt, @@ -526,7 +526,7 @@ mod tests { let mut app = App::default(); app.data.sonarr_data.indexer_settings = Some(indexer_settings()); - let actual_indexer_settings = IndexerSettingsHandler::with( + let actual_indexer_settings = IndexerSettingsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::AllIndexerSettingsPrompt, @@ -544,7 +544,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.is_loading = true; - let handler = IndexerSettingsHandler::with( + let handler = IndexerSettingsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::AllIndexerSettingsPrompt, @@ -560,7 +560,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.is_loading = false; - let handler = IndexerSettingsHandler::with( + let handler = IndexerSettingsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::AllIndexerSettingsPrompt, @@ -577,7 +577,7 @@ mod tests { app.is_loading = false; app.data.sonarr_data.indexer_settings = Some(IndexerSettings::default()); - let handler = IndexerSettingsHandler::with( + let handler = IndexerSettingsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::AllIndexerSettingsPrompt, diff --git a/src/handlers/sonarr_handlers/indexers/indexers_handler_tests.rs b/src/handlers/sonarr_handlers/indexers/indexers_handler_tests.rs index d097745..10f0ee6 100644 --- a/src/handlers/sonarr_handlers/indexers/indexers_handler_tests.rs +++ b/src/handlers/sonarr_handlers/indexers/indexers_handler_tests.rs @@ -33,7 +33,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with(DELETE_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle(); + IndexersHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle(); assert_eq!( app.get_current_route(), @@ -52,7 +52,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with(DELETE_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle(); + IndexersHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into()); } @@ -71,7 +71,7 @@ mod tests { app.is_loading = is_ready; app.data.sonarr_data.main_tabs.set_index(5); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::Indexers, @@ -96,7 +96,7 @@ mod tests { app.is_loading = is_ready; app.data.sonarr_data.main_tabs.set_index(5); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::Indexers, @@ -118,11 +118,11 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); - IndexersHandler::with(key, &mut app, ActiveSonarrBlock::DeleteIndexerPrompt, None).handle(); + IndexersHandler::new(key, &mut app, ActiveSonarrBlock::DeleteIndexerPrompt, None).handle(); assert!(app.data.sonarr_data.prompt_confirm); - IndexersHandler::with(key, &mut app, ActiveSonarrBlock::DeleteIndexerPrompt, None).handle(); + IndexersHandler::new(key, &mut app, ActiveSonarrBlock::DeleteIndexerPrompt, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); } @@ -199,7 +199,7 @@ mod tests { sonarr_data.indexers.set_items(vec![indexer]); app.data.sonarr_data = sonarr_data; - IndexersHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle(); + IndexersHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle(); assert_eq!( app.get_current_route(), @@ -238,7 +238,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle(); + IndexersHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into()); assert_eq!(app.data.sonarr_data.edit_indexer_modal, None); @@ -252,7 +252,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.push_navigation_stack(ActiveSonarrBlock::DeleteIndexerPrompt.into()); - IndexersHandler::with( + IndexersHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::DeleteIndexerPrompt, @@ -279,7 +279,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.push_navigation_stack(ActiveSonarrBlock::DeleteIndexerPrompt.into()); - IndexersHandler::with( + IndexersHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::DeleteIndexerPrompt, @@ -308,7 +308,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::DeleteIndexerPrompt.into()); app.data.sonarr_data.prompt_confirm = true; - IndexersHandler::with( + IndexersHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::DeleteIndexerPrompt, @@ -328,7 +328,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.push_navigation_stack(ActiveSonarrBlock::TestIndexer.into()); - IndexersHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::TestIndexer, None).handle(); + IndexersHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::TestIndexer, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into()); assert_eq!(app.data.sonarr_data.indexer_test_errors, None); @@ -342,7 +342,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); - IndexersHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle(); + IndexersHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::Indexers, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Indexers.into()); assert!(app.error.text.is_empty()); @@ -369,7 +369,7 @@ mod tests { .set_items(vec![Indexer::default()]); app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveSonarrBlock::Indexers, @@ -392,7 +392,7 @@ mod tests { .set_items(vec![Indexer::default()]); app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveSonarrBlock::Indexers, @@ -419,7 +419,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.settings.key, &mut app, ActiveSonarrBlock::Indexers, @@ -448,7 +448,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.settings.key, &mut app, ActiveSonarrBlock::Indexers, @@ -469,7 +469,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.test.key, &mut app, ActiveSonarrBlock::Indexers, @@ -494,7 +494,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.test.key, &mut app, ActiveSonarrBlock::Indexers, @@ -515,7 +515,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.test_all.key, &mut app, ActiveSonarrBlock::Indexers, @@ -540,7 +540,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.test_all.key, &mut app, ActiveSonarrBlock::Indexers, @@ -558,7 +558,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.push_navigation_stack(ActiveSonarrBlock::DeleteIndexerPrompt.into()); - IndexersHandler::with( + IndexersHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveSonarrBlock::DeleteIndexerPrompt, @@ -648,7 +648,7 @@ mod tests { let mut app = App::default(); app.data.sonarr_data.indexers.set_items(vec![indexer()]); - let indexer_id = IndexersHandler::with( + let indexer_id = IndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::Indexers, @@ -665,7 +665,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.is_loading = true; - let handler = IndexersHandler::with( + let handler = IndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::Indexers, @@ -681,7 +681,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.is_loading = false; - let handler = IndexersHandler::with( + let handler = IndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::Indexers, @@ -702,7 +702,7 @@ mod tests { .indexers .set_items(vec![Indexer::default()]); - let handler = IndexersHandler::with( + let handler = IndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::Indexers, diff --git a/src/handlers/sonarr_handlers/indexers/mod.rs b/src/handlers/sonarr_handlers/indexers/mod.rs index 12375ab..be21947 100644 --- a/src/handlers/sonarr_handlers/indexers/mod.rs +++ b/src/handlers/sonarr_handlers/indexers/mod.rs @@ -47,15 +47,15 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for IndexersHandler<'a, if !self.handle_indexers_table_events(indexers_table_handling_config) { match self.active_sonarr_block { _ if EditIndexerHandler::accepts(self.active_sonarr_block) => { - EditIndexerHandler::with(self.key, self.app, self.active_sonarr_block, self.context) + EditIndexerHandler::new(self.key, self.app, self.active_sonarr_block, self.context) .handle() } _ if IndexerSettingsHandler::accepts(self.active_sonarr_block) => { - IndexerSettingsHandler::with(self.key, self.app, self.active_sonarr_block, self.context) + IndexerSettingsHandler::new(self.key, self.app, self.active_sonarr_block, self.context) .handle() } _ if TestAllIndexersHandler::accepts(self.active_sonarr_block) => { - TestAllIndexersHandler::with(self.key, self.app, self.active_sonarr_block, self.context) + TestAllIndexersHandler::new(self.key, self.app, self.active_sonarr_block, self.context) .handle() } _ => self.handle_key_event(), @@ -70,7 +70,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for IndexersHandler<'a, || INDEXERS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler.rs b/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler.rs index 91ff186..6db07fd 100644 --- a/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler.rs +++ b/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler.rs @@ -48,7 +48,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for TestAllIndexersHandl active_block == ActiveSonarrBlock::TestAllIndexers } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler_tests.rs b/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler_tests.rs index be828d1..c86c18d 100644 --- a/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler_tests.rs +++ b/src/handlers/sonarr_handlers/indexers/test_all_indexers_handler_tests.rs @@ -23,7 +23,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::TestAllIndexers.into()); app.data.sonarr_data.indexer_test_all_results = Some(StatefulTable::default()); - TestAllIndexersHandler::with( + TestAllIndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::TestAllIndexers, @@ -54,7 +54,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.is_loading = true; - let handler = TestAllIndexersHandler::with( + let handler = TestAllIndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::TestAllIndexers, @@ -70,7 +70,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Indexers.into()); app.is_loading = false; - let handler = TestAllIndexersHandler::with( + let handler = TestAllIndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::TestAllIndexers, @@ -87,7 +87,7 @@ mod tests { app.is_loading = false; app.data.sonarr_data.indexer_test_all_results = Some(StatefulTable::default()); - let handler = TestAllIndexersHandler::with( + let handler = TestAllIndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::TestAllIndexers, @@ -106,7 +106,7 @@ mod tests { indexer_test_results.set_items(vec![IndexerTestResultModalItem::default()]); app.data.sonarr_data.indexer_test_all_results = Some(indexer_test_results); - let handler = TestAllIndexersHandler::with( + let handler = TestAllIndexersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::TestAllIndexers, diff --git a/src/handlers/sonarr_handlers/library/add_series_handler.rs b/src/handlers/sonarr_handlers/library/add_series_handler.rs index a98c2ba..8704c2f 100644 --- a/src/handlers/sonarr_handlers/library/add_series_handler.rs +++ b/src/handlers/sonarr_handlers/library/add_series_handler.rs @@ -132,7 +132,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for AddSeriesHandler<'a, ADD_SERIES_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs b/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs index c38ac00..e6d078b 100644 --- a/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs +++ b/src/handlers/sonarr_handlers/library/add_series_handler_tests.rs @@ -50,7 +50,7 @@ mod tests { if key == Key::Up { for i in (0..monitor_vec.len()).rev() { - AddSeriesHandler::with( + AddSeriesHandler::new( key, &mut app, ActiveSonarrBlock::AddSeriesSelectMonitor, @@ -72,7 +72,7 @@ mod tests { } } else { for i in 0..monitor_vec.len() { - AddSeriesHandler::with( + AddSeriesHandler::new( key, &mut app, ActiveSonarrBlock::AddSeriesSelectMonitor, @@ -114,7 +114,7 @@ mod tests { if key == Key::Up { for i in (0..series_type_vec.len()).rev() { - AddSeriesHandler::with( + AddSeriesHandler::new( key, &mut app, ActiveSonarrBlock::AddSeriesSelectSeriesType, @@ -136,7 +136,7 @@ mod tests { } } else { for i in 0..series_type_vec.len() { - AddSeriesHandler::with( + AddSeriesHandler::new( key, &mut app, ActiveSonarrBlock::AddSeriesSelectSeriesType, @@ -175,7 +175,7 @@ mod tests { .quality_profile_list .set_items(vec!["Test 1".to_owned(), "Test 2".to_owned()]); - AddSeriesHandler::with( + AddSeriesHandler::new( key, &mut app, ActiveSonarrBlock::AddSeriesSelectQualityProfile, @@ -195,7 +195,7 @@ mod tests { "Test 2" ); - AddSeriesHandler::with( + AddSeriesHandler::new( key, &mut app, ActiveSonarrBlock::AddSeriesSelectQualityProfile, @@ -232,7 +232,7 @@ mod tests { .language_profile_list .set_items(vec!["Test 1".to_owned(), "Test 2".to_owned()]); - AddSeriesHandler::with( + AddSeriesHandler::new( key, &mut app, ActiveSonarrBlock::AddSeriesSelectLanguageProfile, @@ -252,7 +252,7 @@ mod tests { "Test 2" ); - AddSeriesHandler::with( + AddSeriesHandler::new( key, &mut app, ActiveSonarrBlock::AddSeriesSelectLanguageProfile, @@ -289,7 +289,7 @@ mod tests { .root_folder_list .set_items(simple_stateful_iterable_vec!(RootFolder, String, path)); - AddSeriesHandler::with( + AddSeriesHandler::new( key, &mut app, ActiveSonarrBlock::AddSeriesSelectRootFolder, @@ -310,7 +310,7 @@ mod tests { "Test 2" ); - AddSeriesHandler::with( + AddSeriesHandler::new( key, &mut app, ActiveSonarrBlock::AddSeriesSelectRootFolder, @@ -339,7 +339,7 @@ mod tests { app.data.sonarr_data.selected_block = BlockSelectionState::new(ADD_SERIES_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.down(); - AddSeriesHandler::with(key, &mut app, ActiveSonarrBlock::AddSeriesPrompt, None).handle(); + AddSeriesHandler::new(key, &mut app, ActiveSonarrBlock::AddSeriesPrompt, None).handle(); if key == Key::Up { assert_eq!( @@ -362,7 +362,7 @@ mod tests { app.data.sonarr_data.selected_block = BlockSelectionState::new(ADD_SERIES_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.down(); - AddSeriesHandler::with(key, &mut app, ActiveSonarrBlock::AddSeriesPrompt, None).handle(); + AddSeriesHandler::new(key, &mut app, ActiveSonarrBlock::AddSeriesPrompt, None).handle(); assert_eq!( app.data.sonarr_data.selected_block.get_active_block(), @@ -397,7 +397,7 @@ mod tests { .monitor_list .set_items(monitor_vec.clone()); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::AddSeriesSelectMonitor, @@ -417,7 +417,7 @@ mod tests { &monitor_vec[monitor_vec.len() - 1] ); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::AddSeriesSelectMonitor, @@ -453,7 +453,7 @@ mod tests { .series_type_list .set_items(series_type_vec.clone()); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::AddSeriesSelectSeriesType, @@ -473,7 +473,7 @@ mod tests { &series_type_vec[series_type_vec.len() - 1] ); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::AddSeriesSelectSeriesType, @@ -512,7 +512,7 @@ mod tests { "Test 3".to_owned(), ]); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::AddSeriesSelectQualityProfile, @@ -532,7 +532,7 @@ mod tests { "Test 3" ); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::AddSeriesSelectQualityProfile, @@ -571,7 +571,7 @@ mod tests { "Test 3".to_owned(), ]); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::AddSeriesSelectLanguageProfile, @@ -591,7 +591,7 @@ mod tests { "Test 3" ); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::AddSeriesSelectLanguageProfile, @@ -626,7 +626,7 @@ mod tests { .root_folder_list .set_items(extended_stateful_iterable_vec!(RootFolder, String, path)); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::AddSeriesSelectRootFolder, @@ -647,7 +647,7 @@ mod tests { "Test 3" ); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::AddSeriesSelectRootFolder, @@ -675,7 +675,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.data.sonarr_data.add_series_search = Some("Test".into()); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::AddSeriesSearchInput, @@ -695,7 +695,7 @@ mod tests { 4 ); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::AddSeriesSearchInput, @@ -725,7 +725,7 @@ mod tests { ..AddSeriesModal::default() }); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::AddSeriesTagsInput, @@ -746,7 +746,7 @@ mod tests { 4 ); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::AddSeriesTagsInput, @@ -783,11 +783,11 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::Series.into()); - AddSeriesHandler::with(key, &mut app, ActiveSonarrBlock::AddSeriesPrompt, None).handle(); + AddSeriesHandler::new(key, &mut app, ActiveSonarrBlock::AddSeriesPrompt, None).handle(); assert!(app.data.sonarr_data.prompt_confirm); - AddSeriesHandler::with(key, &mut app, ActiveSonarrBlock::AddSeriesPrompt, None).handle(); + AddSeriesHandler::new(key, &mut app, ActiveSonarrBlock::AddSeriesPrompt, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); } @@ -798,7 +798,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.data.sonarr_data.add_series_search = Some("Test".into()); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::AddSeriesSearchInput, @@ -818,7 +818,7 @@ mod tests { 1 ); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::AddSeriesSearchInput, @@ -848,7 +848,7 @@ mod tests { ..AddSeriesModal::default() }); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::AddSeriesTagsInput, @@ -869,7 +869,7 @@ mod tests { 1 ); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::AddSeriesTagsInput, @@ -915,7 +915,7 @@ mod tests { app.should_ignore_quit_key = true; app.data.sonarr_data.add_series_search = Some("test".into()); - AddSeriesHandler::with( + AddSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AddSeriesSearchInput, @@ -938,7 +938,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::AddSeriesSearchInput.into()); app.should_ignore_quit_key = true; - AddSeriesHandler::with( + AddSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AddSeriesSearchInput, @@ -963,7 +963,7 @@ mod tests { app.data.sonarr_data.quality_profile_map = BiMap::from_iter([(1, "B - Test 2".to_owned()), (0, "A - Test 1".to_owned())]); - AddSeriesHandler::with( + AddSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AddSeriesSearchResults, @@ -1029,7 +1029,7 @@ mod tests { let mut add_searched_series = StatefulTable::default(); add_searched_series.set_items(vec![AddSeriesSearchResult::default()]); - AddSeriesHandler::with( + AddSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AddSeriesSearchResults, @@ -1049,7 +1049,7 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.push_navigation_stack(ActiveSonarrBlock::AddSeriesSearchResults.into()); - AddSeriesHandler::with( + AddSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AddSeriesSearchResults, @@ -1076,7 +1076,7 @@ mod tests { .series .set_items(vec![Series::default()]); - AddSeriesHandler::with( + AddSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AddSeriesSearchResults, @@ -1102,7 +1102,7 @@ mod tests { .selected_block .set_index(0, ADD_SERIES_SELECTION_BLOCKS.len() - 1); - AddSeriesHandler::with( + AddSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AddSeriesPrompt, @@ -1185,7 +1185,7 @@ mod tests { .selected_block .set_index(0, ADD_SERIES_SELECTION_BLOCKS.len() - 1); - AddSeriesHandler::with( + AddSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AddSeriesPrompt, @@ -1218,7 +1218,7 @@ mod tests { app.data.sonarr_data.selected_block = BlockSelectionState::new(ADD_SERIES_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.set_index(0, y_index); - AddSeriesHandler::with( + AddSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AddSeriesPrompt, @@ -1251,7 +1251,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::AddSeriesPrompt.into()); app.push_navigation_stack(active_sonarr_block.into()); - AddSeriesHandler::with(SUBMIT_KEY, &mut app, active_sonarr_block, None).handle(); + AddSeriesHandler::new(SUBMIT_KEY, &mut app, active_sonarr_block, None).handle(); assert_eq!( app.get_current_route(), @@ -1272,7 +1272,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.push_navigation_stack(ActiveSonarrBlock::AddSeriesPrompt.into()); - AddSeriesHandler::with( + AddSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AddSeriesPrompt, @@ -1294,7 +1294,7 @@ mod tests { .use_season_folder ); - AddSeriesHandler::with( + AddSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AddSeriesPrompt, @@ -1340,7 +1340,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.push_navigation_stack(ActiveSonarrBlock::AddSeriesSearchInput.into()); - AddSeriesHandler::with( + AddSeriesHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::AddSeriesSearchInput, @@ -1362,7 +1362,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::AddSeriesPrompt.into()); app.push_navigation_stack(ActiveSonarrBlock::AddSeriesTagsInput.into()); - AddSeriesHandler::with( + AddSeriesHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::AddSeriesTagsInput, @@ -1396,7 +1396,7 @@ mod tests { )); app.data.sonarr_data.add_searched_series = Some(add_searched_series); - AddSeriesHandler::with(ESC_KEY, &mut app, active_sonarr_block, None).handle(); + AddSeriesHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle(); assert_eq!( app.get_current_route(), @@ -1414,7 +1414,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::AddSeriesSearchResults.into()); app.push_navigation_stack(ActiveSonarrBlock::AddSeriesAlreadyInLibrary.into()); - AddSeriesHandler::with( + AddSeriesHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::AddSeriesAlreadyInLibrary, @@ -1437,7 +1437,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::AddSeriesSearchResults.into()); app.push_navigation_stack(ActiveSonarrBlock::AddSeriesPrompt.into()); - AddSeriesHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::AddSeriesPrompt, None).handle(); + AddSeriesHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::AddSeriesPrompt, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); assert_eq!( @@ -1456,7 +1456,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::AddSeriesPrompt.into()); app.push_navigation_stack(ActiveSonarrBlock::AddSeriesTagsInput.into()); - AddSeriesHandler::with( + AddSeriesHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::AddSeriesTagsInput, @@ -1487,7 +1487,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::AddSeriesPrompt.into()); app.push_navigation_stack(active_sonarr_block.into()); - AddSeriesHandler::with(ESC_KEY, &mut app, active_sonarr_block, None).handle(); + AddSeriesHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle(); assert_eq!( app.get_current_route(), @@ -1513,7 +1513,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.data.sonarr_data.add_series_search = Some("Test".into()); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveSonarrBlock::AddSeriesSearchInput, @@ -1542,7 +1542,7 @@ mod tests { ..AddSeriesModal::default() }); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveSonarrBlock::AddSeriesTagsInput, @@ -1569,7 +1569,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.data.sonarr_data.add_series_search = Some(HorizontallyScrollableText::default()); - AddSeriesHandler::with( + AddSeriesHandler::new( Key::Char('h'), &mut app, ActiveSonarrBlock::AddSeriesSearchInput, @@ -1595,7 +1595,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.data.sonarr_data.add_series_modal = Some(AddSeriesModal::default()); - AddSeriesHandler::with( + AddSeriesHandler::new( Key::Char('h'), &mut app, ActiveSonarrBlock::AddSeriesTagsInput, @@ -1686,7 +1686,7 @@ mod tests { .selected_block .set_index(0, ADD_SERIES_SELECTION_BLOCKS.len() - 1); - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveSonarrBlock::AddSeriesPrompt, @@ -1719,7 +1719,7 @@ mod tests { let mut app = App::default(); app.data.sonarr_data.add_series_search = None; - AddSeriesHandler::with( + AddSeriesHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::AddSeriesSearchResults, @@ -1789,7 +1789,7 @@ mod tests { }, }; - let add_series_body = AddSeriesHandler::with( + let add_series_body = AddSeriesHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::AddSeriesPrompt, @@ -1807,7 +1807,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.is_loading = true; - let handler = AddSeriesHandler::with( + let handler = AddSeriesHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::AddSeriesPrompt, @@ -1823,7 +1823,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.is_loading = false; - let handler = AddSeriesHandler::with( + let handler = AddSeriesHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::AddSeriesPrompt, diff --git a/src/handlers/sonarr_handlers/library/delete_series_handler.rs b/src/handlers/sonarr_handlers/library/delete_series_handler.rs index 51326c2..ff40805 100644 --- a/src/handlers/sonarr_handlers/library/delete_series_handler.rs +++ b/src/handlers/sonarr_handlers/library/delete_series_handler.rs @@ -38,7 +38,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for DeleteSeriesHandler< DELETE_SERIES_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs b/src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs index cdaaae4..1f7e66d 100644 --- a/src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs +++ b/src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs @@ -28,7 +28,7 @@ mod tests { BlockSelectionState::new(DELETE_SERIES_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.down(); - DeleteSeriesHandler::with(key, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, None) + DeleteSeriesHandler::new(key, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, None) .handle(); if key == Key::Up { @@ -54,7 +54,7 @@ mod tests { BlockSelectionState::new(DELETE_SERIES_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.down(); - DeleteSeriesHandler::with(key, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, None) + DeleteSeriesHandler::new(key, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, None) .handle(); assert_eq!( @@ -74,12 +74,12 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::DeleteSeriesPrompt.into()); - DeleteSeriesHandler::with(key, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, None) + DeleteSeriesHandler::new(key, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, None) .handle(); assert!(app.data.sonarr_data.prompt_confirm); - DeleteSeriesHandler::with(key, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, None) + DeleteSeriesHandler::new(key, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, None) .handle(); assert!(!app.data.sonarr_data.prompt_confirm); @@ -112,7 +112,7 @@ mod tests { app.data.sonarr_data.delete_series_files = true; app.data.sonarr_data.add_list_exclusion = true; - DeleteSeriesHandler::with( + DeleteSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, @@ -149,7 +149,7 @@ mod tests { .selected_block .set_index(0, DELETE_SERIES_SELECTION_BLOCKS.len() - 1); - DeleteSeriesHandler::with( + DeleteSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, @@ -178,7 +178,7 @@ mod tests { app.data.sonarr_data.delete_series_files = true; app.data.sonarr_data.add_list_exclusion = true; - DeleteSeriesHandler::with( + DeleteSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, @@ -205,7 +205,7 @@ mod tests { BlockSelectionState::new(DELETE_SERIES_SELECTION_BLOCKS); app.push_navigation_stack(ActiveSonarrBlock::DeleteSeriesPrompt.into()); - DeleteSeriesHandler::with( + DeleteSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, @@ -216,7 +216,7 @@ mod tests { assert_eq!(app.get_current_route(), current_route); assert_eq!(app.data.sonarr_data.delete_series_files, true); - DeleteSeriesHandler::with( + DeleteSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, @@ -246,7 +246,7 @@ mod tests { app.data.sonarr_data.delete_series_files = true; app.data.sonarr_data.add_list_exclusion = true; - DeleteSeriesHandler::with( + DeleteSeriesHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, @@ -293,7 +293,7 @@ mod tests { .selected_block .set_index(0, DELETE_SERIES_SELECTION_BLOCKS.len() - 1); - DeleteSeriesHandler::with( + DeleteSeriesHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, @@ -336,7 +336,7 @@ mod tests { add_list_exclusion: true, }; - let delete_series_params = DeleteSeriesHandler::with( + let delete_series_params = DeleteSeriesHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, @@ -354,7 +354,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = DeleteSeriesHandler::with( + let handler = DeleteSeriesHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, @@ -369,7 +369,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = DeleteSeriesHandler::with( + let handler = DeleteSeriesHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::DeleteSeriesPrompt, diff --git a/src/handlers/sonarr_handlers/library/edit_series_handler.rs b/src/handlers/sonarr_handlers/library/edit_series_handler.rs index 4583b02..424cfa9 100644 --- a/src/handlers/sonarr_handlers/library/edit_series_handler.rs +++ b/src/handlers/sonarr_handlers/library/edit_series_handler.rs @@ -97,7 +97,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EditSeriesHandler<'a EDIT_SERIES_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/library/edit_series_handler_tests.rs b/src/handlers/sonarr_handlers/library/edit_series_handler_tests.rs index fdc4828..a3d897a 100644 --- a/src/handlers/sonarr_handlers/library/edit_series_handler_tests.rs +++ b/src/handlers/sonarr_handlers/library/edit_series_handler_tests.rs @@ -44,7 +44,7 @@ mod tests { if key == Key::Up { for i in (0..series_type_vec.len()).rev() { - EditSeriesHandler::with( + EditSeriesHandler::new( key, &mut app, ActiveSonarrBlock::EditSeriesSelectSeriesType, @@ -66,7 +66,7 @@ mod tests { } } else { for i in 0..series_type_vec.len() { - EditSeriesHandler::with( + EditSeriesHandler::new( key, &mut app, ActiveSonarrBlock::EditSeriesSelectSeriesType, @@ -105,7 +105,7 @@ mod tests { .quality_profile_list .set_items(vec!["Test 1".to_owned(), "Test 2".to_owned()]); - EditSeriesHandler::with( + EditSeriesHandler::new( key, &mut app, ActiveSonarrBlock::EditSeriesSelectQualityProfile, @@ -125,7 +125,7 @@ mod tests { "Test 2" ); - EditSeriesHandler::with( + EditSeriesHandler::new( key, &mut app, ActiveSonarrBlock::EditSeriesSelectQualityProfile, @@ -162,7 +162,7 @@ mod tests { .language_profile_list .set_items(vec!["Test 1".to_owned(), "Test 2".to_owned()]); - EditSeriesHandler::with( + EditSeriesHandler::new( key, &mut app, ActiveSonarrBlock::EditSeriesSelectLanguageProfile, @@ -182,7 +182,7 @@ mod tests { "Test 2" ); - EditSeriesHandler::with( + EditSeriesHandler::new( key, &mut app, ActiveSonarrBlock::EditSeriesSelectLanguageProfile, @@ -211,7 +211,7 @@ mod tests { app.data.sonarr_data.selected_block = BlockSelectionState::new(EDIT_SERIES_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.down(); - EditSeriesHandler::with(key, &mut app, ActiveSonarrBlock::EditSeriesPrompt, None).handle(); + EditSeriesHandler::new(key, &mut app, ActiveSonarrBlock::EditSeriesPrompt, None).handle(); if key == Key::Up { assert_eq!( @@ -235,7 +235,7 @@ mod tests { app.data.sonarr_data.selected_block = BlockSelectionState::new(EDIT_SERIES_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.down(); - EditSeriesHandler::with(key, &mut app, ActiveSonarrBlock::EditSeriesPrompt, None).handle(); + EditSeriesHandler::new(key, &mut app, ActiveSonarrBlock::EditSeriesPrompt, None).handle(); assert_eq!( app.data.sonarr_data.selected_block.get_active_block(), @@ -269,7 +269,7 @@ mod tests { .series_type_list .set_items(series_type_vec.clone()); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::EditSeriesSelectSeriesType, @@ -289,7 +289,7 @@ mod tests { &series_type_vec[series_type_vec.len() - 1] ); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::EditSeriesSelectSeriesType, @@ -328,7 +328,7 @@ mod tests { "Test 3".to_owned(), ]); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::EditSeriesSelectQualityProfile, @@ -348,7 +348,7 @@ mod tests { "Test 3" ); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::EditSeriesSelectQualityProfile, @@ -387,7 +387,7 @@ mod tests { "Test 3".to_owned(), ]); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::EditSeriesSelectLanguageProfile, @@ -407,7 +407,7 @@ mod tests { "Test 3" ); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::EditSeriesSelectLanguageProfile, @@ -437,7 +437,7 @@ mod tests { ..EditSeriesModal::default() }); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::EditSeriesPathInput, @@ -458,7 +458,7 @@ mod tests { 4 ); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::EditSeriesPathInput, @@ -489,7 +489,7 @@ mod tests { ..EditSeriesModal::default() }); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::EditSeriesTagsInput, @@ -510,7 +510,7 @@ mod tests { 4 ); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::EditSeriesTagsInput, @@ -547,11 +547,11 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::Series.into()); - EditSeriesHandler::with(key, &mut app, ActiveSonarrBlock::EditSeriesPrompt, None).handle(); + EditSeriesHandler::new(key, &mut app, ActiveSonarrBlock::EditSeriesPrompt, None).handle(); assert!(app.data.sonarr_data.prompt_confirm); - EditSeriesHandler::with(key, &mut app, ActiveSonarrBlock::EditSeriesPrompt, None).handle(); + EditSeriesHandler::new(key, &mut app, ActiveSonarrBlock::EditSeriesPrompt, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); } @@ -565,7 +565,7 @@ mod tests { ..EditSeriesModal::default() }); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::EditSeriesPathInput, @@ -586,7 +586,7 @@ mod tests { 1 ); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::EditSeriesPathInput, @@ -617,7 +617,7 @@ mod tests { ..EditSeriesModal::default() }); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::EditSeriesTagsInput, @@ -638,7 +638,7 @@ mod tests { 1 ); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::EditSeriesTagsInput, @@ -686,7 +686,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EditSeriesPrompt.into()); app.push_navigation_stack(ActiveSonarrBlock::EditSeriesPathInput.into()); - EditSeriesHandler::with( + EditSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditSeriesPathInput, @@ -722,7 +722,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EditSeriesPrompt.into()); app.push_navigation_stack(ActiveSonarrBlock::EditSeriesPathInput.into()); - EditSeriesHandler::with( + EditSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditSeriesTagsInput, @@ -759,7 +759,7 @@ mod tests { .selected_block .set_index(0, EDIT_SERIES_SELECTION_BLOCKS.len() - 1); - EditSeriesHandler::with( + EditSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditSeriesPrompt, @@ -821,7 +821,7 @@ mod tests { .selected_block .set_index(0, EDIT_SERIES_SELECTION_BLOCKS.len() - 1); - EditSeriesHandler::with( + EditSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditSeriesPrompt, @@ -847,7 +847,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EditSeriesPrompt.into()); app.data.sonarr_data.prompt_confirm = true; - EditSeriesHandler::with( + EditSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditSeriesPrompt, @@ -875,7 +875,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.push_navigation_stack(current_route); - EditSeriesHandler::with( + EditSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditSeriesPrompt, @@ -895,7 +895,7 @@ mod tests { Some(true) ); - EditSeriesHandler::with( + EditSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditSeriesPrompt, @@ -929,7 +929,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.push_navigation_stack(current_route); - EditSeriesHandler::with( + EditSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditSeriesPrompt, @@ -949,7 +949,7 @@ mod tests { Some(true) ); - EditSeriesHandler::with( + EditSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditSeriesPrompt, @@ -993,7 +993,7 @@ mod tests { app.data.sonarr_data.selected_block = BlockSelectionState::new(EDIT_SERIES_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.set_index(0, y_index); - EditSeriesHandler::with( + EditSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditSeriesPrompt, @@ -1032,7 +1032,7 @@ mod tests { app.data.sonarr_data.selected_block = BlockSelectionState::new(EDIT_SERIES_SELECTION_BLOCKS); app.data.sonarr_data.selected_block.set_index(0, y_index); - EditSeriesHandler::with( + EditSeriesHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EditSeriesPrompt, @@ -1069,7 +1069,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EditSeriesPrompt.into()); app.push_navigation_stack(active_sonarr_block.into()); - EditSeriesHandler::with( + EditSeriesHandler::new( SUBMIT_KEY, &mut app, active_sonarr_block, @@ -1116,7 +1116,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EditSeriesPrompt.into()); app.push_navigation_stack(active_sonarr_block.into()); - EditSeriesHandler::with(ESC_KEY, &mut app, active_sonarr_block, None).handle(); + EditSeriesHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle(); assert!(!app.should_ignore_quit_key); assert_eq!( @@ -1133,7 +1133,7 @@ mod tests { app.data.sonarr_data = create_test_sonarr_data(); app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default()); - EditSeriesHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::EditSeriesPrompt, None) + EditSeriesHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::EditSeriesPrompt, None) .handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into()); @@ -1158,7 +1158,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.push_navigation_stack(active_sonarr_block.into()); - EditSeriesHandler::with(ESC_KEY, &mut app, active_sonarr_block, None).handle(); + EditSeriesHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into()); } @@ -1186,7 +1186,7 @@ mod tests { ..EditSeriesModal::default() }); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveSonarrBlock::EditSeriesPathInput, @@ -1216,7 +1216,7 @@ mod tests { ..EditSeriesModal::default() }); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveSonarrBlock::EditSeriesTagsInput, @@ -1243,7 +1243,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default()); - EditSeriesHandler::with( + EditSeriesHandler::new( Key::Char('h'), &mut app, ActiveSonarrBlock::EditSeriesPathInput, @@ -1270,7 +1270,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default()); - EditSeriesHandler::with( + EditSeriesHandler::new( Key::Char('h'), &mut app, ActiveSonarrBlock::EditSeriesTagsInput, @@ -1340,7 +1340,7 @@ mod tests { .selected_block .set_index(0, EDIT_SERIES_SELECTION_BLOCKS.len() - 1); - EditSeriesHandler::with( + EditSeriesHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveSonarrBlock::EditSeriesPrompt, @@ -1410,7 +1410,7 @@ mod tests { ..EditSeriesParams::default() }; - let edit_series_params = EditSeriesHandler::with( + let edit_series_params = EditSeriesHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::EditSeriesPrompt, @@ -1428,7 +1428,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.is_loading = true; - let handler = EditSeriesHandler::with( + let handler = EditSeriesHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::EditSeriesPrompt, @@ -1444,7 +1444,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.is_loading = false; - let handler = EditSeriesHandler::with( + let handler = EditSeriesHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::EditSeriesPrompt, @@ -1461,7 +1461,7 @@ mod tests { app.is_loading = false; app.data.sonarr_data.edit_series_modal = Some(EditSeriesModal::default()); - let handler = EditSeriesHandler::with( + let handler = EditSeriesHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::EditSeriesPrompt, diff --git a/src/handlers/sonarr_handlers/library/episode_details_handler.rs b/src/handlers/sonarr_handlers/library/episode_details_handler.rs index 9d987d2..fdb8ca4 100644 --- a/src/handlers/sonarr_handlers/library/episode_details_handler.rs +++ b/src/handlers/sonarr_handlers/library/episode_details_handler.rs @@ -88,7 +88,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for EpisodeDetailsHandle EPISODE_DETAILS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_sonarr_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs b/src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs index dfba3d3..537dc51 100644 --- a/src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs +++ b/src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs @@ -34,11 +34,11 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into()); - EpisodeDetailsHandler::with(key, &mut app, active_sonarr_block, None).handle(); + EpisodeDetailsHandler::new(key, &mut app, active_sonarr_block, None).handle(); assert!(app.data.sonarr_data.prompt_confirm); - EpisodeDetailsHandler::with(key, &mut app, active_sonarr_block, None).handle(); + EpisodeDetailsHandler::new(key, &mut app, active_sonarr_block, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); } @@ -86,7 +86,7 @@ mod tests { .position(|tab_route| tab_route.route == right_block.into()) .unwrap_or_default(); - EpisodeDetailsHandler::with(DEFAULT_KEYBINDINGS.left.key, &mut app, right_block, None) + EpisodeDetailsHandler::new(DEFAULT_KEYBINDINGS.left.key, &mut app, right_block, None) .handle(); assert_eq!( @@ -105,7 +105,7 @@ mod tests { ); assert_eq!(app.get_current_route(), left_block.into()); - EpisodeDetailsHandler::with(DEFAULT_KEYBINDINGS.right.key, &mut app, left_block, None) + EpisodeDetailsHandler::new(DEFAULT_KEYBINDINGS.right.key, &mut app, left_block, None) .handle(); assert_eq!( @@ -140,7 +140,7 @@ mod tests { let mut app = App::default(); app.data.sonarr_data = create_test_sonarr_data(); - EpisodeDetailsHandler::with( + EpisodeDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EpisodeHistory, @@ -170,7 +170,7 @@ mod tests { .episode_history = StatefulTable::default(); app.push_navigation_stack(ActiveSonarrBlock::EpisodeHistory.into()); - EpisodeDetailsHandler::with( + EpisodeDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EpisodeHistory, @@ -191,7 +191,7 @@ mod tests { app.is_loading = true; app.push_navigation_stack(ActiveSonarrBlock::EpisodeHistory.into()); - EpisodeDetailsHandler::with( + EpisodeDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::EpisodeHistory, @@ -235,7 +235,7 @@ mod tests { app.push_navigation_stack(active_sonarr_block.into()); app.push_navigation_stack(prompt_block.into()); - EpisodeDetailsHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + EpisodeDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(app.data.sonarr_data.prompt_confirm); assert_eq!(app.get_current_route(), active_sonarr_block.into()); @@ -253,7 +253,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::ManualEpisodeSearch.into()); app.push_navigation_stack(ActiveSonarrBlock::ManualEpisodeSearchConfirmPrompt.into()); - EpisodeDetailsHandler::with( + EpisodeDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::ManualEpisodeSearchConfirmPrompt, @@ -290,7 +290,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into()); app.push_navigation_stack(prompt_block.into()); - EpisodeDetailsHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + EpisodeDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); assert_eq!( @@ -306,7 +306,7 @@ mod tests { app.data.sonarr_data = create_test_sonarr_data(); app.push_navigation_stack(ActiveSonarrBlock::ManualEpisodeSearch.into()); - EpisodeDetailsHandler::with( + EpisodeDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::ManualEpisodeSearch, @@ -327,7 +327,7 @@ mod tests { app.is_loading = true; app.push_navigation_stack(ActiveSonarrBlock::ManualEpisodeSearch.into()); - EpisodeDetailsHandler::with( + EpisodeDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::ManualEpisodeSearch, @@ -356,7 +356,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EpisodeHistory.into()); app.push_navigation_stack(ActiveSonarrBlock::EpisodeHistoryDetails.into()); - EpisodeDetailsHandler::with( + EpisodeDetailsHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::EpisodeHistoryDetails, @@ -386,7 +386,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into()); app.push_navigation_stack(prompt_block.into()); - EpisodeDetailsHandler::with(ESC_KEY, &mut app, prompt_block, None).handle(); + EpisodeDetailsHandler::new(ESC_KEY, &mut app, prompt_block, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); assert_eq!( @@ -410,7 +410,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into()); app.push_navigation_stack(active_sonarr_block.into()); - EpisodeDetailsHandler::with(ESC_KEY, &mut app, active_sonarr_block, None).handle(); + EpisodeDetailsHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle(); assert_eq!( app.get_current_route(), @@ -447,7 +447,7 @@ mod tests { app.data.sonarr_data = create_test_sonarr_data(); app.push_navigation_stack(active_sonarr_block.into()); - EpisodeDetailsHandler::with( + EpisodeDetailsHandler::new( DEFAULT_KEYBINDINGS.auto_search.key, &mut app, active_sonarr_block, @@ -475,7 +475,7 @@ mod tests { app.is_loading = true; app.push_navigation_stack(active_sonarr_block.into()); - EpisodeDetailsHandler::with( + EpisodeDetailsHandler::new( DEFAULT_KEYBINDINGS.auto_search.key, &mut app, active_sonarr_block, @@ -501,7 +501,7 @@ mod tests { app.push_navigation_stack(active_sonarr_block.into()); app.is_routing = false; - EpisodeDetailsHandler::with( + EpisodeDetailsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, active_sonarr_block, @@ -529,7 +529,7 @@ mod tests { app.push_navigation_stack(active_sonarr_block.into()); app.is_routing = false; - EpisodeDetailsHandler::with( + EpisodeDetailsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, active_sonarr_block, @@ -565,7 +565,7 @@ mod tests { app.push_navigation_stack(active_sonarr_block.into()); app.push_navigation_stack(ActiveSonarrBlock::AutomaticallySearchEpisodePrompt.into()); - EpisodeDetailsHandler::with( + EpisodeDetailsHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveSonarrBlock::AutomaticallySearchEpisodePrompt, @@ -589,7 +589,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::ManualEpisodeSearch.into()); app.push_navigation_stack(ActiveSonarrBlock::ManualEpisodeSearchConfirmPrompt.into()); - EpisodeDetailsHandler::with( + EpisodeDetailsHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveSonarrBlock::ManualEpisodeSearchConfirmPrompt, @@ -632,7 +632,7 @@ mod tests { season_details_modal.episodes.set_items(vec![episode()]); app.data.sonarr_data.season_details_modal = Some(season_details_modal); - let episode_id = EpisodeDetailsHandler::with( + let episode_id = EpisodeDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::EpisodeDetails, @@ -648,7 +648,7 @@ mod tests { fn test_extract_episode_id_panics_when_season_details_modal_is_none() { let mut app = App::default(); - EpisodeDetailsHandler::with( + EpisodeDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::EpisodeDetails, @@ -663,7 +663,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into()); app.is_loading = true; - let handler = EpisodeDetailsHandler::with( + let handler = EpisodeDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::EpisodeDetails, @@ -679,7 +679,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into()); app.is_loading = false; - let handler = EpisodeDetailsHandler::with( + let handler = EpisodeDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::EpisodeDetails, @@ -703,7 +703,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EpisodeDetails.into()); app.is_loading = false; - let handler = EpisodeDetailsHandler::with( + let handler = EpisodeDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::EpisodeDetails, @@ -730,7 +730,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::EpisodeHistory.into()); app.is_loading = false; - let handler = EpisodeDetailsHandler::with( + let handler = EpisodeDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::EpisodeHistory, @@ -757,7 +757,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::ManualEpisodeSearch.into()); app.is_loading = false; - let handler = EpisodeDetailsHandler::with( + let handler = EpisodeDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::ManualEpisodeSearch, @@ -784,7 +784,7 @@ mod tests { app.push_navigation_stack(active_sonarr_block.into()); app.is_loading = false; - let handler = EpisodeDetailsHandler::with( + let handler = EpisodeDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, active_sonarr_block, @@ -809,7 +809,7 @@ mod tests { app.push_navigation_stack(active_sonarr_block.into()); app.is_loading = false; - let handler = EpisodeDetailsHandler::with( + let handler = EpisodeDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, active_sonarr_block, diff --git a/src/handlers/sonarr_handlers/library/library_handler_tests.rs b/src/handlers/sonarr_handlers/library/library_handler_tests.rs index c79a107..97f057e 100644 --- a/src/handlers/sonarr_handlers/library/library_handler_tests.rs +++ b/src/handlers/sonarr_handlers/library/library_handler_tests.rs @@ -59,7 +59,7 @@ mod tests { .series .set_items(vec![Series::default()]); - LibraryHandler::with(DELETE_KEY, &mut app, ActiveSonarrBlock::Series, None).handle(); + LibraryHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::Series, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into()); } @@ -77,7 +77,7 @@ mod tests { app.is_loading = is_ready; app.data.sonarr_data.main_tabs.set_index(0); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::Series, @@ -98,7 +98,7 @@ mod tests { app.is_loading = is_ready; app.data.sonarr_data.main_tabs.set_index(0); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::Series, @@ -120,7 +120,7 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::Series.into()); - LibraryHandler::with( + LibraryHandler::new( key, &mut app, ActiveSonarrBlock::UpdateAllSeriesPrompt, @@ -130,7 +130,7 @@ mod tests { assert!(app.data.sonarr_data.prompt_confirm); - LibraryHandler::with( + LibraryHandler::new( key, &mut app, ActiveSonarrBlock::UpdateAllSeriesPrompt, @@ -160,7 +160,7 @@ mod tests { .series .set_items(vec![Series::default()]); - LibraryHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Series, None).handle(); + LibraryHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Series, None).handle(); assert_eq!( app.get_current_route(), @@ -179,7 +179,7 @@ mod tests { .series .set_items(vec![Series::default()]); - LibraryHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Series, None).handle(); + LibraryHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::Series, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into()); } @@ -196,7 +196,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.push_navigation_stack(ActiveSonarrBlock::UpdateAllSeriesPrompt.into()); - LibraryHandler::with( + LibraryHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::UpdateAllSeriesPrompt, @@ -223,7 +223,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.push_navigation_stack(ActiveSonarrBlock::UpdateAllSeriesPrompt.into()); - LibraryHandler::with( + LibraryHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::UpdateAllSeriesPrompt, @@ -253,7 +253,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::UpdateAllSeriesPrompt.into()); app.data.sonarr_data.prompt_confirm = true; - LibraryHandler::with( + LibraryHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::UpdateAllSeriesPrompt, @@ -274,7 +274,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.data.sonarr_data = create_test_sonarr_data(); - LibraryHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::Series, None).handle(); + LibraryHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::Series, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into()); assert!(app.error.text.is_empty()); @@ -304,7 +304,7 @@ mod tests { .series .set_items(vec![Series::default()]); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.add.key, &mut app, ActiveSonarrBlock::Series, @@ -331,7 +331,7 @@ mod tests { .series .set_items(vec![Series::default()]); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.add.key, &mut app, ActiveSonarrBlock::Series, @@ -364,7 +364,7 @@ mod tests { .series .set_items(vec![Series::default()]); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.edit.key, &mut app, ActiveSonarrBlock::Series, @@ -385,7 +385,7 @@ mod tests { .series .set_items(vec![Series::default()]); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveSonarrBlock::Series, @@ -410,7 +410,7 @@ mod tests { .series .set_items(vec![Series::default()]); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveSonarrBlock::Series, @@ -431,7 +431,7 @@ mod tests { .set_items(vec![Series::default()]); app.push_navigation_stack(ActiveSonarrBlock::Series.into()); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveSonarrBlock::Series, @@ -454,7 +454,7 @@ mod tests { .set_items(vec![Series::default()]); app.push_navigation_stack(ActiveSonarrBlock::Series.into()); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveSonarrBlock::Series, @@ -477,7 +477,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.push_navigation_stack(ActiveSonarrBlock::UpdateAllSeriesPrompt.into()); - LibraryHandler::with( + LibraryHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveSonarrBlock::UpdateAllSeriesPrompt, @@ -832,7 +832,7 @@ mod tests { let mut app = App::default(); app.is_loading = true; - let handler = LibraryHandler::with( + let handler = LibraryHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::Series, @@ -847,7 +847,7 @@ mod tests { let mut app = App::default(); app.is_loading = false; - let handler = LibraryHandler::with( + let handler = LibraryHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::Series, @@ -867,7 +867,7 @@ mod tests { .series .set_items(vec![Series::default()]); - let handler = LibraryHandler::with( + let handler = LibraryHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::Series, diff --git a/src/handlers/sonarr_handlers/library/mod.rs b/src/handlers/sonarr_handlers/library/mod.rs index ef1f00c..a003821 100644 --- a/src/handlers/sonarr_handlers/library/mod.rs +++ b/src/handlers/sonarr_handlers/library/mod.rs @@ -64,27 +64,27 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for LibraryHandler<'a, ' if !self.handle_series_table_events(series_table_handling_config) { match self.active_sonarr_block { _ if AddSeriesHandler::accepts(self.active_sonarr_block) => { - AddSeriesHandler::with(self.key, self.app, self.active_sonarr_block, self.context) + AddSeriesHandler::new(self.key, self.app, self.active_sonarr_block, self.context) .handle(); } _ if DeleteSeriesHandler::accepts(self.active_sonarr_block) => { - DeleteSeriesHandler::with(self.key, self.app, self.active_sonarr_block, self.context) + DeleteSeriesHandler::new(self.key, self.app, self.active_sonarr_block, self.context) .handle(); } _ if EditSeriesHandler::accepts(self.active_sonarr_block) => { - EditSeriesHandler::with(self.key, self.app, self.active_sonarr_block, self.context) + EditSeriesHandler::new(self.key, self.app, self.active_sonarr_block, self.context) .handle(); } _ if SeriesDetailsHandler::accepts(self.active_sonarr_block) => { - SeriesDetailsHandler::with(self.key, self.app, self.active_sonarr_block, self.context) + SeriesDetailsHandler::new(self.key, self.app, self.active_sonarr_block, self.context) .handle(); } _ if SeasonDetailsHandler::accepts(self.active_sonarr_block) => { - SeasonDetailsHandler::with(self.key, self.app, self.active_sonarr_block, self.context) + SeasonDetailsHandler::new(self.key, self.app, self.active_sonarr_block, self.context) .handle(); } _ if EpisodeDetailsHandler::accepts(self.active_sonarr_block) => { - EpisodeDetailsHandler::with(self.key, self.app, self.active_sonarr_block, self.context) + EpisodeDetailsHandler::new(self.key, self.app, self.active_sonarr_block, self.context) .handle(); } _ => self.handle_key_event(), @@ -102,7 +102,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for LibraryHandler<'a, ' || LIBRARY_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/library/season_details_handler.rs b/src/handlers/sonarr_handlers/library/season_details_handler.rs index 8036cad..083c8a2 100644 --- a/src/handlers/sonarr_handlers/library/season_details_handler.rs +++ b/src/handlers/sonarr_handlers/library/season_details_handler.rs @@ -140,7 +140,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeasonDetailsHandler SEASON_DETAILS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/library/season_details_handler_tests.rs b/src/handlers/sonarr_handlers/library/season_details_handler_tests.rs index 02f2f7b..a990771 100644 --- a/src/handlers/sonarr_handlers/library/season_details_handler_tests.rs +++ b/src/handlers/sonarr_handlers/library/season_details_handler_tests.rs @@ -34,7 +34,7 @@ mod tests { app.data.sonarr_data = create_test_sonarr_data(); app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into()); - SeasonDetailsHandler::with(DELETE_KEY, &mut app, ActiveSonarrBlock::SeasonDetails, None) + SeasonDetailsHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::SeasonDetails, None) .handle(); assert_eq!( @@ -49,7 +49,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into()); app.is_loading = true; - SeasonDetailsHandler::with(DELETE_KEY, &mut app, ActiveSonarrBlock::SeasonDetails, None) + SeasonDetailsHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::SeasonDetails, None) .handle(); assert_eq!( @@ -78,11 +78,11 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into()); - SeasonDetailsHandler::with(key, &mut app, active_sonarr_block, None).handle(); + SeasonDetailsHandler::new(key, &mut app, active_sonarr_block, None).handle(); assert!(app.data.sonarr_data.prompt_confirm); - SeasonDetailsHandler::with(key, &mut app, active_sonarr_block, None).handle(); + SeasonDetailsHandler::new(key, &mut app, active_sonarr_block, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); } @@ -126,7 +126,7 @@ mod tests { .position(|tab_route| tab_route.route == right_block.into()) .unwrap_or_default(); - SeasonDetailsHandler::with(DEFAULT_KEYBINDINGS.left.key, &mut app, right_block, None) + SeasonDetailsHandler::new(DEFAULT_KEYBINDINGS.left.key, &mut app, right_block, None) .handle(); assert_eq!( @@ -142,7 +142,7 @@ mod tests { ); assert_eq!(app.get_current_route(), left_block.into()); - SeasonDetailsHandler::with(DEFAULT_KEYBINDINGS.right.key, &mut app, left_block, None) + SeasonDetailsHandler::new(DEFAULT_KEYBINDINGS.right.key, &mut app, left_block, None) .handle(); assert_eq!( @@ -175,7 +175,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into()); app.data.sonarr_data = create_test_sonarr_data(); - SeasonDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeasonDetails, None) + SeasonDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeasonDetails, None) .handle(); assert_eq!( @@ -197,7 +197,7 @@ mod tests { .episodes = StatefulTable::default(); app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into()); - SeasonDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeasonDetails, None) + SeasonDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeasonDetails, None) .handle(); assert_eq!( @@ -212,7 +212,7 @@ mod tests { app.is_loading = true; app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into()); - SeasonDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeasonDetails, None) + SeasonDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeasonDetails, None) .handle(); assert_eq!( @@ -226,7 +226,7 @@ mod tests { let mut app = App::default(); app.data.sonarr_data = create_test_sonarr_data(); - SeasonDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeasonHistory, None) + SeasonDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeasonHistory, None) .handle(); assert_eq!( @@ -248,7 +248,7 @@ mod tests { .season_history = StatefulTable::default(); app.push_navigation_stack(ActiveSonarrBlock::SeasonHistory.into()); - SeasonDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeasonHistory, None) + SeasonDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeasonHistory, None) .handle(); assert_eq!( @@ -264,7 +264,7 @@ mod tests { app.is_loading = true; app.push_navigation_stack(ActiveSonarrBlock::SeasonHistory.into()); - SeasonDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeasonHistory, None) + SeasonDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeasonHistory, None) .handle(); assert_eq!( @@ -294,7 +294,7 @@ mod tests { app.push_navigation_stack(active_sonarr_block.into()); app.push_navigation_stack(prompt_block.into()); - SeasonDetailsHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + SeasonDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(app.data.sonarr_data.prompt_confirm); assert_eq!(app.get_current_route(), active_sonarr_block.into()); @@ -312,7 +312,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::ManualSeasonSearch.into()); app.push_navigation_stack(ActiveSonarrBlock::ManualSeasonSearchConfirmPrompt.into()); - SeasonDetailsHandler::with( + SeasonDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::ManualSeasonSearchConfirmPrompt, @@ -351,7 +351,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into()); app.push_navigation_stack(prompt_block.into()); - SeasonDetailsHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + SeasonDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); assert_eq!( @@ -367,7 +367,7 @@ mod tests { app.data.sonarr_data = create_test_sonarr_data(); app.push_navigation_stack(ActiveSonarrBlock::ManualSeasonSearch.into()); - SeasonDetailsHandler::with( + SeasonDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::ManualSeasonSearch, @@ -388,7 +388,7 @@ mod tests { app.is_loading = true; app.push_navigation_stack(ActiveSonarrBlock::ManualSeasonSearch.into()); - SeasonDetailsHandler::with( + SeasonDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::ManualSeasonSearch, @@ -420,7 +420,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeasonHistory.into()); app.push_navigation_stack(ActiveSonarrBlock::SeasonHistoryDetails.into()); - SeasonDetailsHandler::with( + SeasonDetailsHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::SeasonHistoryDetails, @@ -451,7 +451,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into()); app.push_navigation_stack(prompt_block.into()); - SeasonDetailsHandler::with(ESC_KEY, &mut app, prompt_block, None).handle(); + SeasonDetailsHandler::new(ESC_KEY, &mut app, prompt_block, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); assert_eq!( @@ -481,7 +481,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into()); app.push_navigation_stack(ActiveSonarrBlock::SeasonHistory.into()); - SeasonDetailsHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::SeasonHistory, None) + SeasonDetailsHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::SeasonHistory, None) .handle(); assert_eq!( @@ -531,7 +531,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into()); app.push_navigation_stack(active_sonarr_block.into()); - SeasonDetailsHandler::with(ESC_KEY, &mut app, active_sonarr_block, None).handle(); + SeasonDetailsHandler::new(ESC_KEY, &mut app, active_sonarr_block, None).handle(); assert_eq!( app.get_current_route(), @@ -562,7 +562,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into()); app.is_routing = false; - SeasonDetailsHandler::with( + SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.toggle_monitoring.key, &mut app, ActiveSonarrBlock::SeasonDetails, @@ -589,7 +589,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into()); app.is_routing = false; - SeasonDetailsHandler::with( + SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.toggle_monitoring.key, &mut app, ActiveSonarrBlock::SeasonDetails, @@ -619,7 +619,7 @@ mod tests { app.data.sonarr_data = create_test_sonarr_data(); app.push_navigation_stack(active_sonarr_block.into()); - SeasonDetailsHandler::with( + SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.auto_search.key, &mut app, active_sonarr_block, @@ -646,7 +646,7 @@ mod tests { app.is_loading = true; app.push_navigation_stack(active_sonarr_block.into()); - SeasonDetailsHandler::with( + SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.auto_search.key, &mut app, active_sonarr_block, @@ -671,7 +671,7 @@ mod tests { app.push_navigation_stack(active_sonarr_block.into()); app.is_routing = false; - SeasonDetailsHandler::with( + SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, active_sonarr_block, @@ -698,7 +698,7 @@ mod tests { app.push_navigation_stack(active_sonarr_block.into()); app.is_routing = false; - SeasonDetailsHandler::with( + SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, active_sonarr_block, @@ -731,7 +731,7 @@ mod tests { app.push_navigation_stack(active_sonarr_block.into()); app.push_navigation_stack(prompt_block.into()); - SeasonDetailsHandler::with( + SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, prompt_block, @@ -755,7 +755,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::ManualSeasonSearch.into()); app.push_navigation_stack(ActiveSonarrBlock::ManualSeasonSearchConfirmPrompt.into()); - SeasonDetailsHandler::with( + SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveSonarrBlock::ManualSeasonSearchConfirmPrompt, @@ -797,7 +797,7 @@ mod tests { let mut app = App::default(); app.data.sonarr_data = create_test_sonarr_data(); - let episode_file_id = SeasonDetailsHandler::with( + let episode_file_id = SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SeasonDetails, @@ -813,7 +813,7 @@ mod tests { fn test_extract_episode_file_id_empty_season_details_modal_panics() { let mut app = App::default(); - SeasonDetailsHandler::with( + SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SeasonDetails, @@ -829,7 +829,7 @@ mod tests { season_details_modal.episodes.set_items(vec![episode()]); app.data.sonarr_data.season_details_modal = Some(season_details_modal); - let episode_id = SeasonDetailsHandler::with( + let episode_id = SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SeasonDetails, @@ -845,7 +845,7 @@ mod tests { fn test_extract_episode_id_panic_when_season_details_modal_is_none() { let mut app = App::default(); - SeasonDetailsHandler::with( + SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SeasonDetails, @@ -859,7 +859,7 @@ mod tests { let mut app = App::default(); app.data.sonarr_data = create_test_sonarr_data(); - let (series_id, season_number) = SeasonDetailsHandler::with( + let (series_id, season_number) = SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SeasonDetails, @@ -877,7 +877,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into()); app.is_loading = true; - let handler = SeasonDetailsHandler::with( + let handler = SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SeasonDetails, @@ -892,7 +892,7 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into()); - let handler = SeasonDetailsHandler::with( + let handler = SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SeasonDetails, @@ -908,7 +908,7 @@ mod tests { app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default()); app.push_navigation_stack(ActiveSonarrBlock::SeasonDetails.into()); - let handler = SeasonDetailsHandler::with( + let handler = SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SeasonDetails, @@ -924,7 +924,7 @@ mod tests { app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default()); app.push_navigation_stack(ActiveSonarrBlock::SeasonHistory.into()); - let handler = SeasonDetailsHandler::with( + let handler = SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SeasonHistory, @@ -940,7 +940,7 @@ mod tests { app.data.sonarr_data.season_details_modal = Some(SeasonDetailsModal::default()); app.push_navigation_stack(ActiveSonarrBlock::ManualSeasonSearch.into()); - let handler = SeasonDetailsHandler::with( + let handler = SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::ManualSeasonSearch, @@ -964,7 +964,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into()); app.push_navigation_stack(active_sonarr_block.into()); - let handler = SeasonDetailsHandler::with( + let handler = SeasonDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, active_sonarr_block, diff --git a/src/handlers/sonarr_handlers/library/series_details_handler.rs b/src/handlers/sonarr_handlers/library/series_details_handler.rs index c2ada4b..2613a9f 100644 --- a/src/handlers/sonarr_handlers/library/series_details_handler.rs +++ b/src/handlers/sonarr_handlers/library/series_details_handler.rs @@ -91,7 +91,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler SERIES_DETAILS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/library/series_details_handler_tests.rs b/src/handlers/sonarr_handlers/library/series_details_handler_tests.rs index a8a4600..0089543 100644 --- a/src/handlers/sonarr_handlers/library/series_details_handler_tests.rs +++ b/src/handlers/sonarr_handlers/library/series_details_handler_tests.rs @@ -33,11 +33,11 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::Series.into()); - SeriesDetailsHandler::with(key, &mut app, active_sonarr_block, None).handle(); + SeriesDetailsHandler::new(key, &mut app, active_sonarr_block, None).handle(); assert!(app.data.sonarr_data.prompt_confirm); - SeriesDetailsHandler::with(key, &mut app, active_sonarr_block, None).handle(); + SeriesDetailsHandler::new(key, &mut app, active_sonarr_block, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); } @@ -63,7 +63,7 @@ mod tests { .position(|tab_route| tab_route.route == right_block.into()) .unwrap_or_default(); - SeriesDetailsHandler::with(DEFAULT_KEYBINDINGS.left.key, &mut app, right_block, None) + SeriesDetailsHandler::new(DEFAULT_KEYBINDINGS.left.key, &mut app, right_block, None) .handle(); assert_eq!( @@ -72,7 +72,7 @@ mod tests { ); assert_eq!(app.get_current_route(), left_block.into()); - SeriesDetailsHandler::with(DEFAULT_KEYBINDINGS.right.key, &mut app, left_block, None) + SeriesDetailsHandler::new(DEFAULT_KEYBINDINGS.right.key, &mut app, left_block, None) .handle(); assert_eq!( @@ -102,7 +102,7 @@ mod tests { .seasons .set_items(extended_stateful_iterable_vec!(Season, Option)); - SeriesDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeriesDetails, None) + SeriesDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeriesDetails, None) .handle(); assert_eq!( @@ -116,7 +116,7 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into()); - SeriesDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeriesDetails, None) + SeriesDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeriesDetails, None) .handle(); assert_eq!( @@ -131,7 +131,7 @@ mod tests { app.is_loading = true; app.push_navigation_stack(ActiveSonarrBlock::Series.into()); - SeriesDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeriesDetails, None) + SeriesDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeriesDetails, None) .handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into()); @@ -144,7 +144,7 @@ mod tests { series_history.set_items(vec![SonarrHistoryItem::default()]); app.data.sonarr_data.series_history = Some(series_history); - SeriesDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeriesHistory, None) + SeriesDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeriesHistory, None) .handle(); assert_eq!( @@ -159,7 +159,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeriesHistory.into()); app.data.sonarr_data.series_history = Some(StatefulTable::default()); - SeriesDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeriesHistory, None) + SeriesDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeriesHistory, None) .handle(); assert_eq!( @@ -174,7 +174,7 @@ mod tests { app.is_loading = true; app.push_navigation_stack(ActiveSonarrBlock::Series.into()); - SeriesDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeriesHistory, None) + SeriesDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SeriesHistory, None) .handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::Series.into()); @@ -199,7 +199,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into()); app.push_navigation_stack(prompt_block.into()); - SeriesDetailsHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + SeriesDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(app.data.sonarr_data.prompt_confirm); assert_eq!( @@ -224,7 +224,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into()); app.push_navigation_stack(prompt_block.into()); - SeriesDetailsHandler::with(SUBMIT_KEY, &mut app, prompt_block, None).handle(); + SeriesDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); assert_eq!( @@ -249,7 +249,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeriesHistory.into()); app.push_navigation_stack(ActiveSonarrBlock::SeriesHistoryDetails.into()); - SeriesDetailsHandler::with( + SeriesDetailsHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::SeriesHistoryDetails, @@ -278,7 +278,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into()); app.push_navigation_stack(prompt_block.into()); - SeriesDetailsHandler::with(ESC_KEY, &mut app, prompt_block, None).handle(); + SeriesDetailsHandler::new(ESC_KEY, &mut app, prompt_block, None).handle(); assert!(!app.data.sonarr_data.prompt_confirm); assert_eq!( @@ -300,7 +300,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.push_navigation_stack(ActiveSonarrBlock::SeriesHistory.into()); - SeriesDetailsHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::SeriesHistory, None) + SeriesDetailsHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::SeriesHistory, None) .handle(); assert_eq!( @@ -366,7 +366,7 @@ mod tests { app.is_loading = true; app.push_navigation_stack(active_sonarr_block.into()); - SeriesDetailsHandler::with( + SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.edit.key, &mut app, active_sonarr_block, @@ -385,7 +385,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into()); app.is_routing = false; - SeriesDetailsHandler::with( + SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.toggle_monitoring.key, &mut app, ActiveSonarrBlock::SeriesDetails, @@ -412,7 +412,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SeriesDetails.into()); app.is_routing = false; - SeriesDetailsHandler::with( + SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.toggle_monitoring.key, &mut app, ActiveSonarrBlock::SeriesDetails, @@ -440,7 +440,7 @@ mod tests { app.data.sonarr_data.series_history = Some(series_history); app.push_navigation_stack(active_sonarr_block.into()); - SeriesDetailsHandler::with( + SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.auto_search.key, &mut app, active_sonarr_block, @@ -463,7 +463,7 @@ mod tests { app.is_loading = true; app.push_navigation_stack(active_sonarr_block.into()); - SeriesDetailsHandler::with( + SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.auto_search.key, &mut app, active_sonarr_block, @@ -485,7 +485,7 @@ mod tests { app.data.sonarr_data.series_history = Some(series_history); app.push_navigation_stack(active_sonarr_block.into()); - SeriesDetailsHandler::with( + SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, active_sonarr_block, @@ -508,7 +508,7 @@ mod tests { app.is_loading = true; app.push_navigation_stack(active_sonarr_block.into()); - SeriesDetailsHandler::with( + SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, active_sonarr_block, @@ -531,7 +531,7 @@ mod tests { app.push_navigation_stack(active_sonarr_block.into()); app.is_routing = false; - SeriesDetailsHandler::with( + SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, active_sonarr_block, @@ -553,7 +553,7 @@ mod tests { app.push_navigation_stack(active_sonarr_block.into()); app.is_routing = false; - SeriesDetailsHandler::with( + SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, active_sonarr_block, @@ -586,7 +586,7 @@ mod tests { app.push_navigation_stack(active_sonarr_block.into()); app.push_navigation_stack(prompt_block.into()); - SeriesDetailsHandler::with( + SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, prompt_block, @@ -620,7 +620,7 @@ mod tests { app.data.sonarr_data.series.set_items(vec![series()]); app.data.sonarr_data.seasons.set_items(vec![season()]); - let series_id_season_number_tuple = SeriesDetailsHandler::with( + let series_id_season_number_tuple = SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SeriesDetails, @@ -636,7 +636,7 @@ mod tests { let mut app = App::default(); app.data.sonarr_data.series.set_items(vec![series()]); - let series_id = SeriesDetailsHandler::with( + let series_id = SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SeriesDetails, @@ -653,7 +653,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.is_loading = true; - let handler = SeriesDetailsHandler::with( + let handler = SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SeriesDetails, @@ -668,7 +668,7 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::Series.into()); - let handler = SeriesDetailsHandler::with( + let handler = SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SeriesHistory, @@ -684,7 +684,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::Series.into()); app.data.sonarr_data.series_history = Some(StatefulTable::default()); - let handler = SeriesDetailsHandler::with( + let handler = SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SeriesHistory, @@ -699,7 +699,7 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::Series.into()); - let handler = SeriesDetailsHandler::with( + let handler = SeriesDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SeriesDetails, diff --git a/src/handlers/sonarr_handlers/mod.rs b/src/handlers/sonarr_handlers/mod.rs index 233a2bf..1c49525 100644 --- a/src/handlers/sonarr_handlers/mod.rs +++ b/src/handlers/sonarr_handlers/mod.rs @@ -41,26 +41,26 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SonarrHandler<'a, 'b fn handle(&mut self) { match self.active_sonarr_block { _ if LibraryHandler::accepts(self.active_sonarr_block) => { - LibraryHandler::with(self.key, self.app, self.active_sonarr_block, self.context).handle(); + LibraryHandler::new(self.key, self.app, self.active_sonarr_block, self.context).handle(); } _ if DownloadsHandler::accepts(self.active_sonarr_block) => { - DownloadsHandler::with(self.key, self.app, self.active_sonarr_block, self.context).handle() + DownloadsHandler::new(self.key, self.app, self.active_sonarr_block, self.context).handle() } _ if BlocklistHandler::accepts(self.active_sonarr_block) => { - BlocklistHandler::with(self.key, self.app, self.active_sonarr_block, self.context).handle() + BlocklistHandler::new(self.key, self.app, self.active_sonarr_block, self.context).handle() } _ if HistoryHandler::accepts(self.active_sonarr_block) => { - HistoryHandler::with(self.key, self.app, self.active_sonarr_block, self.context).handle() + HistoryHandler::new(self.key, self.app, self.active_sonarr_block, self.context).handle() } _ if RootFoldersHandler::accepts(self.active_sonarr_block) => { - RootFoldersHandler::with(self.key, self.app, self.active_sonarr_block, self.context) + RootFoldersHandler::new(self.key, self.app, self.active_sonarr_block, self.context) .handle() } _ if IndexersHandler::accepts(self.active_sonarr_block) => { - IndexersHandler::with(self.key, self.app, self.active_sonarr_block, self.context).handle() + IndexersHandler::new(self.key, self.app, self.active_sonarr_block, self.context).handle() } _ if SystemHandler::accepts(self.active_sonarr_block) => { - SystemHandler::with(self.key, self.app, self.active_sonarr_block, self.context).handle() + SystemHandler::new(self.key, self.app, self.active_sonarr_block, self.context).handle() } _ => self.handle_key_event(), } @@ -70,7 +70,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SonarrHandler<'a, 'b true } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/root_folders/mod.rs b/src/handlers/sonarr_handlers/root_folders/mod.rs index fc1069a..047a18a 100644 --- a/src/handlers/sonarr_handlers/root_folders/mod.rs +++ b/src/handlers/sonarr_handlers/root_folders/mod.rs @@ -68,7 +68,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for RootFoldersHandler<' ROOT_FOLDERS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/root_folders/root_folders_handler_tests.rs b/src/handlers/sonarr_handlers/root_folders/root_folders_handler_tests.rs index 018378b..4bd5b49 100644 --- a/src/handlers/sonarr_handlers/root_folders/root_folders_handler_tests.rs +++ b/src/handlers/sonarr_handlers/root_folders/root_folders_handler_tests.rs @@ -32,7 +32,7 @@ mod tests { .set_items(vec![RootFolder::default()]); app.data.sonarr_data.edit_root_folder = Some("Test".into()); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::AddRootFolderPrompt, @@ -52,7 +52,7 @@ mod tests { 4 ); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::AddRootFolderPrompt, @@ -91,7 +91,7 @@ mod tests { .root_folders .set_items(vec![RootFolder::default()]); - RootFoldersHandler::with(DELETE_KEY, &mut app, ActiveSonarrBlock::RootFolders, None).handle(); + RootFoldersHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::RootFolders, None).handle(); assert_eq!( app.get_current_route(), @@ -110,7 +110,7 @@ mod tests { .root_folders .set_items(vec![RootFolder::default()]); - RootFoldersHandler::with(DELETE_KEY, &mut app, ActiveSonarrBlock::RootFolders, None).handle(); + RootFoldersHandler::new(DELETE_KEY, &mut app, ActiveSonarrBlock::RootFolders, None).handle(); assert_eq!( app.get_current_route(), @@ -134,7 +134,7 @@ mod tests { app.is_loading = is_ready; app.data.sonarr_data.main_tabs.set_index(4); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::RootFolders, @@ -156,7 +156,7 @@ mod tests { app.is_loading = is_ready; app.data.sonarr_data.main_tabs.set_index(4); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::RootFolders, @@ -178,7 +178,7 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into()); - RootFoldersHandler::with( + RootFoldersHandler::new( key, &mut app, ActiveSonarrBlock::DeleteRootFolderPrompt, @@ -188,7 +188,7 @@ mod tests { assert!(app.data.sonarr_data.prompt_confirm); - RootFoldersHandler::with( + RootFoldersHandler::new( key, &mut app, ActiveSonarrBlock::DeleteRootFolderPrompt, @@ -205,7 +205,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into()); app.data.sonarr_data.edit_root_folder = Some("Test".into()); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::AddRootFolderPrompt, @@ -225,7 +225,7 @@ mod tests { 1 ); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::AddRootFolderPrompt, @@ -273,7 +273,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into()); app.push_navigation_stack(ActiveSonarrBlock::AddRootFolderPrompt.into()); - RootFoldersHandler::with( + RootFoldersHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AddRootFolderPrompt, @@ -303,7 +303,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into()); app.push_navigation_stack(ActiveSonarrBlock::AddRootFolderPrompt.into()); - RootFoldersHandler::with( + RootFoldersHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::AddRootFolderPrompt, @@ -332,7 +332,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into()); app.push_navigation_stack(ActiveSonarrBlock::DeleteRootFolderPrompt.into()); - RootFoldersHandler::with( + RootFoldersHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::DeleteRootFolderPrompt, @@ -362,7 +362,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into()); app.push_navigation_stack(ActiveSonarrBlock::DeleteRootFolderPrompt.into()); - RootFoldersHandler::with( + RootFoldersHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::DeleteRootFolderPrompt, @@ -393,7 +393,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::DeleteRootFolderPrompt.into()); app.data.sonarr_data.prompt_confirm = true; - RootFoldersHandler::with( + RootFoldersHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::DeleteRootFolderPrompt, @@ -416,7 +416,7 @@ mod tests { app.data.sonarr_data.edit_root_folder = Some("/nfs/test".into()); app.should_ignore_quit_key = true; - RootFoldersHandler::with( + RootFoldersHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::AddRootFolderPrompt, @@ -442,7 +442,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into()); app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into()); - RootFoldersHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::RootFolders, None).handle(); + RootFoldersHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::RootFolders, None).handle(); assert_eq!( app.get_current_route(), @@ -469,7 +469,7 @@ mod tests { .root_folders .set_items(vec![RootFolder::default()]); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.add.key, &mut app, ActiveSonarrBlock::RootFolders, @@ -496,7 +496,7 @@ mod tests { .root_folders .set_items(vec![RootFolder::default()]); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.add.key, &mut app, ActiveSonarrBlock::RootFolders, @@ -522,7 +522,7 @@ mod tests { .set_items(vec![RootFolder::default()]); app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into()); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveSonarrBlock::RootFolders, @@ -548,7 +548,7 @@ mod tests { .set_items(vec![RootFolder::default()]); app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into()); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveSonarrBlock::RootFolders, @@ -574,7 +574,7 @@ mod tests { .set_items(vec![RootFolder::default()]); app.data.sonarr_data.edit_root_folder = Some("/nfs/test".into()); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveSonarrBlock::AddRootFolderPrompt, @@ -599,7 +599,7 @@ mod tests { .set_items(vec![RootFolder::default()]); app.data.sonarr_data.edit_root_folder = Some(HorizontallyScrollableText::default()); - RootFoldersHandler::with( + RootFoldersHandler::new( Key::Char('h'), &mut app, ActiveSonarrBlock::AddRootFolderPrompt, @@ -624,7 +624,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into()); app.push_navigation_stack(ActiveSonarrBlock::DeleteRootFolderPrompt.into()); - RootFoldersHandler::with( + RootFoldersHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveSonarrBlock::DeleteRootFolderPrompt, @@ -664,7 +664,7 @@ mod tests { .root_folders .set_items(vec![root_folder()]); - let root_folder_id = RootFoldersHandler::with( + let root_folder_id = RootFoldersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::DeleteRootFolderPrompt, @@ -683,7 +683,7 @@ mod tests { path: "/nfs/test".to_owned(), }; - let root_folder = RootFoldersHandler::with( + let root_folder = RootFoldersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::AddRootFolderPrompt, @@ -701,7 +701,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into()); app.is_loading = true; - let handler = RootFoldersHandler::with( + let handler = RootFoldersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::RootFolders, @@ -717,7 +717,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::RootFolders.into()); app.is_loading = false; - let handler = RootFoldersHandler::with( + let handler = RootFoldersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::RootFolders, @@ -738,7 +738,7 @@ mod tests { .sonarr_data .root_folders .set_items(vec![RootFolder::default()]); - let handler = RootFoldersHandler::with( + let handler = RootFoldersHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::RootFolders, diff --git a/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs b/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs index 61a0c1c..b826b94 100644 --- a/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs +++ b/src/handlers/sonarr_handlers/sonarr_handler_test_utils.rs @@ -41,7 +41,7 @@ pub(in crate::handlers::sonarr_handlers) mod utils { }]); app.data.sonarr_data = sonarr_data; - $handler::with(DEFAULT_KEYBINDINGS.edit.key, &mut app, $block, None).handle(); + $handler::new(DEFAULT_KEYBINDINGS.edit.key, &mut app, $block, None).handle(); assert_eq!( app.get_current_route(), diff --git a/src/handlers/sonarr_handlers/system/mod.rs b/src/handlers/sonarr_handlers/system/mod.rs index 83e939a..5b1261b 100644 --- a/src/handlers/sonarr_handlers/system/mod.rs +++ b/src/handlers/sonarr_handlers/system/mod.rs @@ -24,7 +24,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SystemHandler<'a, 'b fn handle(&mut self) { match self.active_sonarr_block { _ if SystemDetailsHandler::accepts(self.active_sonarr_block) => { - SystemDetailsHandler::with(self.key, self.app, self.active_sonarr_block, self.context) + SystemDetailsHandler::new(self.key, self.app, self.active_sonarr_block, self.context) .handle() } _ => self.handle_key_event(), @@ -35,7 +35,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SystemHandler<'a, 'b SystemDetailsHandler::accepts(active_block) || active_block == ActiveSonarrBlock::System } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/system/system_details_handler.rs b/src/handlers/sonarr_handlers/system/system_details_handler.rs index 477d1f7..a02b3c8 100644 --- a/src/handlers/sonarr_handlers/system/system_details_handler.rs +++ b/src/handlers/sonarr_handlers/system/system_details_handler.rs @@ -36,7 +36,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SystemDetailsHandler SYSTEM_DETAILS_BLOCKS.contains(&active_block) } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveSonarrBlock, diff --git a/src/handlers/sonarr_handlers/system/system_details_handler_tests.rs b/src/handlers/sonarr_handlers/system/system_details_handler_tests.rs index 550235b..ec01c5c 100644 --- a/src/handlers/sonarr_handlers/system/system_details_handler_tests.rs +++ b/src/handlers/sonarr_handlers/system/system_details_handler_tests.rs @@ -52,14 +52,14 @@ mod tests { text )); - SystemDetailsHandler::with(key, &mut app, ActiveSonarrBlock::SystemLogs, None).handle(); + SystemDetailsHandler::new(key, &mut app, ActiveSonarrBlock::SystemLogs, None).handle(); assert_str_eq!( app.data.sonarr_data.log_details.current_selection().text, "Test 1" ); - SystemDetailsHandler::with(key, &mut app, ActiveSonarrBlock::SystemLogs, None).handle(); + SystemDetailsHandler::new(key, &mut app, ActiveSonarrBlock::SystemLogs, None).handle(); assert_str_eq!( app.data.sonarr_data.log_details.current_selection().text, @@ -80,14 +80,14 @@ mod tests { .tasks .set_items(simple_stateful_iterable_vec!(SonarrTask, String, name)); - SystemDetailsHandler::with(key, &mut app, ActiveSonarrBlock::SystemTasks, None).handle(); + SystemDetailsHandler::new(key, &mut app, ActiveSonarrBlock::SystemTasks, None).handle(); assert_str_eq!( app.data.sonarr_data.tasks.current_selection().name, "Test 2" ); - SystemDetailsHandler::with(key, &mut app, ActiveSonarrBlock::SystemTasks, None).handle(); + SystemDetailsHandler::new(key, &mut app, ActiveSonarrBlock::SystemTasks, None).handle(); assert_str_eq!( app.data.sonarr_data.tasks.current_selection().name, @@ -109,14 +109,14 @@ mod tests { .tasks .set_items(simple_stateful_iterable_vec!(SonarrTask, String, name)); - SystemDetailsHandler::with(key, &mut app, ActiveSonarrBlock::SystemTasks, None).handle(); + SystemDetailsHandler::new(key, &mut app, ActiveSonarrBlock::SystemTasks, None).handle(); assert_str_eq!( app.data.sonarr_data.tasks.current_selection().name, "Test 1" ); - SystemDetailsHandler::with(key, &mut app, ActiveSonarrBlock::SystemTasks, None).handle(); + SystemDetailsHandler::new(key, &mut app, ActiveSonarrBlock::SystemTasks, None).handle(); assert_str_eq!( app.data.sonarr_data.tasks.current_selection().name, @@ -137,7 +137,7 @@ mod tests { .queued_events .set_items(simple_stateful_iterable_vec!(QueueEvent, String, name)); - SystemDetailsHandler::with(key, &mut app, ActiveSonarrBlock::SystemQueuedEvents, None) + SystemDetailsHandler::new(key, &mut app, ActiveSonarrBlock::SystemQueuedEvents, None) .handle(); assert_str_eq!( @@ -145,7 +145,7 @@ mod tests { "Test 2" ); - SystemDetailsHandler::with(key, &mut app, ActiveSonarrBlock::SystemQueuedEvents, None) + SystemDetailsHandler::new(key, &mut app, ActiveSonarrBlock::SystemQueuedEvents, None) .handle(); assert_str_eq!( @@ -168,7 +168,7 @@ mod tests { .queued_events .set_items(simple_stateful_iterable_vec!(QueueEvent, String, name)); - SystemDetailsHandler::with(key, &mut app, ActiveSonarrBlock::SystemQueuedEvents, None) + SystemDetailsHandler::new(key, &mut app, ActiveSonarrBlock::SystemQueuedEvents, None) .handle(); assert_str_eq!( @@ -176,7 +176,7 @@ mod tests { "Test 1" ); - SystemDetailsHandler::with(key, &mut app, ActiveSonarrBlock::SystemQueuedEvents, None) + SystemDetailsHandler::new(key, &mut app, ActiveSonarrBlock::SystemQueuedEvents, None) .handle(); assert_str_eq!( @@ -191,7 +191,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::System.into()); app.data.sonarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.up.key, &mut app, ActiveSonarrBlock::SystemUpdates, @@ -201,7 +201,7 @@ mod tests { assert_eq!(app.data.sonarr_data.updates.offset, 0); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.down.key, &mut app, ActiveSonarrBlock::SystemUpdates, @@ -219,7 +219,7 @@ mod tests { app.is_loading = true; app.data.sonarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.up.key, &mut app, ActiveSonarrBlock::SystemUpdates, @@ -229,7 +229,7 @@ mod tests { assert_eq!(app.data.sonarr_data.updates.offset, 0); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.down.key, &mut app, ActiveSonarrBlock::SystemUpdates, @@ -274,7 +274,7 @@ mod tests { text )); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::SystemLogs, @@ -287,7 +287,7 @@ mod tests { "Test 1" ); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::SystemLogs, @@ -313,7 +313,7 @@ mod tests { .tasks .set_items(extended_stateful_iterable_vec!(SonarrTask, String, name)); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::SystemTasks, @@ -326,7 +326,7 @@ mod tests { "Test 3" ); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::SystemTasks, @@ -353,7 +353,7 @@ mod tests { .tasks .set_items(extended_stateful_iterable_vec!(SonarrTask, String, name)); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::SystemTasks, @@ -366,7 +366,7 @@ mod tests { "Test 1" ); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::SystemTasks, @@ -392,7 +392,7 @@ mod tests { .queued_events .set_items(extended_stateful_iterable_vec!(QueueEvent, String, name)); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::SystemQueuedEvents, @@ -405,7 +405,7 @@ mod tests { "Test 3" ); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::SystemQueuedEvents, @@ -432,7 +432,7 @@ mod tests { .queued_events .set_items(extended_stateful_iterable_vec!(QueueEvent, String, name)); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::SystemQueuedEvents, @@ -445,7 +445,7 @@ mod tests { "Test 1" ); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::SystemQueuedEvents, @@ -465,7 +465,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::System.into()); app.data.sonarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::SystemUpdates, @@ -475,7 +475,7 @@ mod tests { assert_eq!(app.data.sonarr_data.updates.offset, 1); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::SystemUpdates, @@ -493,7 +493,7 @@ mod tests { app.is_loading = true; app.data.sonarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveSonarrBlock::SystemUpdates, @@ -503,7 +503,7 @@ mod tests { assert_eq!(app.data.sonarr_data.updates.offset, 0); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveSonarrBlock::SystemUpdates, @@ -532,7 +532,7 @@ mod tests { .log_details .set_items(vec!["t1".into(), "t22".into()]); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, active_sonarr_block, @@ -543,7 +543,7 @@ mod tests { assert_eq!(app.data.sonarr_data.log_details.items[0].to_string(), "t1"); assert_eq!(app.data.sonarr_data.log_details.items[1].to_string(), "t22"); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, active_sonarr_block, @@ -554,7 +554,7 @@ mod tests { assert_eq!(app.data.sonarr_data.log_details.items[0].to_string(), "1"); assert_eq!(app.data.sonarr_data.log_details.items[1].to_string(), "22"); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, active_sonarr_block, @@ -565,7 +565,7 @@ mod tests { assert_eq!(app.data.sonarr_data.log_details.items[0].to_string(), ""); assert_eq!(app.data.sonarr_data.log_details.items[1].to_string(), "2"); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, active_sonarr_block, @@ -576,7 +576,7 @@ mod tests { assert_eq!(app.data.sonarr_data.log_details.items[0].to_string(), ""); assert_eq!(app.data.sonarr_data.log_details.items[1].to_string(), ""); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, active_sonarr_block, @@ -587,7 +587,7 @@ mod tests { assert_eq!(app.data.sonarr_data.log_details.items[0].to_string(), ""); assert_eq!(app.data.sonarr_data.log_details.items[1].to_string(), ""); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, active_sonarr_block, @@ -598,7 +598,7 @@ mod tests { assert_eq!(app.data.sonarr_data.log_details.items[0].to_string(), "1"); assert_eq!(app.data.sonarr_data.log_details.items[1].to_string(), "2"); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, active_sonarr_block, @@ -609,7 +609,7 @@ mod tests { assert_eq!(app.data.sonarr_data.log_details.items[0].to_string(), "t1"); assert_eq!(app.data.sonarr_data.log_details.items[1].to_string(), "22"); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, active_sonarr_block, @@ -628,7 +628,7 @@ mod tests { let mut app = App::default(); app.push_navigation_stack(ActiveSonarrBlock::System.into()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( key, &mut app, ActiveSonarrBlock::SystemTaskStartConfirmPrompt, @@ -638,7 +638,7 @@ mod tests { assert!(app.data.sonarr_data.prompt_confirm); - SystemDetailsHandler::with( + SystemDetailsHandler::new( key, &mut app, ActiveSonarrBlock::SystemTaskStartConfirmPrompt, @@ -665,7 +665,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::System.into()); app.data.sonarr_data.updates = ScrollableText::with_string("Test".to_owned()); - SystemDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SystemTasks, None) + SystemDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SystemTasks, None) .handle(); assert_eq!( @@ -681,7 +681,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SystemTasks.into()); app.data.sonarr_data.updates = ScrollableText::with_string("Test".to_owned()); - SystemDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SystemTasks, None) + SystemDetailsHandler::new(SUBMIT_KEY, &mut app, ActiveSonarrBlock::SystemTasks, None) .handle(); assert_eq!( @@ -703,7 +703,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SystemTasks.into()); app.push_navigation_stack(ActiveSonarrBlock::SystemTaskStartConfirmPrompt.into()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::SystemTaskStartConfirmPrompt, @@ -729,7 +729,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SystemTasks.into()); app.push_navigation_stack(ActiveSonarrBlock::SystemTaskStartConfirmPrompt.into()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( SUBMIT_KEY, &mut app, ActiveSonarrBlock::SystemTaskStartConfirmPrompt, @@ -772,7 +772,7 @@ mod tests { .log_details .set_items(vec![HorizontallyScrollableText::default()]); - SystemDetailsHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::SystemLogs, None).handle(); + SystemDetailsHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::SystemLogs, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::System.into()); assert!(app.data.sonarr_data.log_details.items.is_empty()); @@ -790,7 +790,7 @@ mod tests { .tasks .set_items(vec![SonarrTask::default()]); - SystemDetailsHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::SystemTasks, None).handle(); + SystemDetailsHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::SystemTasks, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::System.into()); } @@ -807,7 +807,7 @@ mod tests { .queued_events .set_items(vec![QueueEvent::default()]); - SystemDetailsHandler::with( + SystemDetailsHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::SystemQueuedEvents, @@ -825,7 +825,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::System.into()); app.push_navigation_stack(ActiveSonarrBlock::SystemUpdates.into()); - SystemDetailsHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::SystemUpdates, None) + SystemDetailsHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::SystemUpdates, None) .handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::System.into()); @@ -838,7 +838,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SystemTaskStartConfirmPrompt.into()); app.data.sonarr_data.prompt_confirm = true; - SystemDetailsHandler::with( + SystemDetailsHandler::new( ESC_KEY, &mut app, ActiveSonarrBlock::SystemTaskStartConfirmPrompt, @@ -877,7 +877,7 @@ mod tests { app.data.sonarr_data.updates = ScrollableText::with_string("Test".to_owned()); app.push_navigation_stack(active_sonarr_block.into()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, active_sonarr_block, @@ -905,7 +905,7 @@ mod tests { app.data.sonarr_data.updates = ScrollableText::with_string("Test".to_owned()); app.push_navigation_stack(active_sonarr_block.into()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, active_sonarr_block, @@ -930,7 +930,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::SystemTasks.into()); app.push_navigation_stack(ActiveSonarrBlock::SystemTaskStartConfirmPrompt.into()); - SystemDetailsHandler::with( + SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.confirm.key, &mut app, ActiveSonarrBlock::SystemTaskStartConfirmPrompt, @@ -970,7 +970,7 @@ mod tests { .tasks .set_items(vec![SonarrTask::default()]); - let task_name = SystemDetailsHandler::with( + let task_name = SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SystemTasks, @@ -987,7 +987,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::System.into()); app.is_loading = true; - let handler = SystemDetailsHandler::with( + let handler = SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SystemUpdates, @@ -1003,7 +1003,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::System.into()); app.is_loading = false; - let handler = SystemDetailsHandler::with( + let handler = SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SystemUpdates, @@ -1024,7 +1024,7 @@ mod tests { .log_details .set_items(vec![HorizontallyScrollableText::default()]); - let handler = SystemDetailsHandler::with( + let handler = SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SystemUpdates, @@ -1045,7 +1045,7 @@ mod tests { .tasks .set_items(vec![SonarrTask::default()]); - let handler = SystemDetailsHandler::with( + let handler = SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SystemTasks, @@ -1062,7 +1062,7 @@ mod tests { app.is_loading = false; app.data.sonarr_data.updates = ScrollableText::with_string("Test".to_owned()); - let handler = SystemDetailsHandler::with( + let handler = SystemDetailsHandler::new( DEFAULT_KEYBINDINGS.esc.key, &mut app, ActiveSonarrBlock::SystemUpdates, diff --git a/src/handlers/sonarr_handlers/system/system_handler_tests.rs b/src/handlers/sonarr_handlers/system/system_handler_tests.rs index 6843b5e..46ad601 100644 --- a/src/handlers/sonarr_handlers/system/system_handler_tests.rs +++ b/src/handlers/sonarr_handlers/system/system_handler_tests.rs @@ -27,7 +27,7 @@ mod tests { app.is_loading = is_ready; app.data.sonarr_data.main_tabs.set_index(6); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveSonarrBlock::System, @@ -49,7 +49,7 @@ mod tests { app.is_loading = is_ready; app.data.sonarr_data.main_tabs.set_index(6); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveSonarrBlock::System, @@ -80,7 +80,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::System.into()); app.push_navigation_stack(ActiveSonarrBlock::System.into()); - SystemHandler::with(ESC_KEY, &mut app, ActiveSonarrBlock::System, None).handle(); + SystemHandler::new(ESC_KEY, &mut app, ActiveSonarrBlock::System, None).handle(); assert_eq!(app.get_current_route(), ActiveSonarrBlock::System.into()); assert!(app.error.text.is_empty()); @@ -113,7 +113,7 @@ mod tests { .tasks .set_items(vec![SonarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveSonarrBlock::System, @@ -147,7 +147,7 @@ mod tests { .tasks .set_items(vec![SonarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveSonarrBlock::System, @@ -177,7 +177,7 @@ mod tests { .tasks .set_items(vec![SonarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.events.key, &mut app, ActiveSonarrBlock::System, @@ -211,7 +211,7 @@ mod tests { .tasks .set_items(vec![SonarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.events.key, &mut app, ActiveSonarrBlock::System, @@ -241,7 +241,7 @@ mod tests { .set_items(vec![SonarrTask::default()]); app.push_navigation_stack(ActiveSonarrBlock::System.into()); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveSonarrBlock::System, @@ -274,7 +274,7 @@ mod tests { .set_items(vec![SonarrTask::default()]); app.push_navigation_stack(ActiveSonarrBlock::System.into()); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.refresh.key, &mut app, ActiveSonarrBlock::System, @@ -305,7 +305,7 @@ mod tests { .tasks .set_items(vec![SonarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.logs.key, &mut app, ActiveSonarrBlock::System, @@ -347,7 +347,7 @@ mod tests { .tasks .set_items(vec![SonarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.logs.key, &mut app, ActiveSonarrBlock::System, @@ -378,7 +378,7 @@ mod tests { .tasks .set_items(vec![SonarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.tasks.key, &mut app, ActiveSonarrBlock::System, @@ -412,7 +412,7 @@ mod tests { .tasks .set_items(vec![SonarrTask::default()]); - SystemHandler::with( + SystemHandler::new( DEFAULT_KEYBINDINGS.tasks.key, &mut app, ActiveSonarrBlock::System, @@ -462,7 +462,7 @@ mod tests { app.push_navigation_stack(ActiveSonarrBlock::System.into()); app.is_loading = true; - let system_handler = SystemHandler::with( + let system_handler = SystemHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveSonarrBlock::System, @@ -488,7 +488,7 @@ mod tests { .queued_events .set_items(vec![QueueEvent::default()]); - let system_handler = SystemHandler::with( + let system_handler = SystemHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveSonarrBlock::System, @@ -510,7 +510,7 @@ mod tests { .queued_events .set_items(vec![QueueEvent::default()]); - let system_handler = SystemHandler::with( + let system_handler = SystemHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveSonarrBlock::System, @@ -532,7 +532,7 @@ mod tests { .tasks .set_items(vec![SonarrTask::default()]); - let system_handler = SystemHandler::with( + let system_handler = SystemHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveSonarrBlock::System, @@ -559,7 +559,7 @@ mod tests { .queued_events .set_items(vec![QueueEvent::default()]); - let system_handler = SystemHandler::with( + let system_handler = SystemHandler::new( DEFAULT_KEYBINDINGS.update.key, &mut app, ActiveSonarrBlock::System, diff --git a/src/handlers/table_handler_tests.rs b/src/handlers/table_handler_tests.rs index 2861ce8..265c173 100644 --- a/src/handlers/table_handler_tests.rs +++ b/src/handlers/table_handler_tests.rs @@ -48,7 +48,7 @@ mod tests { true } - fn with( + fn new( key: Key, app: &'a mut App<'b>, active_block: ActiveRadarrBlock, @@ -126,7 +126,7 @@ mod tests { HorizontallyScrollableText )); - TableHandlerUnit::with(key, &mut app, ActiveRadarrBlock::Movies, None).handle(); + TableHandlerUnit::new(key, &mut app, ActiveRadarrBlock::Movies, None).handle(); assert_str_eq!( app @@ -139,7 +139,7 @@ mod tests { "Test 1" ); - TableHandlerUnit::with(key, &mut app, ActiveRadarrBlock::Movies, None).handle(); + TableHandlerUnit::new(key, &mut app, ActiveRadarrBlock::Movies, None).handle(); assert_eq!( app @@ -163,7 +163,7 @@ mod tests { if key == Key::Up { for i in (0..movie_field_vec.len()).rev() { - TableHandlerUnit::with(key, &mut app, ActiveRadarrBlock::MoviesSortPrompt, None).handle(); + TableHandlerUnit::new(key, &mut app, ActiveRadarrBlock::MoviesSortPrompt, None).handle(); assert_eq!( app @@ -179,7 +179,7 @@ mod tests { } } else { for i in 0..movie_field_vec.len() { - TableHandlerUnit::with(key, &mut app, ActiveRadarrBlock::MoviesSortPrompt, None).handle(); + TableHandlerUnit::new(key, &mut app, ActiveRadarrBlock::MoviesSortPrompt, None).handle(); assert_eq!( app @@ -230,7 +230,7 @@ mod tests { HorizontallyScrollableText )); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::Movies, @@ -249,7 +249,7 @@ mod tests { "Test 1" ); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::Movies, @@ -280,7 +280,7 @@ mod tests { .set_items(vec![Movie::default()]); app.data.radarr_data.movies.search = Some("Test".into()); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::SearchMovie, @@ -301,7 +301,7 @@ mod tests { 4 ); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::SearchMovie, @@ -334,7 +334,7 @@ mod tests { .set_items(vec![Movie::default()]); app.data.radarr_data.movies.filter = Some("Test".into()); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::FilterMovies, @@ -355,7 +355,7 @@ mod tests { 4 ); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::FilterMovies, @@ -383,7 +383,7 @@ mod tests { let mut app = App::default(); app.data.radarr_data.movies.sorting(sort_options()); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.end.key, &mut app, ActiveRadarrBlock::MoviesSortPrompt, @@ -403,7 +403,7 @@ mod tests { &movie_field_vec[movie_field_vec.len() - 1] ); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.home.key, &mut app, ActiveRadarrBlock::MoviesSortPrompt, @@ -442,7 +442,7 @@ mod tests { .set_items(vec![Movie::default()]); app.data.radarr_data.movies.search = Some("Test".into()); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::SearchMovie, @@ -463,7 +463,7 @@ mod tests { 1 ); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::SearchMovie, @@ -496,7 +496,7 @@ mod tests { .set_items(vec![Movie::default()]); app.data.radarr_data.movies.filter = Some("Test".into()); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.left.key, &mut app, ActiveRadarrBlock::FilterMovies, @@ -517,7 +517,7 @@ mod tests { 1 ); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.right.key, &mut app, ActiveRadarrBlock::FilterMovies, @@ -565,7 +565,7 @@ mod tests { )); app.data.radarr_data.movies.search = Some("Test 2".into()); - TableHandlerUnit::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SearchMovie, None).handle(); + TableHandlerUnit::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SearchMovie, None).handle(); assert_str_eq!( app.data.radarr_data.movies.current_selection().title.text, @@ -589,7 +589,7 @@ mod tests { )); app.data.radarr_data.movies.search = Some("Test 5".into()); - TableHandlerUnit::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SearchMovie, None).handle(); + TableHandlerUnit::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SearchMovie, None).handle(); assert_str_eq!( app.data.radarr_data.movies.current_selection().title.text, @@ -621,7 +621,7 @@ mod tests { )); app.data.radarr_data.movies.search = Some("Test 2".into()); - TableHandlerUnit::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SearchMovie, None).handle(); + TableHandlerUnit::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SearchMovie, None).handle(); assert_str_eq!( app.data.radarr_data.movies.current_selection().title.text, @@ -645,7 +645,7 @@ mod tests { )); app.data.radarr_data.movies.filter = Some("Test".into()); - TableHandlerUnit::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::FilterMovies, None).handle(); + TableHandlerUnit::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::FilterMovies, None).handle(); assert!(app.data.radarr_data.movies.filtered_items.is_some()); assert!(!app.should_ignore_quit_key); @@ -682,7 +682,7 @@ mod tests { )); app.data.radarr_data.movies.filter = Some("Test 5".into()); - TableHandlerUnit::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::FilterMovies, None).handle(); + TableHandlerUnit::new(SUBMIT_KEY, &mut app, ActiveRadarrBlock::FilterMovies, None).handle(); assert!(!app.should_ignore_quit_key); assert!(app.data.radarr_data.movies.filtered_items.is_none()); @@ -705,7 +705,7 @@ mod tests { expected_vec.sort_by(|a, b| a.id.cmp(&b.id)); expected_vec.reverse(); - TableHandlerUnit::with( + TableHandlerUnit::new( SUBMIT_KEY, &mut app, ActiveRadarrBlock::MoviesSortPrompt, @@ -741,7 +741,7 @@ mod tests { app.data.radarr_data = create_test_radarr_data(); app.data.radarr_data.movies.search = Some("Test".into()); - TableHandlerUnit::with(ESC_KEY, &mut app, active_radarr_block, None).handle(); + TableHandlerUnit::new(ESC_KEY, &mut app, active_radarr_block, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into()); assert!(!app.should_ignore_quit_key); @@ -770,7 +770,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - TableHandlerUnit::with(ESC_KEY, &mut app, active_radarr_block, None).handle(); + TableHandlerUnit::new(ESC_KEY, &mut app, active_radarr_block, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into()); assert!(!app.should_ignore_quit_key); @@ -786,7 +786,7 @@ mod tests { app.push_navigation_stack(ActiveRadarrBlock::Movies.into()); app.push_navigation_stack(ActiveRadarrBlock::MoviesSortPrompt.into()); - TableHandlerUnit::with(ESC_KEY, &mut app, ActiveRadarrBlock::MoviesSortPrompt, None).handle(); + TableHandlerUnit::new(ESC_KEY, &mut app, ActiveRadarrBlock::MoviesSortPrompt, None).handle(); assert_eq!(app.get_current_route(), ActiveRadarrBlock::Movies.into()); } @@ -808,7 +808,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.search.key, &mut app, ActiveRadarrBlock::Movies, @@ -838,7 +838,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.search.key, &mut app, ActiveRadarrBlock::Movies, @@ -860,7 +860,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.search.key, &mut app, ActiveRadarrBlock::MovieDetails, @@ -882,7 +882,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.filter.key, &mut app, ActiveRadarrBlock::Movies, @@ -909,7 +909,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.filter.key, &mut app, ActiveRadarrBlock::Movies, @@ -935,7 +935,7 @@ mod tests { .set_items(vec![Movie::default()]); app.data.radarr_data.movies.filter = Some("Test".into()); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.filter.key, &mut app, ActiveRadarrBlock::Movies, @@ -965,7 +965,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.filter.key, &mut app, ActiveRadarrBlock::MovieDetails, @@ -989,7 +989,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveRadarrBlock::SearchMovie, @@ -1014,7 +1014,7 @@ mod tests { .set_items(vec![Movie::default()]); app.data.radarr_data.movies.filter = Some("Test".into()); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.backspace.key, &mut app, ActiveRadarrBlock::FilterMovies, @@ -1039,7 +1039,7 @@ mod tests { .set_items(vec![Movie::default()]); app.data.radarr_data.movies.search = Some(HorizontallyScrollableText::default()); - TableHandlerUnit::with( + TableHandlerUnit::new( Key::Char('h'), &mut app, ActiveRadarrBlock::SearchMovie, @@ -1064,7 +1064,7 @@ mod tests { .set_items(vec![Movie::default()]); app.data.radarr_data.movies.filter = Some(HorizontallyScrollableText::default()); - TableHandlerUnit::with( + TableHandlerUnit::new( Key::Char('h'), &mut app, ActiveRadarrBlock::FilterMovies, @@ -1087,7 +1087,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.sort.key, &mut app, ActiveRadarrBlock::Movies, @@ -1117,7 +1117,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.sort.key, &mut app, ActiveRadarrBlock::Movies, @@ -1138,7 +1138,7 @@ mod tests { .movies .set_items(vec![Movie::default()]); - TableHandlerUnit::with( + TableHandlerUnit::new( DEFAULT_KEYBINDINGS.sort.key, &mut app, ActiveRadarrBlock::MovieDetails,