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

Refactored the Edit/Add modals into their own structs so that adding similar modals in the future is more consistent, uses less RAM (since it's wrapped in an Option now), and is easier to implement. This comes with an initial example of the IndexerSettings UI that needs its own modal now. The modal has been created but it is still not used just yet so that's the next step.

Browse Source
This commit is contained in:
Dark-Alex-17
2023-08-08 10:50:07 -06:00
parent e2e4bf16e4
commit 2d624e2648
80 changed files with 3264 additions and 1114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/radarr_handlers/collections/collection_details_handler.rs
+5 -5
View File
@@ -2,11 +2,11 @@ use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::radarr_data::{
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, ADD_MOVIE_SELECTION_BLOCKS, COLLECTION_DETAILS_BLOCKS,
EDIT_COLLECTION_SELECTION_BLOCKS,
};
use crate::models::{BlockSelectionState, Scrollable};
use crate::models::{BlockSelectionState, Scrollable, StatefulTable};
#[cfg(test)]
#[path = "collection_details_handler_tests.rs"]
@@ -108,7 +108,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionDetailsHan
);
self.app.data.radarr_data.selected_block =
BlockSelectionState::new(&ADD_MOVIE_SELECTION_BLOCKS);
self.app.data.radarr_data.populate_preferences_lists();
self.app.data.radarr_data.add_movie_modal = Some((&self.app.data.radarr_data).into());
}
}
}
@@ -116,8 +116,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionDetailsHan
fn handle_esc(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::CollectionDetails => {
self.app.data.radarr_data.collection_movies = StatefulTable::default();
self.app.pop_navigation_stack();
self.app.data.radarr_data.reset_movie_collection_table();
}
ActiveRadarrBlock::ViewMovieOverview => self.app.pop_navigation_stack(),
_ => (),
@@ -135,7 +135,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionDetailsHan
)
.into(),
);
self.app.data.radarr_data.populate_edit_collection_fields();
self.app.data.radarr_data.edit_collection_modal = Some((&self.app.data.radarr_data).into());
self.app.data.radarr_data.selected_block =
BlockSelectionState::new(&EDIT_COLLECTION_SELECTION_BLOCKS);
}
src/handlers/radarr_handlers/collections/collection_details_handler_tests.rs
+33 -7
View File
@@ -9,7 +9,9 @@ mod tests {
use crate::handlers::radarr_handlers::collections::collection_details_handler::CollectionDetailsHandler;
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::CollectionMovie;
use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS};
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS,
};
use crate::models::HorizontallyScrollableText;
mod test_handle_scroll_up_and_down {
@@ -53,7 +55,7 @@ mod tests {
use pretty_assertions::assert_eq;
use crate::models::radarr_models::Movie;
use crate::models::servarr_data::radarr_data::ADD_MOVIE_SELECTION_BLOCKS;
use crate::models::servarr_data::radarr::radarr_data::ADD_MOVIE_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use super::*;
@@ -93,7 +95,15 @@ mod tests {
)
.into()
);
assert!(!app.data.radarr_data.monitor_list.items.is_empty());
assert!(!app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.monitor_list
.items
.is_empty());
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&ActiveRadarrBlock::AddMovieSelectRootFolder
@@ -101,14 +111,28 @@ mod tests {
assert!(!app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.minimum_availability_list
.items
.is_empty());
assert!(!app.data.radarr_data.quality_profile_list.items.is_empty());
assert!(!app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.quality_profile_list
.items
.is_empty());
assert_str_eq!(
app
.data
.radarr_data
.add_movie_modal
.as_ref()
.unwrap()
.quality_profile_list
.current_selection(),
"A - Test 1"
@@ -205,9 +229,11 @@ mod tests {
use strum::IntoEnumIterator;
use crate::models::radarr_models::{Collection, MinimumAvailability};
use crate::models::servarr_data::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::models::servarr_data::radarr_data::{RadarrData, EDIT_COLLECTION_SELECTION_BLOCKS};
use crate::models::HorizontallyScrollableText;
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::models::servarr_data::radarr::radarr_data::{
RadarrData, EDIT_COLLECTION_SELECTION_BLOCKS,
};
use crate::models::StatefulTable;
use crate::test_edit_collection_key;
src/handlers/radarr_handlers/collections/collections_handler_tests.rs
+7 -5
View File
@@ -10,7 +10,7 @@ mod tests {
use crate::handlers::radarr_handlers::collections::CollectionsHandler;
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::Collection;
use crate::models::servarr_data::radarr_data::{
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, COLLECTIONS_BLOCKS, COLLECTION_DETAILS_BLOCKS, EDIT_COLLECTION_BLOCKS,
};
use crate::models::HorizontallyScrollableText;
@@ -375,7 +375,7 @@ mod tests {
mod test_handle_esc {
use pretty_assertions::assert_eq;
use crate::models::servarr_data::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::{assert_filter_reset, assert_search_reset};
use super::*;
@@ -479,9 +479,11 @@ mod tests {
use strum::IntoEnumIterator;
use crate::models::radarr_models::MinimumAvailability;
use crate::models::servarr_data::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::models::servarr_data::radarr_data::{RadarrData, EDIT_COLLECTION_SELECTION_BLOCKS};
use crate::models::HorizontallyScrollableText;
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::models::servarr_data::radarr::radarr_data::{
RadarrData, EDIT_COLLECTION_SELECTION_BLOCKS,
};
use crate::models::StatefulTable;
use crate::{assert_refresh_key, test_edit_collection_key};
src/handlers/radarr_handlers/collections/edit_collection_handler.rs
+112 -22
View File
@@ -2,7 +2,7 @@ use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::event::Key;
use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, EDIT_COLLECTION_BLOCKS};
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, EDIT_COLLECTION_BLOCKS};
use crate::models::Scrollable;
use crate::network::radarr_network::RadarrEvent;
use crate::{handle_text_box_keys, handle_text_box_left_right_keys};
@@ -47,11 +47,20 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditCollectionHandle
.app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.minimum_availability_list
.scroll_up(),
ActiveRadarrBlock::EditCollectionSelectQualityProfile => {
self.app.data.radarr_data.quality_profile_list.scroll_up()
}
ActiveRadarrBlock::EditCollectionSelectQualityProfile => self
.app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.quality_profile_list
.scroll_up(),
ActiveRadarrBlock::EditCollectionPrompt => {
self.app.data.radarr_data.selected_block.previous()
}
@@ -65,11 +74,20 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditCollectionHandle
.app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.minimum_availability_list
.scroll_down(),
ActiveRadarrBlock::EditCollectionSelectQualityProfile => {
self.app.data.radarr_data.quality_profile_list.scroll_down()
}
ActiveRadarrBlock::EditCollectionSelectQualityProfile => self
.app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.quality_profile_list
.scroll_down(),
ActiveRadarrBlock::EditCollectionPrompt => self.app.data.radarr_data.selected_block.next(),
_ => (),
}
@@ -81,17 +99,29 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditCollectionHandle
.app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.minimum_availability_list
.scroll_to_top(),
ActiveRadarrBlock::EditCollectionSelectQualityProfile => self
.app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.quality_profile_list
.scroll_to_top(),
ActiveRadarrBlock::EditCollectionRootFolderPathInput => {
self.app.data.radarr_data.edit_path.scroll_home()
}
ActiveRadarrBlock::EditCollectionRootFolderPathInput => self
.app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.path
.scroll_home(),
_ => (),
}
}
@@ -102,17 +132,29 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditCollectionHandle
.app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.minimum_availability_list
.scroll_to_bottom(),
ActiveRadarrBlock::EditCollectionSelectQualityProfile => self
.app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.quality_profile_list
.scroll_to_bottom(),
ActiveRadarrBlock::EditCollectionRootFolderPathInput => {
self.app.data.radarr_data.edit_path.reset_offset()
}
ActiveRadarrBlock::EditCollectionRootFolderPathInput => self
.app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.path
.reset_offset(),
_ => (),
}
}
@@ -123,7 +165,18 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditCollectionHandle
match self.active_radarr_block {
ActiveRadarrBlock::EditCollectionPrompt => handle_prompt_toggle(self.app, self.key),
ActiveRadarrBlock::EditCollectionRootFolderPathInput => {
handle_text_box_left_right_keys!(self, self.key, self.app.data.radarr_data.edit_path)
handle_text_box_left_right_keys!(
self,
self.key,
self
.app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.path
)
}
_ => (),
}
@@ -162,16 +215,42 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditCollectionHandle
self.app.should_ignore_quit_key = true;
}
ActiveRadarrBlock::EditCollectionToggleMonitored => {
self.app.data.radarr_data.edit_monitored =
Some(!self.app.data.radarr_data.edit_monitored.unwrap_or_default())
}
ActiveRadarrBlock::EditCollectionToggleSearchOnAdd => {
self.app.data.radarr_data.edit_search_on_add = Some(
self
.app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.monitored = Some(
!self
.app
.data
.radarr_data
.edit_search_on_add
.edit_collection_modal
.as_mut()
.unwrap()
.monitored
.unwrap_or_default(),
)
}
ActiveRadarrBlock::EditCollectionToggleSearchOnAdd => {
self
.app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.search_on_add = Some(
!self
.app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.search_on_add
.unwrap_or_default(),
)
}
@@ -196,7 +275,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditCollectionHandle
}
ActiveRadarrBlock::EditCollectionPrompt => {
self.app.pop_navigation_stack();
self.app.data.radarr_data.reset_add_edit_media_fields();
self.app.data.radarr_data.edit_collection_modal = None;
self.app.data.radarr_data.prompt_confirm = false;
}
ActiveRadarrBlock::EditCollectionSelectMinimumAvailability
@@ -208,7 +287,18 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditCollectionHandle
fn handle_char_key_event(&mut self) {
let key = self.key;
if self.active_radarr_block == &ActiveRadarrBlock::EditCollectionRootFolderPathInput {
handle_text_box_keys!(self, key, self.app.data.radarr_data.edit_path)
handle_text_box_keys!(
self,
key,
self
.app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.path
)
}
}
}
src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs
+402 -56
View File
@@ -9,35 +9,139 @@ mod tests {
use crate::handlers::radarr_handlers::collections::edit_collection_handler::EditCollectionHandler;
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::MinimumAvailability;
use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, EDIT_COLLECTION_BLOCKS};
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, EDIT_COLLECTION_BLOCKS,
};
mod test_handle_scroll_up_and_down {
use pretty_assertions::assert_eq;
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::models::servarr_data::radarr_data::EDIT_COLLECTION_SELECTION_BLOCKS;
use crate::models::servarr_data::radarr::modals::EditCollectionModal;
use crate::models::servarr_data::radarr::radarr_data::EDIT_COLLECTION_SELECTION_BLOCKS;
use crate::models::BlockSelectionState;
use crate::{test_enum_scroll, test_iterable_scroll};
use super::*;
test_enum_scroll!(
test_edit_collection_select_minimum_availability_scroll,
EditCollectionHandler,
MinimumAvailability,
minimum_availability_list,
ActiveRadarrBlock::EditCollectionSelectMinimumAvailability,
None
);
#[rstest]
fn test_edit_collection_select_minimum_availability_scroll(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let minimum_availability_vec = Vec::from_iter(MinimumAvailability::iter());
let mut app = App::default();
app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.minimum_availability_list
.set_items(minimum_availability_vec.clone());
test_iterable_scroll!(
test_edit_collection_select_quality_profile_scroll,
EditCollectionHandler,
quality_profile_list,
ActiveRadarrBlock::EditCollectionSelectQualityProfile,
None
);
if key == Key::Up {
for i in (0..minimum_availability_vec.len()).rev() {
EditCollectionHandler::with(
&key,
&mut app,
&ActiveRadarrBlock::EditCollectionSelectMinimumAvailability,
&None,
)
.handle();
assert_eq!(
app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.minimum_availability_list
.current_selection(),
&minimum_availability_vec[i]
);
}
} else {
for i in 0..minimum_availability_vec.len() {
EditCollectionHandler::with(
&key,
&mut app,
&ActiveRadarrBlock::EditCollectionSelectMinimumAvailability,
&None,
)
.handle();
assert_eq!(
app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.minimum_availability_list
.current_selection(),
&minimum_availability_vec[(i + 1) % minimum_availability_vec.len()]
);
}
}
}
#[rstest]
fn test_edit_collection_select_quality_profile_scroll(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let mut app = App::default();
app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.quality_profile_list
.set_items(vec!["Test 1".to_owned(), "Test 2".to_owned()]);
EditCollectionHandler::with(
&key,
&mut app,
&ActiveRadarrBlock::EditCollectionSelectQualityProfile,
&None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.quality_profile_list
.current_selection(),
"Test 2"
);
EditCollectionHandler::with(
&key,
&mut app,
&ActiveRadarrBlock::EditCollectionSelectQualityProfile,
&None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.quality_profile_list
.current_selection(),
"Test 1"
);
}
#[rstest]
fn test_edit_collection_prompt_scroll(#[values(Key::Up, Key::Down)] key: Key) {
@@ -69,44 +173,182 @@ mod tests {
}
mod test_handle_home_end {
use pretty_assertions::assert_eq;
use strum::IntoEnumIterator;
use crate::{test_enum_home_and_end, test_iterable_home_and_end, test_text_box_home_end_keys};
use crate::models::servarr_data::radarr::modals::EditCollectionModal;
use super::*;
test_enum_home_and_end!(
test_edit_collection_select_minimum_availability_home_end,
EditCollectionHandler,
MinimumAvailability,
minimum_availability_list,
ActiveRadarrBlock::EditCollectionSelectMinimumAvailability,
None
);
#[test]
fn test_edit_collection_select_minimum_availability_home_end() {
let minimum_availability_vec = Vec::from_iter(MinimumAvailability::iter());
let mut app = App::default();
app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.minimum_availability_list
.set_items(minimum_availability_vec.clone());
test_iterable_home_and_end!(
test_edit_collection_select_quality_profile_scroll,
EditCollectionHandler,
quality_profile_list,
ActiveRadarrBlock::EditCollectionSelectQualityProfile,
None
);
EditCollectionHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::EditCollectionSelectMinimumAvailability,
&None,
)
.handle();
assert_eq!(
app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.minimum_availability_list
.current_selection(),
&minimum_availability_vec[minimum_availability_vec.len() - 1]
);
EditCollectionHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::EditCollectionSelectMinimumAvailability,
&None,
)
.handle();
assert_eq!(
app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.minimum_availability_list
.current_selection(),
&minimum_availability_vec[0]
);
}
#[test]
fn test_edit_collection_select_quality_profile_scroll() {
let mut app = App::default();
app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
app
.data
.radarr_data
.edit_collection_modal
.as_mut()
.unwrap()
.quality_profile_list
.set_items(vec![
"Test 1".to_owned(),
"Test 2".to_owned(),
"Test 3".to_owned(),
]);
EditCollectionHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::EditCollectionSelectQualityProfile,
&None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.quality_profile_list
.current_selection(),
"Test 3"
);
EditCollectionHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::EditCollectionSelectQualityProfile,
&None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.quality_profile_list
.current_selection(),
"Test 1"
);
}
#[test]
fn test_edit_collection_root_folder_path_input_home_end_keys() {
test_text_box_home_end_keys!(
EditCollectionHandler,
ActiveRadarrBlock::EditCollectionRootFolderPathInput,
edit_path
let mut app = App::default();
app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal {
path: "Test".into(),
..EditCollectionModal::default()
});
EditCollectionHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::EditCollectionRootFolderPathInput,
&None,
)
.handle();
assert_eq!(
*app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.path
.offset
.borrow(),
4
);
EditCollectionHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::EditCollectionRootFolderPathInput,
&None,
)
.handle();
assert_eq!(
*app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.path
.offset
.borrow(),
0
);
}
}
mod test_handle_left_right_action {
use crate::models::servarr_data::radarr::modals::EditCollectionModal;
use rstest::rstest;
use crate::test_text_box_left_right_keys;
use super::*;
#[rstest]
@@ -136,10 +378,52 @@ mod tests {
#[test]
fn test_edit_collection_root_folder_path_input_left_right_keys() {
test_text_box_left_right_keys!(
EditCollectionHandler,
ActiveRadarrBlock::EditCollectionRootFolderPathInput,
edit_path
let mut app = App::default();
app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal {
path: "Test".into(),
..EditCollectionModal::default()
});
EditCollectionHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
&mut app,
&ActiveRadarrBlock::EditCollectionRootFolderPathInput,
&None,
)
.handle();
assert_eq!(
*app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.path
.offset
.borrow(),
1
);
EditCollectionHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
&mut app,
&ActiveRadarrBlock::EditCollectionRootFolderPathInput,
&None,
)
.handle();
assert_eq!(
*app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.path
.offset
.borrow(),
0
);
}
}
@@ -148,7 +432,8 @@ mod tests {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::models::servarr_data::radarr_data::EDIT_COLLECTION_SELECTION_BLOCKS;
use crate::models::servarr_data::radarr::modals::EditCollectionModal;
use crate::models::servarr_data::radarr::radarr_data::EDIT_COLLECTION_SELECTION_BLOCKS;
use crate::models::{BlockSelectionState, Route};
use crate::network::radarr_network::RadarrEvent;
@@ -248,6 +533,7 @@ mod tests {
Some(ActiveRadarrBlock::Collections),
));
let mut app = App::default();
app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
app.data.radarr_data.selected_block =
BlockSelectionState::new(&EDIT_COLLECTION_SELECTION_BLOCKS);
app.push_navigation_stack(current_route);
@@ -261,7 +547,16 @@ mod tests {
.handle();
assert_eq!(app.get_current_route(), &current_route);
assert_eq!(app.data.radarr_data.edit_monitored, Some(true));
assert_eq!(
app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.monitored,
Some(true)
);
EditCollectionHandler::with(
&SUBMIT_KEY,
@@ -272,7 +567,16 @@ mod tests {
.handle();
assert_eq!(app.get_current_route(), &current_route);
assert_eq!(app.data.radarr_data.edit_monitored, Some(false));
assert_eq!(
app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.monitored,
Some(false)
);
}
#[test]
@@ -282,6 +586,7 @@ mod tests {
Some(ActiveRadarrBlock::Collections),
));
let mut app = App::default();
app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
app.data.radarr_data.selected_block =
BlockSelectionState::new(&EDIT_COLLECTION_SELECTION_BLOCKS);
app
@@ -300,7 +605,16 @@ mod tests {
.handle();
assert_eq!(app.get_current_route(), &current_route);
assert_eq!(app.data.radarr_data.edit_search_on_add, Some(true));
assert_eq!(
app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.search_on_add,
Some(true)
);
EditCollectionHandler::with(
&SUBMIT_KEY,
@@ -311,7 +625,16 @@ mod tests {
.handle();
assert_eq!(app.get_current_route(), &current_route);
assert_eq!(app.data.radarr_data.edit_search_on_add, Some(false));
assert_eq!(
app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.search_on_add,
Some(false)
);
}
#[rstest]
@@ -389,8 +712,7 @@ mod tests {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::models::servarr_data::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::{assert_edit_media_reset, assert_preferences_selections_reset};
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use super::*;
@@ -440,8 +762,7 @@ mod tests {
);
let radarr_data = &app.data.radarr_data;
assert_preferences_selections_reset!(radarr_data);
assert_edit_media_reset!(radarr_data);
assert!(radarr_data.edit_collection_modal.is_none());
assert!(!radarr_data.prompt_confirm);
}
@@ -469,11 +790,15 @@ mod tests {
mod test_handle_key_char {
use super::*;
use crate::models::servarr_data::radarr::modals::EditCollectionModal;
#[test]
fn test_edit_collection_root_folder_path_input_backspace() {
let mut app = App::default();
app.data.radarr_data.edit_path = "Test".to_owned().into();
app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal {
path: "Test".into(),
..EditCollectionModal::default()
});
EditCollectionHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
@@ -483,12 +808,23 @@ mod tests {
)
.handle();
assert_str_eq!(app.data.radarr_data.edit_path.text, "Tes");
assert_str_eq!(
app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.path
.text,
"Tes"
);
}
#[test]
fn test_edit_collection_root_folder_path_input_char_key() {
let mut app = App::default();
app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal::default());
EditCollectionHandler::with(
&Key::Char('h'),
@@ -498,7 +834,17 @@ mod tests {
)
.handle();
assert_str_eq!(app.data.radarr_data.edit_path.text, "h");
assert_str_eq!(
app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.path
.text,
"h"
);
}
}
src/handlers/radarr_handlers/collections/mod.rs
+2 -2
View File
@@ -7,7 +7,7 @@ use crate::handlers::radarr_handlers::{
filter_table, handle_change_tab_left_right_keys, search_table,
};
use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
use crate::models::servarr_data::radarr_data::{
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, COLLECTIONS_BLOCKS, EDIT_COLLECTION_SELECTION_BLOCKS,
};
use crate::models::{BlockSelectionState, Scrollable};
@@ -287,7 +287,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
)
.into(),
);
self.app.data.radarr_data.populate_edit_collection_fields();
self.app.data.radarr_data.edit_collection_modal = Some((&self.app.data.radarr_data).into());
self.app.data.radarr_data.selected_block =
BlockSelectionState::new(&EDIT_COLLECTION_SELECTION_BLOCKS);
}