Completed edit movies implementation, cleaned up the Movies table, and fixed a bug when adding a movie from the CollectionDetails screen.

This commit is contained in:
2023-08-08 10:50:05 -06:00
parent d5117fda39
commit 652dc0f2c4
17 changed files with 1787 additions and 223 deletions
@@ -37,19 +37,19 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for AddMovieHandler<'a> {
self.app.data.radarr_data.add_searched_movies.scroll_up()
}
ActiveRadarrBlock::AddMovieSelectMonitor => {
self.app.data.radarr_data.add_movie_monitor_list.scroll_up()
self.app.data.radarr_data.movie_monitor_list.scroll_up()
}
ActiveRadarrBlock::AddMovieSelectMinimumAvailability => self
.app
.data
.radarr_data
.add_movie_minimum_availability_list
.movie_minimum_availability_list
.scroll_up(),
ActiveRadarrBlock::AddMovieSelectQualityProfile => self
.app
.data
.radarr_data
.add_movie_quality_profile_list
.movie_quality_profile_list
.scroll_up(),
ActiveRadarrBlock::AddMoviePrompt => {
self.app.data.radarr_data.selected_block = self
@@ -69,23 +69,20 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for AddMovieHandler<'a> {
ActiveRadarrBlock::AddMovieSearchResults => {
self.app.data.radarr_data.add_searched_movies.scroll_down()
}
ActiveRadarrBlock::AddMovieSelectMonitor => self
.app
.data
.radarr_data
.add_movie_monitor_list
.scroll_down(),
ActiveRadarrBlock::AddMovieSelectMonitor => {
self.app.data.radarr_data.movie_monitor_list.scroll_down()
}
ActiveRadarrBlock::AddMovieSelectMinimumAvailability => self
.app
.data
.radarr_data
.add_movie_minimum_availability_list
.movie_minimum_availability_list
.scroll_down(),
ActiveRadarrBlock::AddMovieSelectQualityProfile => self
.app
.data
.radarr_data
.add_movie_quality_profile_list
.movie_quality_profile_list
.scroll_down(),
ActiveRadarrBlock::AddMoviePrompt => {
self.app.data.radarr_data.selected_block = self
@@ -107,23 +104,20 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for AddMovieHandler<'a> {
.radarr_data
.add_searched_movies
.scroll_to_top(),
ActiveRadarrBlock::AddMovieSelectMonitor => self
.app
.data
.radarr_data
.add_movie_monitor_list
.scroll_to_top(),
ActiveRadarrBlock::AddMovieSelectMonitor => {
self.app.data.radarr_data.movie_monitor_list.scroll_to_top()
}
ActiveRadarrBlock::AddMovieSelectMinimumAvailability => self
.app
.data
.radarr_data
.add_movie_minimum_availability_list
.movie_minimum_availability_list
.scroll_to_top(),
ActiveRadarrBlock::AddMovieSelectQualityProfile => self
.app
.data
.radarr_data
.add_movie_quality_profile_list
.movie_quality_profile_list
.scroll_to_top(),
_ => (),
}
@@ -141,19 +135,19 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for AddMovieHandler<'a> {
.app
.data
.radarr_data
.add_movie_monitor_list
.movie_monitor_list
.scroll_to_bottom(),
ActiveRadarrBlock::AddMovieSelectMinimumAvailability => self
.app
.data
.radarr_data
.add_movie_minimum_availability_list
.movie_minimum_availability_list
.scroll_to_bottom(),
ActiveRadarrBlock::AddMovieSelectQualityProfile => self
.app
.data
.radarr_data
.add_movie_quality_profile_list
.movie_quality_profile_list
.scroll_to_bottom(),
_ => (),
}
@@ -209,11 +203,8 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for AddMovieHandler<'a> {
self
.app
.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into());
self
.app
.data
.radarr_data
.populate_add_movie_preferences_lists();
self.app.data.radarr_data.populate_movie_preferences_lists();
self.app.data.radarr_data.selected_block = ActiveRadarrBlock::AddMovieSelectMonitor
}
}
ActiveRadarrBlock::AddMoviePrompt => match self.app.data.radarr_data.selected_block {
@@ -225,23 +216,11 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for AddMovieHandler<'a> {
self.app.pop_navigation_stack();
}
}
ActiveRadarrBlock::AddMovieSelectMonitor => self
ActiveRadarrBlock::AddMovieSelectMonitor
| ActiveRadarrBlock::AddMovieSelectMinimumAvailability
| ActiveRadarrBlock::AddMovieSelectQualityProfile => self
.app
.push_navigation_stack((ActiveRadarrBlock::AddMovieSelectMonitor, *self.context).into()),
ActiveRadarrBlock::AddMovieSelectMinimumAvailability => self.app.push_navigation_stack(
(
ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
*self.context,
)
.into(),
),
ActiveRadarrBlock::AddMovieSelectQualityProfile => self.app.push_navigation_stack(
(
ActiveRadarrBlock::AddMovieSelectQualityProfile,
*self.context,
)
.into(),
),
.push_navigation_stack((self.app.data.radarr_data.selected_block, *self.context).into()),
_ => (),
},
ActiveRadarrBlock::AddMovieSelectMonitor
@@ -265,7 +244,11 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for AddMovieHandler<'a> {
}
ActiveRadarrBlock::AddMoviePrompt => {
self.app.pop_navigation_stack();
self.app.data.radarr_data.reset_add_movie_selections();
self
.app
.data
.radarr_data
.reset_movie_preferences_selections();
self.app.data.radarr_data.prompt_confirm = false;
}
ActiveRadarrBlock::AddMovieSelectMonitor
@@ -322,7 +305,7 @@ mod tests {
test_add_movie_select_monitor_scroll,
AddMovieHandler,
Monitor,
add_movie_monitor_list,
movie_monitor_list,
ActiveRadarrBlock::AddMovieSelectMonitor,
None
);
@@ -331,7 +314,7 @@ mod tests {
test_add_movie_select_minimuum_availability_scroll,
AddMovieHandler,
MinimumAvailability,
add_movie_minimum_availability_list,
movie_minimum_availability_list,
ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
None
);
@@ -339,7 +322,7 @@ mod tests {
test_iterable_scroll!(
test_add_movie_select_quality_profile_scroll,
AddMovieHandler,
add_movie_quality_profile_list,
movie_quality_profile_list,
ActiveRadarrBlock::AddMovieSelectQualityProfile,
None
);
@@ -389,7 +372,7 @@ mod tests {
test_add_movie_select_monitor_home_end,
AddMovieHandler,
Monitor,
add_movie_monitor_list,
movie_monitor_list,
ActiveRadarrBlock::AddMovieSelectMonitor,
None
);
@@ -398,7 +381,7 @@ mod tests {
test_add_movie_select_minimuum_availability_home_end,
AddMovieHandler,
MinimumAvailability,
add_movie_minimum_availability_list,
movie_minimum_availability_list,
ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
None
);
@@ -406,7 +389,7 @@ mod tests {
test_iterable_home_and_end!(
test_add_movie_select_quality_profile_scroll,
AddMovieHandler,
add_movie_quality_profile_list,
movie_quality_profile_list,
ActiveRadarrBlock::AddMovieSelectQualityProfile,
None
);
@@ -488,24 +471,28 @@ mod tests {
app.get_current_route(),
&ActiveRadarrBlock::AddMoviePrompt.into()
);
assert!(!app.data.radarr_data.add_movie_monitor_list.items.is_empty());
assert_eq!(
app.data.radarr_data.selected_block,
ActiveRadarrBlock::AddMovieSelectMonitor
);
assert!(!app.data.radarr_data.movie_monitor_list.items.is_empty());
assert!(!app
.data
.radarr_data
.add_movie_minimum_availability_list
.movie_minimum_availability_list
.items
.is_empty());
assert!(!app
.data
.radarr_data
.add_movie_quality_profile_list
.movie_quality_profile_list
.items
.is_empty());
assert_str_eq!(
app
.data
.radarr_data
.add_movie_quality_profile_list
.movie_quality_profile_list
.current_selection(),
"A - Test 1"
);
@@ -558,7 +545,7 @@ mod tests {
}
#[test]
fn test_add_movie_prompt_prompt_decline() {
fn test_add_movie_prompt_prompt_decline_submit() {
let mut app = App::default();
app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into());
@@ -577,7 +564,7 @@ mod tests {
}
#[test]
fn test_add_movie_confirm_prompt_prompt_confirmation() {
fn test_add_movie_confirm_prompt_prompt_confirmation_submit() {
let mut app = App::default();
app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into());
@@ -600,7 +587,7 @@ mod tests {
}
#[rstest]
fn test_add_movie_prompt_selected_block(
fn test_add_movie_prompt_selected_block_submit(
#[values(
ActiveRadarrBlock::AddMovieSelectMonitor,
ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
@@ -634,7 +621,7 @@ mod tests {
}
#[rstest]
fn test_add_movie_prompt_selecting_preferences_blocks(
fn test_add_movie_prompt_selecting_preferences_blocks_submit(
#[values(
ActiveRadarrBlock::AddMovieSelectMonitor,
ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
@@ -667,7 +654,7 @@ mod tests {
use crate::app::radarr::radarr_test_utils::create_test_radarr_data;
use crate::{
assert_add_movie_selections_reset, assert_search_reset, simple_stateful_iterable_vec,
assert_movie_preferences_selections_reset, assert_search_reset, simple_stateful_iterable_vec,
};
use super::*;
@@ -765,7 +752,7 @@ mod tests {
app.get_current_route(),
&ActiveRadarrBlock::AddMovieSearchResults.into()
);
assert_add_movie_selections_reset!(app.data.radarr_data);
assert_movie_preferences_selections_reset!(app.data.radarr_data);
}
#[rstest]
@@ -94,11 +94,7 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for CollectionDetailsHandler<'a>
)
.into(),
);
self
.app
.data
.radarr_data
.populate_add_movie_preferences_lists();
self.app.data.radarr_data.populate_movie_preferences_lists();
}
}
}
@@ -204,24 +200,24 @@ mod tests {
)
.into()
);
assert!(!app.data.radarr_data.add_movie_monitor_list.items.is_empty());
assert!(!app.data.radarr_data.movie_monitor_list.items.is_empty());
assert!(!app
.data
.radarr_data
.add_movie_minimum_availability_list
.movie_minimum_availability_list
.items
.is_empty());
assert!(!app
.data
.radarr_data
.add_movie_quality_profile_list
.movie_quality_profile_list
.items
.is_empty());
assert_str_eq!(
app
.data
.radarr_data
.add_movie_quality_profile_list
.movie_quality_profile_list
.current_selection(),
"A - Test 1"
);
@@ -0,0 +1,661 @@
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::radarr::ActiveRadarrBlock;
use crate::app::App;
use crate::event::Key;
use crate::handle_text_box_keys;
use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
use crate::models::Scrollable;
use crate::network::radarr_network::RadarrEvent;
pub(super) struct EditMovieHandler<'a> {
key: &'a Key,
app: &'a mut App,
active_radarr_block: &'a ActiveRadarrBlock,
context: &'a Option<ActiveRadarrBlock>,
}
impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for EditMovieHandler<'a> {
fn with(
key: &'a Key,
app: &'a mut App,
active_block: &'a ActiveRadarrBlock,
context: &'a Option<ActiveRadarrBlock>,
) -> EditMovieHandler<'a> {
EditMovieHandler {
key,
app,
active_radarr_block: active_block,
context,
}
}
fn get_key(&self) -> &Key {
self.key
}
fn handle_scroll_up(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::EditMovieSelectMinimumAvailability => self
.app
.data
.radarr_data
.movie_minimum_availability_list
.scroll_up(),
ActiveRadarrBlock::EditMovieSelectQualityProfile => self
.app
.data
.radarr_data
.movie_quality_profile_list
.scroll_up(),
ActiveRadarrBlock::EditMoviePrompt => {
self.app.data.radarr_data.selected_block = self
.app
.data
.radarr_data
.selected_block
.clone()
.previous_edit_prompt_block()
}
_ => (),
}
}
fn handle_scroll_down(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::EditMovieSelectMinimumAvailability => self
.app
.data
.radarr_data
.movie_minimum_availability_list
.scroll_down(),
ActiveRadarrBlock::EditMovieSelectQualityProfile => self
.app
.data
.radarr_data
.movie_quality_profile_list
.scroll_down(),
ActiveRadarrBlock::EditMoviePrompt => {
self.app.data.radarr_data.selected_block = self
.app
.data
.radarr_data
.selected_block
.next_edit_prompt_block()
}
_ => (),
}
}
fn handle_home(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::EditMovieSelectMinimumAvailability => self
.app
.data
.radarr_data
.movie_minimum_availability_list
.scroll_to_top(),
ActiveRadarrBlock::EditMovieSelectQualityProfile => self
.app
.data
.radarr_data
.movie_quality_profile_list
.scroll_to_top(),
_ => (),
}
}
fn handle_end(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::EditMovieSelectMinimumAvailability => self
.app
.data
.radarr_data
.movie_minimum_availability_list
.scroll_to_bottom(),
ActiveRadarrBlock::EditMovieSelectQualityProfile => self
.app
.data
.radarr_data
.movie_quality_profile_list
.scroll_to_bottom(),
_ => (),
}
}
fn handle_delete(&mut self) {}
fn handle_left_right_action(&mut self) {
if let ActiveRadarrBlock::EditMoviePrompt = self.active_radarr_block {
handle_prompt_toggle(self.app, self.key)
}
}
fn handle_submit(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::EditMoviePrompt => match self.app.data.radarr_data.selected_block {
ActiveRadarrBlock::EditMovieConfirmPrompt => {
if self.app.data.radarr_data.prompt_confirm {
self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::EditMovie);
self.app.pop_navigation_stack();
} else {
self.app.pop_navigation_stack();
}
}
ActiveRadarrBlock::EditMovieSelectMinimumAvailability
| ActiveRadarrBlock::EditMovieSelectQualityProfile => self
.app
.push_navigation_stack((self.app.data.radarr_data.selected_block, *self.context).into()),
ActiveRadarrBlock::EditMoviePathInput | ActiveRadarrBlock::EditMovieTagsInput => {
self.app.push_navigation_stack(
(self.app.data.radarr_data.selected_block, *self.context).into(),
);
self.app.should_ignore_quit_key = true;
}
ActiveRadarrBlock::EditMovieToggleMonitored => {
self.app.data.radarr_data.edit_monitored =
Some(!self.app.data.radarr_data.edit_monitored.unwrap_or_default())
}
_ => (),
},
ActiveRadarrBlock::EditMovieSelectMinimumAvailability
| ActiveRadarrBlock::EditMovieSelectQualityProfile => self.app.pop_navigation_stack(),
ActiveRadarrBlock::EditMoviePathInput | ActiveRadarrBlock::EditMovieTagsInput => {
self.app.pop_navigation_stack();
self.app.should_ignore_quit_key = false;
}
_ => (),
}
}
fn handle_esc(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::EditMovieTagsInput | ActiveRadarrBlock::EditMoviePathInput => {
self.app.pop_navigation_stack();
self.app.should_ignore_quit_key = false;
}
ActiveRadarrBlock::EditMoviePrompt => {
self.app.pop_navigation_stack();
self.app.data.radarr_data.reset_edit_movie();
self.app.data.radarr_data.prompt_confirm = false;
}
ActiveRadarrBlock::EditMovieToggleMonitored
| ActiveRadarrBlock::EditMovieSelectMinimumAvailability
| ActiveRadarrBlock::EditMovieSelectQualityProfile => self.app.pop_navigation_stack(),
_ => (),
}
}
fn handle_char_key_event(&mut self) {
let key = self.key;
match self.active_radarr_block {
ActiveRadarrBlock::EditMoviePathInput => {
handle_text_box_keys!(self, key, self.app.data.radarr_data.edit_path)
}
ActiveRadarrBlock::EditMovieTagsInput => {
handle_text_box_keys!(self, key, self.app.data.radarr_data.edit_tags)
}
_ => (),
}
}
}
#[cfg(test)]
#[allow(unused_imports)]
mod tests {
use pretty_assertions::assert_str_eq;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::radarr::ActiveRadarrBlock;
use crate::app::App;
use crate::event::Key;
use crate::handlers::radarr_handlers::edit_movie_handler::EditMovieHandler;
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::{MinimumAvailability, Monitor};
mod test_handle_scroll_up_and_down {
use pretty_assertions::assert_eq;
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::{test_enum_scroll, test_iterable_scroll};
use super::*;
test_enum_scroll!(
test_edit_movie_select_minimuum_availability_scroll,
EditMovieHandler,
MinimumAvailability,
movie_minimum_availability_list,
ActiveRadarrBlock::EditMovieSelectMinimumAvailability,
None
);
test_iterable_scroll!(
test_edit_movie_select_quality_profile_scroll,
EditMovieHandler,
movie_quality_profile_list,
ActiveRadarrBlock::EditMovieSelectQualityProfile,
None
);
#[rstest]
fn test_edit_movie_prompt_scroll(#[values(Key::Up, Key::Down)] key: Key) {
let mut app = App::default();
app.data.radarr_data.selected_block = ActiveRadarrBlock::EditMovieSelectMinimumAvailability;
EditMovieHandler::with(&key, &mut app, &ActiveRadarrBlock::EditMoviePrompt, &None).handle();
if key == Key::Up {
assert_eq!(
app.data.radarr_data.selected_block,
ActiveRadarrBlock::EditMovieToggleMonitored
);
} else {
assert_eq!(
app.data.radarr_data.selected_block,
ActiveRadarrBlock::EditMovieSelectQualityProfile
);
}
}
}
mod test_handle_home_end {
use strum::IntoEnumIterator;
use crate::{test_enum_home_and_end, test_iterable_home_and_end};
use super::*;
test_enum_home_and_end!(
test_edit_movie_select_minimuum_availability_home_end,
EditMovieHandler,
MinimumAvailability,
movie_minimum_availability_list,
ActiveRadarrBlock::EditMovieSelectMinimumAvailability,
None
);
test_iterable_home_and_end!(
test_edit_movie_select_quality_profile_scroll,
EditMovieHandler,
movie_quality_profile_list,
ActiveRadarrBlock::EditMovieSelectQualityProfile,
None
);
}
mod test_handle_left_right_action {
use rstest::rstest;
use super::*;
#[rstest]
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();
assert!(app.data.radarr_data.prompt_confirm);
EditMovieHandler::with(&key, &mut app, &ActiveRadarrBlock::EditMoviePrompt, &None).handle();
assert!(!app.data.radarr_data.prompt_confirm);
}
}
mod test_handle_submit {
use std::collections::HashMap;
use pretty_assertions::{assert_eq, assert_str_eq};
use rstest::rstest;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::models::Route;
use crate::network::radarr_network::RadarrEvent;
use super::*;
const SUBMIT_KEY: Key = DEFAULT_KEYBINDINGS.submit.key;
#[test]
fn test_edit_movie_path_input_submit() {
let mut app = App::default();
app.should_ignore_quit_key = true;
app.data.radarr_data.edit_path = "Test Path".to_owned();
app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into());
app.push_navigation_stack(ActiveRadarrBlock::EditMoviePathInput.into());
EditMovieHandler::with(
&SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditMoviePathInput,
&None,
)
.handle();
assert!(!app.should_ignore_quit_key);
assert!(!app.data.radarr_data.edit_path.is_empty());
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditMoviePrompt.into()
);
}
#[test]
fn test_edit_movie_tags_input_submit() {
let mut app = App::default();
app.should_ignore_quit_key = true;
app.data.radarr_data.edit_tags = "Test Tags".to_owned();
app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into());
app.push_navigation_stack(ActiveRadarrBlock::EditMoviePathInput.into());
EditMovieHandler::with(
&SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditMovieTagsInput,
&None,
)
.handle();
assert!(!app.should_ignore_quit_key);
assert!(!app.data.radarr_data.edit_tags.is_empty());
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditMoviePrompt.into()
);
}
#[test]
fn test_edit_movie_prompt_prompt_decline_submit() {
let mut app = App::default();
app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into());
app.data.radarr_data.selected_block = ActiveRadarrBlock::EditMovieConfirmPrompt;
EditMovieHandler::with(
&SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditMoviePrompt,
&None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
}
#[test]
fn test_edit_movie_confirm_prompt_prompt_confirmation_submit() {
let mut app = App::default();
app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into());
app.data.radarr_data.prompt_confirm = true;
app.data.radarr_data.selected_block = ActiveRadarrBlock::EditMovieConfirmPrompt;
EditMovieHandler::with(
&SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditMoviePrompt,
&None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
assert_eq!(
app.data.radarr_data.prompt_confirm_action,
Some(RadarrEvent::EditMovie)
);
}
#[test]
fn test_edit_movie_toggle_monitored_submit() {
let current_route = Route::from((
ActiveRadarrBlock::EditMoviePrompt,
Some(ActiveRadarrBlock::Movies),
));
let mut app = App::default();
app.data.radarr_data.selected_block = ActiveRadarrBlock::EditMovieToggleMonitored;
app.push_navigation_stack(current_route);
EditMovieHandler::with(
&SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditMoviePrompt,
&Some(ActiveRadarrBlock::Movies),
)
.handle();
assert_eq!(app.get_current_route(), &current_route);
assert_eq!(app.data.radarr_data.edit_monitored, Some(true));
EditMovieHandler::with(
&SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditMoviePrompt,
&Some(ActiveRadarrBlock::Movies),
)
.handle();
assert_eq!(app.get_current_route(), &current_route);
assert_eq!(app.data.radarr_data.edit_monitored, Some(false));
}
#[rstest]
fn test_edit_movie_prompt_selected_block_submit(
#[values(
ActiveRadarrBlock::EditMovieSelectMinimumAvailability,
ActiveRadarrBlock::EditMovieSelectQualityProfile,
ActiveRadarrBlock::EditMoviePathInput,
ActiveRadarrBlock::EditMovieTagsInput
)]
selected_block: ActiveRadarrBlock,
) {
let mut app = App::default();
app.push_navigation_stack(
(
ActiveRadarrBlock::EditMoviePrompt,
Some(ActiveRadarrBlock::Movies),
)
.into(),
);
app.data.radarr_data.selected_block = selected_block;
EditMovieHandler::with(
&SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditMoviePrompt,
&Some(ActiveRadarrBlock::Movies),
)
.handle();
assert_eq!(
app.get_current_route(),
&(selected_block, Some(ActiveRadarrBlock::Movies)).into()
);
assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
if selected_block == ActiveRadarrBlock::EditMoviePathInput
|| selected_block == ActiveRadarrBlock::EditMovieTagsInput
{
assert!(app.should_ignore_quit_key);
}
}
#[rstest]
fn test_edit_movie_prompt_selecting_preferences_blocks_submit(
#[values(
ActiveRadarrBlock::EditMovieSelectMinimumAvailability,
ActiveRadarrBlock::EditMovieSelectQualityProfile,
ActiveRadarrBlock::EditMoviePathInput,
ActiveRadarrBlock::EditMovieTagsInput
)]
active_radarr_block: ActiveRadarrBlock,
) {
let mut app = App::default();
app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into());
app.push_navigation_stack(active_radarr_block.into());
EditMovieHandler::with(
&SUBMIT_KEY,
&mut app,
&active_radarr_block,
&Some(ActiveRadarrBlock::Movies),
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditMoviePrompt.into()
);
if active_radarr_block == ActiveRadarrBlock::EditMoviePathInput
|| active_radarr_block == ActiveRadarrBlock::EditMovieTagsInput
{
assert!(!app.should_ignore_quit_key);
}
}
}
mod test_handle_esc {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::app::radarr::radarr_test_utils::create_test_radarr_data;
use crate::{assert_edit_movie_reset, assert_movie_preferences_selections_reset};
use super::*;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
#[rstest]
fn test_edit_movie_input_esc(
#[values(
ActiveRadarrBlock::EditMovieTagsInput,
ActiveRadarrBlock::EditMoviePathInput
)]
active_radarr_block: ActiveRadarrBlock,
) {
let mut app = App::default();
app.data.radarr_data = create_test_radarr_data();
app.should_ignore_quit_key = true;
app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchInput.into());
app.push_navigation_stack(active_radarr_block.into());
EditMovieHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
assert!(!app.should_ignore_quit_key);
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AddMovieSearchInput.into()
);
}
#[test]
fn test_edit_movie_prompt_esc() {
let mut app = App::default();
app.push_navigation_stack(ActiveRadarrBlock::EditMoviePrompt.into());
app.data.radarr_data = create_test_radarr_data();
EditMovieHandler::with(
&ESC_KEY,
&mut app,
&ActiveRadarrBlock::EditMoviePrompt,
&None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
{
let radarr_data = &app.data.radarr_data;
assert_movie_preferences_selections_reset!(radarr_data);
assert_edit_movie_reset!(radarr_data);
assert!(!radarr_data.prompt_confirm);
}
}
#[rstest]
fn test_edit_movie_esc(
#[values(
ActiveRadarrBlock::EditMovieToggleMonitored,
ActiveRadarrBlock::EditMovieSelectMinimumAvailability,
ActiveRadarrBlock::EditMovieSelectQualityProfile
)]
active_radarr_block: ActiveRadarrBlock,
) {
let mut app = App::default();
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();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
}
}
mod test_handle_key_char {
use super::*;
#[test]
fn test_edit_movie_path_input_backspace() {
let mut app = App::default();
app.data.radarr_data.edit_path = "Test".to_owned();
EditMovieHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
&ActiveRadarrBlock::EditMoviePathInput,
&None,
)
.handle();
assert_str_eq!(app.data.radarr_data.edit_path, "Tes");
}
#[test]
fn test_edit_movie_tags_input_backspace() {
let mut app = App::default();
app.data.radarr_data.edit_tags = "Test".to_owned();
EditMovieHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
&ActiveRadarrBlock::EditMovieTagsInput,
&None,
)
.handle();
assert_str_eq!(app.data.radarr_data.edit_tags, "Tes");
}
#[test]
fn test_edit_movie_path_input_char_key() {
let mut app = App::default();
EditMovieHandler::with(
&Key::Char('h'),
&mut app,
&ActiveRadarrBlock::EditMoviePathInput,
&None,
)
.handle();
assert_str_eq!(app.data.radarr_data.edit_path, "h");
}
#[test]
fn test_edit_movie_tags_input_char_key() {
let mut app = App::default();
EditMovieHandler::with(
&Key::Char('h'),
&mut app,
&ActiveRadarrBlock::EditMovieTagsInput,
&None,
)
.handle();
assert_str_eq!(app.data.radarr_data.edit_tags, "h");
}
}
}
+119 -1
View File
@@ -1,10 +1,11 @@
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::radarr::{
ActiveRadarrBlock, ADD_MOVIE_BLOCKS, COLLECTION_DETAILS_BLOCKS, FILTER_BLOCKS,
ActiveRadarrBlock, ADD_MOVIE_BLOCKS, COLLECTION_DETAILS_BLOCKS, EDIT_MOVIE_BLOCKS, FILTER_BLOCKS,
MOVIE_DETAILS_BLOCKS, SEARCH_BLOCKS,
};
use crate::handlers::radarr_handlers::add_movie_handler::AddMovieHandler;
use crate::handlers::radarr_handlers::collection_details_handler::CollectionDetailsHandler;
use crate::handlers::radarr_handlers::edit_movie_handler::EditMovieHandler;
use crate::handlers::radarr_handlers::movie_details_handler::MovieDetailsHandler;
use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
use crate::models::Scrollable;
@@ -14,6 +15,7 @@ use crate::{handle_text_box_keys, App, Key};
mod add_movie_handler;
mod collection_details_handler;
mod edit_movie_handler;
mod movie_details_handler;
pub(super) struct RadarrHandler<'a> {
@@ -37,6 +39,9 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for RadarrHandler<'a> {
_ if ADD_MOVIE_BLOCKS.contains(self.active_radarr_block) => {
AddMovieHandler::with(self.key, self.app, self.active_radarr_block, self.context).handle()
}
_ if EDIT_MOVIE_BLOCKS.contains(self.active_radarr_block) => {
EditMovieHandler::with(self.key, self.app, self.active_radarr_block, self.context).handle()
}
_ => self.handle_key_event(),
}
}
@@ -401,6 +406,17 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for RadarrHandler<'a> {
self.app.data.radarr_data.is_filtering = true;
self.app.should_ignore_quit_key = true;
}
_ if *key == DEFAULT_KEYBINDINGS.edit.key => {
self.app.push_navigation_stack(
(
ActiveRadarrBlock::EditMoviePrompt,
Some(ActiveRadarrBlock::Movies),
)
.into(),
);
self.app.data.radarr_data.populate_edit_movie_fields();
self.app.data.radarr_data.selected_block = ActiveRadarrBlock::EditMovieToggleMonitored;
}
_ if *key == DEFAULT_KEYBINDINGS.add.key => {
self
.app
@@ -513,6 +529,76 @@ impl RadarrHandler<'_> {
}
}
#[cfg(test)]
#[macro_use]
mod radarr_handler_test_utils {
#[macro_export]
macro_rules! test_edit_movie_key {
($handler:ident, $block:expr, $context:expr) => {
let mut app = App::default();
let mut radarr_data = RadarrData {
edit_path: String::default(),
edit_tags: String::default(),
edit_monitored: None,
quality_profile_map: HashMap::from([
(2222, "HD - 1080p".to_owned()),
(1111, "Any".to_owned()),
]),
filtered_movies: StatefulTable::default(),
..create_test_radarr_data()
};
radarr_data.movies.set_items(vec![Movie {
path: "/nfs/movies/Test".to_owned(),
monitored: true,
quality_profile_id: Number::from(2222),
minimum_availability: MinimumAvailability::Released,
..Movie::default()
}]);
app.data.radarr_data = radarr_data;
$handler::with(&DEFAULT_KEYBINDINGS.edit.key, &mut app, &$block, &None).handle();
assert_eq!(
app.get_current_route(),
&(ActiveRadarrBlock::EditMoviePrompt, Some($context)).into()
);
assert_eq!(
app.data.radarr_data.selected_block,
ActiveRadarrBlock::EditMovieToggleMonitored
);
assert_eq!(
app.data.radarr_data.movie_minimum_availability_list.items,
Vec::from_iter(MinimumAvailability::iter())
);
assert_eq!(
app
.data
.radarr_data
.movie_minimum_availability_list
.current_selection(),
&MinimumAvailability::Released
);
assert_eq!(
app.data.radarr_data.movie_quality_profile_list.items,
vec!["Any".to_owned(), "HD - 1080p".to_owned()]
);
assert_eq!(
app
.data
.radarr_data
.movie_quality_profile_list
.current_selection(),
"HD - 1080p"
);
assert_eq!(
app.data.radarr_data.edit_path,
"/nfs/movies/Test".to_owned()
);
assert_eq!(app.data.radarr_data.edit_monitored, Some(true));
};
}
}
#[cfg(test)]
mod tests {
use pretty_assertions::{assert_eq, assert_str_eq};
@@ -1122,10 +1208,18 @@ mod tests {
}
mod test_handle_key_char {
use std::collections::HashMap;
use pretty_assertions::assert_eq;
use rstest::rstest;
use serde_json::Number;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::radarr::radarr_test_utils::create_test_radarr_data;
use crate::app::radarr::RadarrData;
use crate::models::radarr_models::MinimumAvailability;
use crate::models::StatefulTable;
use super::*;
@@ -1192,6 +1286,15 @@ mod tests {
assert!(app.should_ignore_quit_key);
}
#[test]
fn test_movie_edit_key() {
test_edit_movie_key!(
RadarrHandler,
ActiveRadarrBlock::Movies,
ActiveRadarrBlock::Movies
);
}
#[rstest]
#[case(ActiveRadarrBlock::Movies, ActiveRadarrBlock::RefreshAllMoviesPrompt)]
#[case(
@@ -1453,4 +1556,19 @@ mod tests {
) {
test_handler_delegation!(ActiveRadarrBlock::Movies, active_radarr_block);
}
#[rstest]
fn test_delegate_edit_movie_blocks_to_edit_movie_handler(
#[values(
ActiveRadarrBlock::EditMoviePrompt,
ActiveRadarrBlock::EditMoviePathInput,
ActiveRadarrBlock::EditMovieSelectMinimumAvailability,
ActiveRadarrBlock::EditMovieSelectQualityProfile,
ActiveRadarrBlock::EditMovieTagsInput,
ActiveRadarrBlock::EditMovieToggleMonitored
)]
active_radarr_block: ActiveRadarrBlock,
) {
test_handler_delegation!(ActiveRadarrBlock::Movies, active_radarr_block);
}
}
@@ -225,6 +225,17 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for MovieDetailsHandler<'a> {
.app
.push_navigation_stack(ActiveRadarrBlock::AutomaticallySearchMoviePrompt.into());
}
_ if *key == DEFAULT_KEYBINDINGS.edit.key => {
self.app.push_navigation_stack(
(
ActiveRadarrBlock::EditMoviePrompt,
Some(*self.active_radarr_block),
)
.into(),
);
self.app.data.radarr_data.populate_edit_movie_fields();
self.app.data.radarr_data.selected_block = ActiveRadarrBlock::EditMovieToggleMonitored;
}
_ if *key == DEFAULT_KEYBINDINGS.refresh.key => {
self
.app
@@ -762,8 +773,18 @@ mod tests {
}
mod test_handle_key_char {
use std::collections::HashMap;
use pretty_assertions::assert_eq;
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::radarr::radarr_test_utils::create_test_radarr_data;
use crate::app::radarr::RadarrData;
use crate::handlers::radarr_handlers::RadarrHandler;
use crate::models::radarr_models::{MinimumAvailability, Movie};
use crate::models::StatefulTable;
use crate::test_edit_movie_key;
use super::*;
@@ -816,6 +837,25 @@ mod tests {
assert_eq!(app.data.radarr_data.sort_ascending, Some(false));
}
#[rstest]
fn test_edit_key(
#[values(
ActiveRadarrBlock::MovieDetails,
ActiveRadarrBlock::MovieHistory,
ActiveRadarrBlock::FileInfo,
ActiveRadarrBlock::Cast,
ActiveRadarrBlock::Crew,
ActiveRadarrBlock::ManualSearch
)]
active_radarr_block: ActiveRadarrBlock,
) {
test_edit_movie_key!(
MovieDetailsHandler,
active_radarr_block,
active_radarr_block
);
}
#[rstest]
fn test_refresh_key(
#[values(