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

refactor(handlers): Refactored the handlers to all use the handle_table_events macro when appropriate and created tests for the macro so tests don't have to be duplicated across each handler

Browse Source
This commit is contained in:
Alex Clarke
2024-12-11 17:03:52 -07:00
parent c09950d0af
commit ed2211586e
44 changed files with 1592 additions and 9288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/radarr_handlers/library/add_movie_handler.rs
+27 -33
View File
@@ -1,11 +1,13 @@
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::handlers::table_handler::TableHandlingConfig;
use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
use crate::models::radarr_models::AddMovieSearchResult;
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, ADD_MOVIE_BLOCKS, ADD_MOVIE_SELECTION_BLOCKS,
};
use crate::models::{BlockSelectionState, Scrollable};
use crate::network::radarr_network::RadarrEvent;
use crate::{handle_text_box_keys, handle_text_box_left_right_keys, App, Key};
use crate::{handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys, App, Key};
#[cfg(test)]
#[path = "add_movie_handler_tests.rs"]
@@ -18,7 +20,31 @@ pub(super) struct AddMovieHandler<'a, 'b> {
context: Option<ActiveRadarrBlock>,
}
impl<'a, 'b> AddMovieHandler<'a, 'b> {
handle_table_events!(
self,
add_movie_search_results,
self
.app
.data
.radarr_data
.add_searched_movies
.as_mut()
.unwrap(),
AddMovieSearchResult
);
}
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a, 'b> {
fn handle(&mut self) {
let add_movie_table_handling_config =
TableHandlingConfig::new(ActiveRadarrBlock::AddMovieSearchResults.into());
if !self.handle_add_movie_search_results_table_events(add_movie_table_handling_config) {
self.handle_key_event();
}
}
fn accepts(active_block: ActiveRadarrBlock) -> bool {
ADD_MOVIE_BLOCKS.contains(&active_block)
}
@@ -47,14 +73,6 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
fn handle_scroll_up(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::AddMovieSearchResults => self
.app
.data
.radarr_data
.add_searched_movies
.as_mut()
.unwrap()
.scroll_up(),
ActiveRadarrBlock::AddMovieSelectMonitor => self
.app
.data
@@ -98,14 +116,6 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
fn handle_scroll_down(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::AddMovieSearchResults => self
.app
.data
.radarr_data
.add_searched_movies
.as_mut()
.unwrap()
.scroll_down(),
ActiveRadarrBlock::AddMovieSelectMonitor => self
.app
.data
@@ -149,14 +159,6 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
fn handle_home(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::AddMovieSearchResults => self
.app
.data
.radarr_data
.add_searched_movies
.as_mut()
.unwrap()
.scroll_to_top(),
ActiveRadarrBlock::AddMovieSelectMonitor => self
.app
.data
@@ -216,14 +218,6 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
fn handle_end(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::AddMovieSearchResults => self
.app
.data
.radarr_data
.add_searched_movies
.as_mut()
.unwrap()
.scroll_to_bottom(),
ActiveRadarrBlock::AddMovieSelectMonitor => self
.app
.data
src/handlers/radarr_handlers/library/add_movie_handler_tests.rs
-220
View File
@@ -20,123 +20,11 @@ mod tests {
use crate::models::servarr_data::radarr::modals::AddMovieModal;
use crate::models::servarr_data::radarr::radarr_data::ADD_MOVIE_SELECTION_BLOCKS;
use crate::models::stateful_table::StatefulTable;
use crate::models::BlockSelectionState;
use crate::simple_stateful_iterable_vec;
use super::*;
#[rstest]
fn test_add_movie_search_results_scroll(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let mut app = App::default();
let mut add_searched_movies = StatefulTable::default();
add_searched_movies.set_items(simple_stateful_iterable_vec!(
AddMovieSearchResult,
HorizontallyScrollableText
));
app.data.radarr_data.add_searched_movies = Some(add_searched_movies);
AddMovieHandler::with(
key,
&mut app,
ActiveRadarrBlock::AddMovieSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.add_searched_movies
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 2"
);
AddMovieHandler::with(
key,
&mut app,
ActiveRadarrBlock::AddMovieSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.add_searched_movies
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 1"
);
}
#[rstest]
fn test_add_movie_search_results_scroll_no_op_when_not_ready(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let mut app = App::default();
app.is_loading = true;
let mut add_searched_movies = StatefulTable::default();
add_searched_movies.set_items(simple_stateful_iterable_vec!(
AddMovieSearchResult,
HorizontallyScrollableText
));
app.data.radarr_data.add_searched_movies = Some(add_searched_movies);
AddMovieHandler::with(
key,
&mut app,
ActiveRadarrBlock::AddMovieSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.add_searched_movies
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 1"
);
AddMovieHandler::with(
key,
&mut app,
ActiveRadarrBlock::AddMovieSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.add_searched_movies
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 1"
);
}
#[rstest]
fn test_add_movie_select_monitor_scroll(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
@@ -421,117 +309,9 @@ mod tests {
use crate::extended_stateful_iterable_vec;
use crate::models::servarr_data::radarr::modals::AddMovieModal;
use crate::models::stateful_table::StatefulTable;
use super::*;
#[test]
fn test_add_movie_search_results_home_end() {
let mut app = App::default();
let mut add_searched_movies = StatefulTable::default();
add_searched_movies.set_items(extended_stateful_iterable_vec!(
AddMovieSearchResult,
HorizontallyScrollableText
));
app.data.radarr_data.add_searched_movies = Some(add_searched_movies);
AddMovieHandler::with(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveRadarrBlock::AddMovieSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.add_searched_movies
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 3"
);
AddMovieHandler::with(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveRadarrBlock::AddMovieSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.add_searched_movies
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 1"
);
}
#[test]
fn test_add_movie_search_results_home_end_no_op_when_not_ready() {
let mut app = App::default();
app.is_loading = true;
let mut add_searched_movies = StatefulTable::default();
add_searched_movies.set_items(extended_stateful_iterable_vec!(
AddMovieSearchResult,
HorizontallyScrollableText
));
app.data.radarr_data.add_searched_movies = Some(add_searched_movies);
AddMovieHandler::with(
DEFAULT_KEYBINDINGS.end.key,
&mut app,
ActiveRadarrBlock::AddMovieSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.add_searched_movies
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 1"
);
AddMovieHandler::with(
DEFAULT_KEYBINDINGS.home.key,
&mut app,
ActiveRadarrBlock::AddMovieSearchResults,
None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.add_searched_movies
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 1"
);
}
#[test]
fn test_add_movie_select_monitor_home_end() {
let monitor_vec = Vec::from_iter(MovieMonitor::iter());
src/handlers/radarr_handlers/library/library_handler_tests.rs
-958
View File
File diff suppressed because it is too large Load Diff
src/handlers/radarr_handlers/library/mod.rs
+4 -4
View File
@@ -9,13 +9,13 @@ use crate::handlers::radarr_handlers::library::movie_details_handler::MovieDetai
use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
use crate::handle_table_events;
use crate::handlers::table_handler::TableHandlingProps;
use crate::handlers::table_handler::TableHandlingConfig;
use crate::models::radarr_models::Movie;
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, DELETE_MOVIE_SELECTION_BLOCKS, EDIT_MOVIE_SELECTION_BLOCKS, LIBRARY_BLOCKS,
};
use crate::models::stateful_table::SortOption;
use crate::models::{BlockSelectionState, HorizontallyScrollableText, Scrollable};
use crate::models::{BlockSelectionState, HorizontallyScrollableText};
use crate::network::radarr_network::RadarrEvent;
mod add_movie_handler;
@@ -40,7 +40,7 @@ impl<'a, 'b> LibraryHandler<'a, 'b> {
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, 'b> {
fn handle(&mut self) {
let movie_table_handling_props = TableHandlingProps::new(ActiveRadarrBlock::Movies.into())
let movie_table_handling_config = TableHandlingConfig::new(ActiveRadarrBlock::Movies.into())
.sorting_block(ActiveRadarrBlock::MoviesSortPrompt.into())
.sort_by_fn(|a: &Movie, b: &Movie| a.id.cmp(&b.id))
.sort_options(movies_sorting_options())
@@ -51,7 +51,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
.filter_error_block(ActiveRadarrBlock::FilterMoviesError.into())
.filter_field_fn(|movie| &movie.title.text);
if !self.handle_movies_table_events(movie_table_handling_props) {
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)
src/handlers/radarr_handlers/library/movie_details_handler.rs
+11 -11
View File
@@ -4,7 +4,7 @@ use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::event::Key;
use crate::handle_table_events;
use crate::handlers::table_handler::TableHandlingProps;
use crate::handlers::table_handler::TableHandlingConfig;
use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
use crate::models::radarr_models::{Credit, MovieHistoryItem, RadarrRelease};
use crate::models::servarr_data::radarr::radarr_data::{
@@ -83,19 +83,19 @@ impl<'a, 'b> MovieDetailsHandler<'a, 'b> {
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for MovieDetailsHandler<'a, 'b> {
fn handle(&mut self) {
let movie_history_table_handling_props =
TableHandlingProps::new(ActiveRadarrBlock::MovieHistory.into());
let movie_releases_table_handling_props =
TableHandlingProps::new(ActiveRadarrBlock::ManualSearch.into())
let movie_history_table_handling_config =
TableHandlingConfig::new(ActiveRadarrBlock::MovieHistory.into());
let movie_releases_table_handling_config =
TableHandlingConfig::new(ActiveRadarrBlock::ManualSearch.into())
.sorting_block(ActiveRadarrBlock::ManualSearchSortPrompt.into())
.sort_options(releases_sorting_options());
let movie_cast_table_handling_props = TableHandlingProps::new(ActiveRadarrBlock::Cast.into());
let movie_crew_table_handling_props = TableHandlingProps::new(ActiveRadarrBlock::Crew.into());
let movie_cast_table_handling_config = TableHandlingConfig::new(ActiveRadarrBlock::Cast.into());
let movie_crew_table_handling_config = TableHandlingConfig::new(ActiveRadarrBlock::Crew.into());
if !self.handle_movie_history_table_events(movie_history_table_handling_props)
&& !self.handle_movie_releases_table_events(movie_releases_table_handling_props)
&& !self.handle_movie_cast_table_events(movie_cast_table_handling_props)
&& !self.handle_movie_crew_table_events(movie_crew_table_handling_props)
if !self.handle_movie_history_table_events(movie_history_table_handling_config)
&& !self.handle_movie_releases_table_events(movie_releases_table_handling_config)
&& !self.handle_movie_cast_table_events(movie_cast_table_handling_config)
&& !self.handle_movie_crew_table_events(movie_crew_table_handling_config)
{
self.handle_key_event();
}
src/handlers/radarr_handlers/library/movie_details_handler_tests.rs
+2 -1065
View File
File diff suppressed because it is too large Load Diff