Dark-Alex-17/managarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Renamed KeyEventHandler::with to KeyEventHandler::new to keep with Rust best practices and conventions

Browse Source
This commit is contained in:
Alex Clarke
2025-01-18 12:43:25 -07:00
parent 5ead5bc3d6
commit fd35106df8
76 changed files with 1161 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/radarr_handlers/collections/collection_details_handler.rs
+1 -1
View File
@@ -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,
src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs
+9 -9
View File
@@ -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,
src/handlers/radarr_handlers/collections/collections_handler_tests.rs
+19 -19
View File
@@ -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,
src/handlers/radarr_handlers/collections/edit_collection_handler.rs
+1 -1
View File
@@ -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,
src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs
+36 -36
View File
@@ -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,
src/handlers/radarr_handlers/collections/mod.rs
+3 -3
View File
@@ -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,