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/sonarr_handlers/library/add_series_handler.rs
+1 -1
View File
@@ -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,
src/handlers/sonarr_handlers/library/add_series_handler_tests.rs
+60 -60
View File
@@ -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,
src/handlers/sonarr_handlers/library/delete_series_handler.rs
+1 -1
View File
@@ -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,
src/handlers/sonarr_handlers/library/delete_series_handler_tests.rs
+14 -14
View File
@@ -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,
src/handlers/sonarr_handlers/library/edit_series_handler.rs
+1 -1
View File
@@ -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,
src/handlers/sonarr_handlers/library/edit_series_handler_tests.rs
+48 -48
View File
@@ -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,
src/handlers/sonarr_handlers/library/episode_details_handler.rs
+1 -1
View File
@@ -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,
src/handlers/sonarr_handlers/library/episode_details_handler_tests.rs
+30 -30
View File
@@ -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,
src/handlers/sonarr_handlers/library/library_handler_tests.rs
+22 -22
View File
@@ -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,
src/handlers/sonarr_handlers/library/mod.rs
+7 -7
View File
@@ -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,
src/handlers/sonarr_handlers/library/season_details_handler.rs
+1 -1
View File
@@ -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,
src/handlers/sonarr_handlers/library/season_details_handler_tests.rs
+40 -40
View File
@@ -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,
src/handlers/sonarr_handlers/library/series_details_handler.rs
+1 -1
View File
@@ -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,
src/handlers/sonarr_handlers/library/series_details_handler_tests.rs
+31 -31
View File
@@ -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,