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/library/add_movie_handler.rs
+1 -1
View File
@@ -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,
src/handlers/radarr_handlers/library/add_movie_handler_tests.rs
+54 -54
View File
@@ -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,
src/handlers/radarr_handlers/library/delete_movie_handler.rs
+1 -1
View File
@@ -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,
src/handlers/radarr_handlers/library/delete_movie_handler_tests.rs
+14 -14
View File
@@ -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,
src/handlers/radarr_handlers/library/edit_movie_handler.rs
+1 -1
View File
@@ -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,
src/handlers/radarr_handlers/library/edit_movie_handler_tests.rs
+42 -42
View File
@@ -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,
src/handlers/radarr_handlers/library/library_handler_tests.rs
+22 -22
View File
@@ -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,
src/handlers/radarr_handlers/library/mod.rs
+5 -5
View File
@@ -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,
src/handlers/radarr_handlers/library/movie_details_handler.rs
+1 -1
View File
@@ -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,
src/handlers/radarr_handlers/library/movie_details_handler_tests.rs
+35 -35
View File
@@ -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,