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

Functional tags implementation for adding movies! Still need to fix weird loading bug when searching a movie that shows an error too soon before results are loaded, need to fix the horizontal scrolling issue, and I need to change the quality profile map to use the BiMap

Browse Source
This commit is contained in:
Dark-Alex-17
2023-08-08 10:50:05 -06:00
parent a23fc84d5b
commit c946d916ad
10 changed files with 226 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/radarr_handlers/add_movie_handler.rs
+139 -11
View File
@@ -120,6 +120,7 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for AddMovieHandler<'a> {
.movie_quality_profile_list
.scroll_to_top(),
ActiveRadarrBlock::AddMovieSearchInput => self.app.data.radarr_data.search.scroll_home(),
ActiveRadarrBlock::AddMovieTagsInput => self.app.data.radarr_data.edit_tags.scroll_home(),
_ => (),
}
}
@@ -151,6 +152,7 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for AddMovieHandler<'a> {
.movie_quality_profile_list
.scroll_to_bottom(),
ActiveRadarrBlock::AddMovieSearchInput => self.app.data.radarr_data.search.reset_offset(),
ActiveRadarrBlock::AddMovieTagsInput => self.app.data.radarr_data.edit_tags.reset_offset(),
_ => (),
}
}
@@ -163,6 +165,9 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for AddMovieHandler<'a> {
ActiveRadarrBlock::AddMovieSearchInput => {
handle_text_box_left_right_keys!(self, self.key, self.app.data.radarr_data.search)
}
ActiveRadarrBlock::AddMovieTagsInput => {
handle_text_box_left_right_keys!(self, self.key, self.app.data.radarr_data.edit_tags)
}
_ => (),
}
}
@@ -210,7 +215,7 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for AddMovieHandler<'a> {
.app
.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into());
self.app.data.radarr_data.populate_movie_preferences_lists();
self.app.data.radarr_data.selected_block = ActiveRadarrBlock::AddMovieSelectMonitor
self.app.data.radarr_data.selected_block = ActiveRadarrBlock::AddMovieSelectMonitor;
}
}
ActiveRadarrBlock::AddMoviePrompt => match self.app.data.radarr_data.selected_block {
@@ -227,11 +232,21 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for AddMovieHandler<'a> {
| ActiveRadarrBlock::AddMovieSelectQualityProfile => self
.app
.push_navigation_stack((self.app.data.radarr_data.selected_block, *self.context).into()),
ActiveRadarrBlock::AddMovieTagsInput => {
self.app.push_navigation_stack(
(self.app.data.radarr_data.selected_block, *self.context).into(),
);
self.app.should_ignore_quit_key = true;
}
_ => (),
},
ActiveRadarrBlock::AddMovieSelectMonitor
| ActiveRadarrBlock::AddMovieSelectMinimumAvailability
| ActiveRadarrBlock::AddMovieSelectQualityProfile => self.app.pop_navigation_stack(),
ActiveRadarrBlock::AddMovieTagsInput => {
self.app.pop_navigation_stack();
self.app.should_ignore_quit_key = false;
}
_ => (),
}
}
@@ -250,25 +265,31 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for AddMovieHandler<'a> {
}
ActiveRadarrBlock::AddMoviePrompt => {
self.app.pop_navigation_stack();
self
.app
.data
.radarr_data
.reset_movie_preferences_selections();
self.app.data.radarr_data.reset_add_edit_movie_fields();
self.app.data.radarr_data.prompt_confirm = false;
}
ActiveRadarrBlock::AddMovieSelectMonitor
| ActiveRadarrBlock::AddMovieSelectMinimumAvailability
| ActiveRadarrBlock::AddMovieSelectQualityProfile
| ActiveRadarrBlock::AddMovieAlreadyInLibrary => self.app.pop_navigation_stack(),
ActiveRadarrBlock::AddMovieTagsInput => {
self.app.pop_navigation_stack();
self.app.should_ignore_quit_key = false;
}
_ => (),
}
}
fn handle_char_key_event(&mut self) {
let key = self.key;
if self.active_radarr_block == &ActiveRadarrBlock::AddMovieSearchInput {
handle_text_box_keys!(self, key, self.app.data.radarr_data.search)
match self.active_radarr_block {
ActiveRadarrBlock::AddMovieSearchInput => {
handle_text_box_keys!(self, key, self.app.data.radarr_data.search)
}
ActiveRadarrBlock::AddMovieTagsInput => {
handle_text_box_keys!(self, key, self.app.data.radarr_data.edit_tags)
}
_ => (),
}
}
}
@@ -410,6 +431,15 @@ mod tests {
search
);
}
#[test]
fn test_add_movie_tags_input_home_end_keys() {
test_text_box_home_end_keys!(
AddMovieHandler,
ActiveRadarrBlock::AddMovieTagsInput,
edit_tags
);
}
}
mod test_handle_left_right_action {
@@ -440,6 +470,15 @@ mod tests {
search
);
}
#[test]
fn test_add_movie_tags_input_left_right_keys() {
test_text_box_left_right_keys!(
AddMovieHandler,
ActiveRadarrBlock::AddMovieTagsInput,
edit_tags
);
}
}
mod test_handle_submit {
@@ -619,7 +658,8 @@ mod tests {
#[values(
ActiveRadarrBlock::AddMovieSelectMonitor,
ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
ActiveRadarrBlock::AddMovieSelectQualityProfile
ActiveRadarrBlock::AddMovieSelectQualityProfile,
ActiveRadarrBlock::AddMovieTagsInput
)]
selected_block: ActiveRadarrBlock,
) {
@@ -646,6 +686,10 @@ mod tests {
&(selected_block, Some(ActiveRadarrBlock::CollectionDetails)).into()
);
assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
if selected_block == ActiveRadarrBlock::AddMovieTagsInput {
assert!(app.should_ignore_quit_key);
}
}
#[rstest]
@@ -653,7 +697,8 @@ mod tests {
#[values(
ActiveRadarrBlock::AddMovieSelectMonitor,
ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
ActiveRadarrBlock::AddMovieSelectQualityProfile
ActiveRadarrBlock::AddMovieSelectQualityProfile,
ActiveRadarrBlock::AddMovieTagsInput
)]
active_radarr_block: ActiveRadarrBlock,
) {
@@ -673,6 +718,10 @@ mod tests {
app.get_current_route(),
&ActiveRadarrBlock::AddMoviePrompt.into()
);
if active_radarr_block == ActiveRadarrBlock::AddMovieTagsInput {
assert!(!app.should_ignore_quit_key);
}
}
}
@@ -682,7 +731,8 @@ mod tests {
use crate::app::radarr::radarr_test_utils::create_test_radarr_data;
use crate::{
assert_movie_preferences_selections_reset, assert_search_reset, simple_stateful_iterable_vec,
assert_edit_movie_reset, assert_movie_preferences_selections_reset, assert_search_reset,
simple_stateful_iterable_vec,
};
use super::*;
@@ -709,6 +759,29 @@ mod tests {
assert_search_reset!(app.data.radarr_data);
}
#[test]
fn test_add_movie_input_esc() {
let mut app = App::default();
app.data.radarr_data = create_test_radarr_data();
app.should_ignore_quit_key = true;
app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into());
app.push_navigation_stack(ActiveRadarrBlock::AddMovieTagsInput.into());
AddMovieHandler::with(
&ESC_KEY,
&mut app,
&ActiveRadarrBlock::AddMovieTagsInput,
&None,
)
.handle();
assert!(!app.should_ignore_quit_key);
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AddMoviePrompt.into()
);
}
#[test]
fn test_add_movie_search_results_esc() {
let mut app = App::default();
@@ -781,6 +854,30 @@ mod tests {
&ActiveRadarrBlock::AddMovieSearchResults.into()
);
assert_movie_preferences_selections_reset!(app.data.radarr_data);
assert_edit_movie_reset!(app.data.radarr_data);
}
#[test]
fn test_add_movie_tags_input_esc() {
let mut app = App::default();
app.data.radarr_data = create_test_radarr_data();
app.should_ignore_quit_key = true;
app.push_navigation_stack(ActiveRadarrBlock::AddMoviePrompt.into());
app.push_navigation_stack(ActiveRadarrBlock::AddMovieTagsInput.into());
AddMovieHandler::with(
&ESC_KEY,
&mut app,
&ActiveRadarrBlock::AddMovieTagsInput,
&None,
)
.handle();
assert!(!app.should_ignore_quit_key);
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AddMoviePrompt.into()
);
}
#[rstest]
@@ -846,6 +943,22 @@ mod tests {
assert_str_eq!(app.data.radarr_data.search.text, "Tes");
}
#[test]
fn test_add_movie_tags_input_backspace() {
let mut app = App::default();
app.data.radarr_data.edit_tags = "Test".to_owned().into();
AddMovieHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
&ActiveRadarrBlock::AddMovieTagsInput,
&None,
)
.handle();
assert_str_eq!(app.data.radarr_data.edit_tags.text, "Tes");
}
#[test]
fn test_add_movie_search_input_char_key() {
let mut app = App::default();
@@ -860,5 +973,20 @@ mod tests {
assert_str_eq!(app.data.radarr_data.search.text, "h");
}
#[test]
fn test_add_movie_tags_input_char_key() {
let mut app = App::default();
AddMovieHandler::with(
&Key::Char('h'),
&mut app,
&ActiveRadarrBlock::AddMovieTagsInput,
&None,
)
.handle();
assert_str_eq!(app.data.radarr_data.edit_tags.text, "h");
}
}
}
src/handlers/radarr_handlers/collection_details_handler.rs
+6
View File
@@ -94,6 +94,7 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for CollectionDetailsHandler<'a>
)
.into(),
);
self.app.data.radarr_data.selected_block = ActiveRadarrBlock::EditMovieToggleMonitored;
self.app.data.radarr_data.populate_movie_preferences_lists();
}
}
@@ -183,6 +184,7 @@ mod tests {
.set_items(vec![CollectionMovie::default()]);
app.data.radarr_data.quality_profile_map =
HashMap::from([(1, "B - Test 2".to_owned()), (0, "A - Test 1".to_owned())]);
app.data.radarr_data.selected_block = ActiveRadarrBlock::AddMovieConfirmPrompt;
CollectionDetailsHandler::with(
&SUBMIT_KEY,
@@ -201,6 +203,10 @@ mod tests {
.into()
);
assert!(!app.data.radarr_data.movie_monitor_list.items.is_empty());
assert_eq!(
app.data.radarr_data.selected_block,
ActiveRadarrBlock::EditMovieToggleMonitored
);
assert!(!app
.data
.radarr_data
src/handlers/radarr_handlers/edit_movie_handler.rs
+3 -3
View File
@@ -186,7 +186,7 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for EditMovieHandler<'a> {
}
ActiveRadarrBlock::EditMoviePrompt => {
self.app.pop_navigation_stack();
self.app.data.radarr_data.reset_edit_movie();
self.app.data.radarr_data.reset_add_edit_movie_fields();
self.app.data.radarr_data.prompt_confirm = false;
}
ActiveRadarrBlock::EditMovieToggleMonitored
@@ -587,7 +587,7 @@ mod tests {
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(ActiveRadarrBlock::EditMoviePrompt.into());
app.push_navigation_stack(active_radarr_block.into());
EditMovieHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
@@ -595,7 +595,7 @@ mod tests {
assert!(!app.should_ignore_quit_key);
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AddMovieSearchInput.into()
&ActiveRadarrBlock::EditMoviePrompt.into()
);
}
src/handlers/radarr_handlers/mod.rs
+2 -1
View File
@@ -1564,7 +1564,8 @@ mod tests {
ActiveRadarrBlock::AddMovieSelectMonitor,
ActiveRadarrBlock::AddMovieSelectMinimumAvailability,
ActiveRadarrBlock::AddMovieSelectQualityProfile,
ActiveRadarrBlock::AddMovieAlreadyInLibrary
ActiveRadarrBlock::AddMovieAlreadyInLibrary,
ActiveRadarrBlock::AddMovieTagsInput
)]
active_radarr_block: ActiveRadarrBlock,
) {