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

Refactored table filtering and searching so that they are now relative to the table being filtered/searched on. Also created two new widgets for error messages and popups to make life easier moving forward. Going to refactor table sorting into StatefulTable's as well so all tables can be searched, filtered, and sorted moving forwards.

Browse Source
This commit is contained in:
Alex Clarke
2024-02-11 19:02:18 -07:00
parent 5973f4d685
commit adda82f7f3
38 changed files with 1561 additions and 1165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/radarr_handlers/library/add_movie_handler.rs
+6 -6
View File
@@ -193,7 +193,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
.app
.data
.radarr_data
.search
.add_movie_search
.as_mut()
.unwrap()
.scroll_home(),
@@ -260,7 +260,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
.app
.data
.radarr_data
.search
.add_movie_search
.as_mut()
.unwrap()
.reset_offset(),
@@ -286,7 +286,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
handle_text_box_left_right_keys!(
self,
self.key,
self.app.data.radarr_data.search.as_mut().unwrap()
self.app.data.radarr_data.add_movie_search.as_mut().unwrap()
)
}
ActiveRadarrBlock::AddMovieTagsInput => {
@@ -314,7 +314,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
.app
.data
.radarr_data
.search
.add_movie_search
.as_mut()
.unwrap()
.text
@@ -407,7 +407,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
match self.active_radarr_block {
ActiveRadarrBlock::AddMovieSearchInput => {
self.app.pop_navigation_stack();
self.app.data.radarr_data.reset_search();
self.app.data.radarr_data.add_movie_search = None;
self.app.should_ignore_quit_key = false;
}
ActiveRadarrBlock::AddMovieSearchResults | ActiveRadarrBlock::AddMovieEmptySearchResults => {
@@ -440,7 +440,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for AddMovieHandler<'a,
handle_text_box_keys!(
self,
key,
self.app.data.radarr_data.search.as_mut().unwrap()
self.app.data.radarr_data.add_movie_search.as_mut().unwrap()
)
}
ActiveRadarrBlock::AddMovieTagsInput => {
src/handlers/radarr_handlers/library/add_movie_handler_tests.rs
+20 -14
View File
@@ -632,7 +632,7 @@ mod tests {
#[test]
fn test_add_movie_search_input_home_end_keys() {
let mut app = App::default();
app.data.radarr_data.search = Some("Test".into());
app.data.radarr_data.add_movie_search = Some("Test".into());
AddMovieHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
@@ -646,7 +646,7 @@ mod tests {
*app
.data
.radarr_data
.search
.add_movie_search
.as_ref()
.unwrap()
.offset
@@ -666,7 +666,7 @@ mod tests {
*app
.data
.radarr_data
.search
.add_movie_search
.as_ref()
.unwrap()
.offset
@@ -749,7 +749,7 @@ mod tests {
#[test]
fn test_add_movie_search_input_left_right_keys() {
let mut app = App::default();
app.data.radarr_data.search = Some("Test".into());
app.data.radarr_data.add_movie_search = Some("Test".into());
AddMovieHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
@@ -763,7 +763,7 @@ mod tests {
*app
.data
.radarr_data
.search
.add_movie_search
.as_ref()
.unwrap()
.offset
@@ -783,7 +783,7 @@ mod tests {
*app
.data
.radarr_data
.search
.add_movie_search
.as_ref()
.unwrap()
.offset
@@ -863,7 +863,7 @@ mod tests {
fn test_add_movie_search_input_submit() {
let mut app = App::default();
app.should_ignore_quit_key = true;
app.data.radarr_data.search = Some("test".into());
app.data.radarr_data.add_movie_search = Some("test".into());
AddMovieHandler::with(
&SUBMIT_KEY,
@@ -883,7 +883,7 @@ mod tests {
#[test]
fn test_add_movie_search_input_submit_noop_on_empty_search() {
let mut app = App::default();
app.data.radarr_data.search = Some(HorizontallyScrollableText::default());
app.data.radarr_data.add_movie_search = Some(HorizontallyScrollableText::default());
app.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchInput.into());
app.should_ignore_quit_key = true;
@@ -1147,7 +1147,7 @@ mod tests {
use crate::models::servarr_data::radarr::modals::AddMovieModal;
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::models::StatefulTable;
use crate::{assert_search_reset, simple_stateful_iterable_vec};
use crate::simple_stateful_iterable_vec;
use super::*;
@@ -1170,7 +1170,7 @@ mod tests {
assert!(!app.should_ignore_quit_key);
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
assert_search_reset!(app.data.radarr_data);
assert_eq!(app.data.radarr_data.add_movie_search, None);
}
#[test]
@@ -1344,7 +1344,7 @@ mod tests {
#[test]
fn test_add_movie_search_input_backspace() {
let mut app = App::default();
app.data.radarr_data.search = Some("Test".into());
app.data.radarr_data.add_movie_search = Some("Test".into());
AddMovieHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
@@ -1354,7 +1354,10 @@ mod tests {
)
.handle();
assert_str_eq!(app.data.radarr_data.search.as_ref().unwrap().text, "Tes");
assert_str_eq!(
app.data.radarr_data.add_movie_search.as_ref().unwrap().text,
"Tes"
);
}
#[test]
@@ -1389,7 +1392,7 @@ mod tests {
#[test]
fn test_add_movie_search_input_char_key() {
let mut app = App::default();
app.data.radarr_data.search = Some(HorizontallyScrollableText::default());
app.data.radarr_data.add_movie_search = Some(HorizontallyScrollableText::default());
AddMovieHandler::with(
&Key::Char('h'),
@@ -1399,7 +1402,10 @@ mod tests {
)
.handle();
assert_str_eq!(app.data.radarr_data.search.as_ref().unwrap().text, "h");
assert_str_eq!(
app.data.radarr_data.add_movie_search.as_ref().unwrap().text,
"h"
);
}
#[test]
src/handlers/radarr_handlers/library/library_handler_tests.rs
+95 -157
View File
@@ -18,7 +18,6 @@ mod tests {
use crate::test_handler_delegation;
mod test_handle_scroll_up_and_down {
use crate::models::StatefulTable;
use crate::{simple_stateful_iterable_vec, test_iterable_scroll};
use super::*;
@@ -33,55 +32,11 @@ mod tests {
title,
to_string
);
#[rstest]
fn test_filtered_movies_scroll(
#[values(DEFAULT_KEYBINDINGS.up.key, DEFAULT_KEYBINDINGS.down.key)] key: Key,
) {
let mut app = App::default();
let mut filtered_movies = StatefulTable::default();
filtered_movies.set_items(simple_stateful_iterable_vec!(
Movie,
HorizontallyScrollableText
));
app.data.radarr_data.filtered_movies = Some(filtered_movies);
LibraryHandler::with(&key, &mut app, &ActiveRadarrBlock::Movies, &None).handle();
assert_str_eq!(
app
.data
.radarr_data
.filtered_movies
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 2"
);
LibraryHandler::with(&key, &mut app, &ActiveRadarrBlock::Movies, &None).handle();
assert_str_eq!(
app
.data
.radarr_data
.filtered_movies
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 1"
);
}
}
mod test_handle_home_end {
use pretty_assertions::assert_eq;
use crate::models::StatefulTable;
use crate::{extended_stateful_iterable_vec, test_iterable_home_and_end};
use super::*;
@@ -97,63 +52,10 @@ mod tests {
to_string
);
#[test]
fn test_filtered_movies_home_end() {
let mut app = App::default();
let mut filtered_movies = StatefulTable::default();
filtered_movies.set_items(extended_stateful_iterable_vec!(
Movie,
HorizontallyScrollableText
));
app.data.radarr_data.filtered_movies = Some(filtered_movies);
LibraryHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::Movies,
&None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.filtered_movies
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 3"
);
LibraryHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::Movies,
&None,
)
.handle();
assert_str_eq!(
app
.data
.radarr_data
.filtered_movies
.as_ref()
.unwrap()
.current_selection()
.title
.to_string(),
"Test 1"
);
}
#[test]
fn test_movie_search_box_home_end_keys() {
let mut app = App::default();
app.data.radarr_data.search = Some("Test".into());
app.data.radarr_data.movies.search = Some("Test".into());
LibraryHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
@@ -167,6 +69,7 @@ mod tests {
*app
.data
.radarr_data
.movies
.search
.as_ref()
.unwrap()
@@ -187,6 +90,7 @@ mod tests {
*app
.data
.radarr_data
.movies
.search
.as_ref()
.unwrap()
@@ -199,7 +103,7 @@ mod tests {
#[test]
fn test_movie_filter_box_home_end_keys() {
let mut app = App::default();
app.data.radarr_data.filter = Some("Test".into());
app.data.radarr_data.movies.filter = Some("Test".into());
LibraryHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
@@ -213,6 +117,7 @@ mod tests {
*app
.data
.radarr_data
.movies
.filter
.as_ref()
.unwrap()
@@ -233,6 +138,7 @@ mod tests {
*app
.data
.radarr_data
.movies
.filter
.as_ref()
.unwrap()
@@ -349,7 +255,7 @@ mod tests {
#[test]
fn test_movie_search_box_left_right_keys() {
let mut app = App::default();
app.data.radarr_data.search = Some("Test".into());
app.data.radarr_data.movies.search = Some("Test".into());
LibraryHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
@@ -363,6 +269,7 @@ mod tests {
*app
.data
.radarr_data
.movies
.search
.as_ref()
.unwrap()
@@ -383,6 +290,7 @@ mod tests {
*app
.data
.radarr_data
.movies
.search
.as_ref()
.unwrap()
@@ -395,7 +303,7 @@ mod tests {
#[test]
fn test_movie_filter_box_left_right_keys() {
let mut app = App::default();
app.data.radarr_data.filter = Some("Test".into());
app.data.radarr_data.movies.filter = Some("Test".into());
LibraryHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
@@ -409,6 +317,7 @@ mod tests {
*app
.data
.radarr_data
.movies
.filter
.as_ref()
.unwrap()
@@ -429,6 +338,7 @@ mod tests {
*app
.data
.radarr_data
.movies
.filter
.as_ref()
.unwrap()
@@ -443,7 +353,6 @@ mod tests {
use pretty_assertions::assert_eq;
use crate::extended_stateful_iterable_vec;
use crate::models::StatefulTable;
use crate::network::radarr_network::RadarrEvent;
use super::*;
@@ -475,7 +384,7 @@ mod tests {
Movie,
HorizontallyScrollableText
));
app.data.radarr_data.search = Some("Test 2".into());
app.data.radarr_data.movies.search = Some("Test 2".into());
LibraryHandler::with(
&SUBMIT_KEY,
@@ -505,7 +414,7 @@ mod tests {
Movie,
HorizontallyScrollableText
));
app.data.radarr_data.search = Some("Test 5".into());
app.data.radarr_data.movies.search = Some("Test 5".into());
LibraryHandler::with(
&SUBMIT_KEY,
@@ -530,13 +439,15 @@ mod tests {
let mut app = App::default();
app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
app.push_navigation_stack(ActiveRadarrBlock::SearchMovie.into());
let mut filtered_movies = StatefulTable::default();
filtered_movies.set_items(extended_stateful_iterable_vec!(
Movie,
HorizontallyScrollableText
));
app.data.radarr_data.filtered_movies = Some(filtered_movies);
app.data.radarr_data.search = Some("Test 2".into());
app
.data
.radarr_data
.movies
.set_filtered_items(extended_stateful_iterable_vec!(
Movie,
HorizontallyScrollableText
));
app.data.radarr_data.movies.search = Some("Test 2".into());
LibraryHandler::with(
&SUBMIT_KEY,
@@ -547,15 +458,7 @@ mod tests {
.handle();
assert_str_eq!(
app
.data
.radarr_data
.filtered_movies
.as_ref()
.unwrap()
.current_selection()
.title
.text,
app.data.radarr_data.movies.current_selection().title.text,
"Test 2"
);
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
@@ -574,7 +477,7 @@ mod tests {
Movie,
HorizontallyScrollableText
));
app.data.radarr_data.filter = Some("Test".into());
app.data.radarr_data.movies.filter = Some("Test".into());
LibraryHandler::with(
&SUBMIT_KEY,
@@ -584,28 +487,21 @@ mod tests {
)
.handle();
assert!(app.data.radarr_data.filtered_movies.is_some());
assert!(app.data.radarr_data.movies.filtered_items.is_some());
assert!(!app.should_ignore_quit_key);
assert_eq!(
app
.data
.radarr_data
.filtered_movies
.movies
.filtered_items
.as_ref()
.unwrap()
.items
.len(),
3
);
assert_str_eq!(
app
.data
.radarr_data
.filtered_movies
.as_ref()
.unwrap()
.current_selection()
.title
.text,
app.data.radarr_data.movies.current_selection().title.text,
"Test 1"
);
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
@@ -624,7 +520,7 @@ mod tests {
Movie,
HorizontallyScrollableText
));
app.data.radarr_data.filter = Some("Test 5".into());
app.data.radarr_data.movies.filter = Some("Test 5".into());
LibraryHandler::with(
&SUBMIT_KEY,
@@ -634,7 +530,8 @@ mod tests {
)
.handle();
assert!(app.data.radarr_data.filtered_movies.is_none());
assert!(!app.should_ignore_quit_key);
assert!(app.data.radarr_data.movies.filtered_items.is_none());
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::FilterMoviesError.into()
@@ -686,9 +583,10 @@ mod tests {
mod test_handle_esc {
use pretty_assertions::assert_eq;
use ratatui::widgets::TableState;
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 crate::models::StatefulTable;
use super::*;
@@ -704,12 +602,13 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
app.push_navigation_stack(active_radarr_block.into());
app.data.radarr_data = create_test_radarr_data();
app.data.radarr_data.movies.search = Some("Test".into());
LibraryHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
assert!(!app.should_ignore_quit_key);
assert_search_reset!(app.data.radarr_data);
assert_eq!(app.data.radarr_data.movies.search, None);
}
#[rstest]
@@ -722,12 +621,20 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
app.push_navigation_stack(active_radarr_block.into());
app.data.radarr_data = create_test_radarr_data();
app.data.radarr_data.movies = StatefulTable {
filter: Some("Test".into()),
filtered_items: Some(Vec::new()),
filtered_state: Some(TableState::default()),
..StatefulTable::default()
};
LibraryHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
assert!(!app.should_ignore_quit_key);
assert_filter_reset!(app.data.radarr_data);
assert_eq!(app.data.radarr_data.movies.filter, None);
assert_eq!(app.data.radarr_data.movies.filtered_items, None);
assert_eq!(app.data.radarr_data.movies.filtered_state, None);
}
#[test]
@@ -756,13 +663,22 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
app.data.radarr_data = create_test_radarr_data();
app.data.radarr_data.movies = StatefulTable {
search: Some("Test".into()),
filter: Some("Test".into()),
filtered_items: Some(Vec::new()),
filtered_state: Some(TableState::default()),
..StatefulTable::default()
};
LibraryHandler::with(&ESC_KEY, &mut app, &ActiveRadarrBlock::Movies, &None).handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Movies.into());
assert!(app.error.text.is_empty());
assert_search_reset!(app.data.radarr_data);
assert_filter_reset!(app.data.radarr_data);
assert_eq!(app.data.radarr_data.movies.search, None);
assert_eq!(app.data.radarr_data.movies.filter, None);
assert_eq!(app.data.radarr_data.movies.filtered_items, None);
assert_eq!(app.data.radarr_data.movies.filtered_state, None);
}
}
@@ -778,6 +694,7 @@ mod tests {
RadarrData, EDIT_MOVIE_SELECTION_BLOCKS,
};
use crate::models::StatefulTable;
use crate::{assert_refresh_key, test_edit_movie_key};
use super::*;
@@ -798,14 +715,17 @@ mod tests {
app.get_current_route(),
&ActiveRadarrBlock::SearchMovie.into()
);
assert!(app.data.radarr_data.is_searching);
assert!(app.should_ignore_quit_key);
assert!(app.data.radarr_data.search.is_some());
assert_eq!(
app.data.radarr_data.movies.search,
Some(HorizontallyScrollableText::default())
);
}
#[test]
fn test_filter_movies_key() {
let mut app = App::default();
app.data.radarr_data.movies = StatefulTable::default();
LibraryHandler::with(
&DEFAULT_KEYBINDINGS.filter.key,
@@ -819,9 +739,8 @@ mod tests {
app.get_current_route(),
&ActiveRadarrBlock::FilterMovies.into()
);
assert!(app.data.radarr_data.is_filtering);
assert!(app.should_ignore_quit_key);
assert!(app.data.radarr_data.filter.is_some());
assert!(app.data.radarr_data.movies.filter.is_some());
}
#[test]
@@ -830,6 +749,8 @@ mod tests {
app.should_ignore_quit_key = true;
app.push_navigation_stack(ActiveRadarrBlock::Movies.into());
app.data.radarr_data = create_test_radarr_data();
app.data.radarr_data.movies = StatefulTable::default();
app.data.radarr_data.movies.filter = Some("Test".into());
LibraryHandler::with(
&DEFAULT_KEYBINDINGS.filter.key,
@@ -843,10 +764,13 @@ mod tests {
app.get_current_route(),
&ActiveRadarrBlock::FilterMovies.into()
);
assert!(app.data.radarr_data.is_filtering);
assert!(app.should_ignore_quit_key);
assert!(app.data.radarr_data.filter.is_some());
assert!(app.data.radarr_data.filtered_movies.is_none());
assert_eq!(
app.data.radarr_data.movies.filter,
Some(HorizontallyScrollableText::default())
);
assert!(app.data.radarr_data.movies.filtered_items.is_none());
assert!(app.data.radarr_data.movies.filtered_state.is_none());
}
#[test]
@@ -866,7 +790,7 @@ mod tests {
&ActiveRadarrBlock::AddMovieSearchInput.into()
);
assert!(app.should_ignore_quit_key);
assert!(app.data.radarr_data.search.is_some());
assert!(app.data.radarr_data.add_movie_search.is_some());
}
#[test]
@@ -904,7 +828,7 @@ mod tests {
#[test]
fn test_search_movies_box_backspace_key() {
let mut app = App::default();
app.data.radarr_data.search = Some("Test".into());
app.data.radarr_data.movies.search = Some("Test".into());
LibraryHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
@@ -914,13 +838,17 @@ mod tests {
)
.handle();
assert_str_eq!(app.data.radarr_data.search.as_ref().unwrap().text, "Tes");
assert_str_eq!(
app.data.radarr_data.movies.search.as_ref().unwrap().text,
"Tes"
);
}
#[test]
fn test_filter_movies_box_backspace_key() {
let mut app = App::default();
app.data.radarr_data.filter = Some("Test".into());
app.data.radarr_data.movies = StatefulTable::default();
app.data.radarr_data.movies.filter = Some("Test".into());
LibraryHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
@@ -930,13 +858,16 @@ mod tests {
)
.handle();
assert_str_eq!(app.data.radarr_data.filter.as_ref().unwrap().text, "Tes");
assert_str_eq!(
app.data.radarr_data.movies.filter.as_ref().unwrap().text,
"Tes"
);
}
#[test]
fn test_search_movies_box_char_key() {
let mut app = App::default();
app.data.radarr_data.search = Some(HorizontallyScrollableText::default());
app.data.radarr_data.movies.search = Some(HorizontallyScrollableText::default());
LibraryHandler::with(
&Key::Char('h'),
@@ -946,13 +877,17 @@ mod tests {
)
.handle();
assert_str_eq!(app.data.radarr_data.search.as_ref().unwrap().text, "h");
assert_str_eq!(
app.data.radarr_data.movies.search.as_ref().unwrap().text,
"h"
);
}
#[test]
fn test_filter_movies_box_char_key() {
let mut app = App::default();
app.data.radarr_data.filter = Some(HorizontallyScrollableText::default());
app.data.radarr_data.movies = StatefulTable::default();
app.data.radarr_data.movies.filter = Some(HorizontallyScrollableText::default());
LibraryHandler::with(
&Key::Char('h'),
@@ -962,7 +897,10 @@ mod tests {
)
.handle();
assert_str_eq!(app.data.radarr_data.filter.as_ref().unwrap().text, "h");
assert_str_eq!(
app.data.radarr_data.movies.filter.as_ref().unwrap().text,
"h"
);
}
}
src/handlers/radarr_handlers/library/mod.rs
+55 -56
View File
@@ -11,10 +11,9 @@ use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, DELETE_MOVIE_SELECTION_BLOCKS, EDIT_MOVIE_SELECTION_BLOCKS, LIBRARY_BLOCKS,
};
use crate::models::{BlockSelectionState, HorizontallyScrollableText, Scrollable, StatefulTable};
use crate::models::{BlockSelectionState, HorizontallyScrollableText, Scrollable};
use crate::network::radarr_network::RadarrEvent;
use crate::utils::strip_non_search_characters;
use crate::{filter_table, handle_text_box_keys, handle_text_box_left_right_keys, search_table};
use crate::{handle_text_box_keys, handle_text_box_left_right_keys};
mod add_movie_handler;
mod delete_movie_handler;
@@ -81,38 +80,25 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
fn handle_scroll_up(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::Movies {
if let Some(filtered_movies) = self.app.data.radarr_data.filtered_movies.as_mut() {
filtered_movies.scroll_up();
} else {
self.app.data.radarr_data.movies.scroll_up()
}
self.app.data.radarr_data.movies.scroll_up()
}
}
fn handle_scroll_down(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::Movies {
if let Some(filtered_movies) = self.app.data.radarr_data.filtered_movies.as_mut() {
filtered_movies.scroll_down();
} else {
self.app.data.radarr_data.movies.scroll_down()
}
self.app.data.radarr_data.movies.scroll_down()
}
}
fn handle_home(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::Movies => {
if let Some(filtered_movies) = self.app.data.radarr_data.filtered_movies.as_mut() {
filtered_movies.scroll_to_top();
} else {
self.app.data.radarr_data.movies.scroll_to_top()
}
}
ActiveRadarrBlock::Movies => self.app.data.radarr_data.movies.scroll_to_top(),
ActiveRadarrBlock::SearchMovie => {
self
.app
.data
.radarr_data
.movies
.search
.as_mut()
.unwrap()
@@ -123,6 +109,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
.app
.data
.radarr_data
.movies
.filter
.as_mut()
.unwrap()
@@ -134,17 +121,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
fn handle_end(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::Movies => {
if let Some(filtered_movies) = self.app.data.radarr_data.filtered_movies.as_mut() {
filtered_movies.scroll_to_bottom();
} else {
self.app.data.radarr_data.movies.scroll_to_bottom()
}
}
ActiveRadarrBlock::Movies => self.app.data.radarr_data.movies.scroll_to_bottom(),
ActiveRadarrBlock::SearchMovie => self
.app
.data
.radarr_data
.movies
.search
.as_mut()
.unwrap()
@@ -153,6 +135,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
.app
.data
.radarr_data
.movies
.filter
.as_mut()
.unwrap()
@@ -179,14 +162,14 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
handle_text_box_left_right_keys!(
self,
self.key,
self.app.data.radarr_data.search.as_mut().unwrap()
self.app.data.radarr_data.movies.search.as_mut().unwrap()
)
}
ActiveRadarrBlock::FilterMovies => {
handle_text_box_left_right_keys!(
self,
self.key,
self.app.data.radarr_data.filter.as_mut().unwrap()
self.app.data.radarr_data.movies.filter.as_mut().unwrap()
)
}
_ => (),
@@ -199,24 +182,42 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
.app
.push_navigation_stack(ActiveRadarrBlock::MovieDetails.into()),
ActiveRadarrBlock::SearchMovie => {
if self.app.data.radarr_data.filtered_movies.is_some() {
search_table!(
self.app,
filtered_movies,
ActiveRadarrBlock::SearchMovieError,
true
);
} else {
search_table!(self.app, movies, ActiveRadarrBlock::SearchMovieError);
self.app.pop_navigation_stack();
self.app.should_ignore_quit_key = false;
if self.app.data.radarr_data.movies.search.is_some() {
let has_match = self
.app
.data
.radarr_data
.movies
.apply_search(|movie| &movie.title.text);
if !has_match {
self
.app
.push_navigation_stack(ActiveRadarrBlock::SearchMovieError.into());
}
}
}
ActiveRadarrBlock::FilterMovies => {
filter_table!(
self.app,
movies,
filtered_movies,
ActiveRadarrBlock::FilterMoviesError
);
self.app.pop_navigation_stack();
self.app.should_ignore_quit_key = false;
if self.app.data.radarr_data.movies.filter.is_some() {
let has_matches = self
.app
.data
.radarr_data
.movies
.apply_filter(|movie| &movie.title.text);
if !has_matches {
self
.app
.push_navigation_stack(ActiveRadarrBlock::FilterMoviesError.into());
}
}
}
ActiveRadarrBlock::UpdateAllMoviesPrompt => {
if self.app.data.radarr_data.prompt_confirm {
@@ -233,12 +234,12 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
match self.active_radarr_block {
ActiveRadarrBlock::FilterMovies | ActiveRadarrBlock::FilterMoviesError => {
self.app.pop_navigation_stack();
self.app.data.radarr_data.reset_filter();
self.app.data.radarr_data.movies.reset_filter();
self.app.should_ignore_quit_key = false;
}
ActiveRadarrBlock::SearchMovie | ActiveRadarrBlock::SearchMovieError => {
self.app.pop_navigation_stack();
self.app.data.radarr_data.reset_search();
self.app.data.radarr_data.movies.reset_search();
self.app.should_ignore_quit_key = false;
}
ActiveRadarrBlock::UpdateAllMoviesPrompt => {
@@ -246,8 +247,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
self.app.data.radarr_data.prompt_confirm = false;
}
_ => {
self.app.data.radarr_data.reset_search();
self.app.data.radarr_data.reset_filter();
self.app.data.radarr_data.movies.reset_search();
self.app.data.radarr_data.movies.reset_filter();
handle_clear_errors(self.app);
}
}
@@ -261,17 +262,15 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
self
.app
.push_navigation_stack(ActiveRadarrBlock::SearchMovie.into());
self.app.data.radarr_data.search = Some(HorizontallyScrollableText::default());
self.app.data.radarr_data.is_searching = true;
self.app.data.radarr_data.movies.search = Some(HorizontallyScrollableText::default());
self.app.should_ignore_quit_key = true;
}
_ if *key == DEFAULT_KEYBINDINGS.filter.key => {
self
.app
.push_navigation_stack(ActiveRadarrBlock::FilterMovies.into());
self.app.data.radarr_data.reset_filter();
self.app.data.radarr_data.filter = Some(HorizontallyScrollableText::default());
self.app.data.radarr_data.is_filtering = true;
self.app.data.radarr_data.movies.reset_filter();
self.app.data.radarr_data.movies.filter = Some(HorizontallyScrollableText::default());
self.app.should_ignore_quit_key = true;
}
_ if *key == DEFAULT_KEYBINDINGS.edit.key => {
@@ -290,7 +289,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
self
.app
.push_navigation_stack(ActiveRadarrBlock::AddMovieSearchInput.into());
self.app.data.radarr_data.search = Some(HorizontallyScrollableText::default());
self.app.data.radarr_data.add_movie_search = Some(HorizontallyScrollableText::default());
self.app.should_ignore_quit_key = true;
}
_ if *key == DEFAULT_KEYBINDINGS.update.key => {
@@ -307,14 +306,14 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for LibraryHandler<'a, '
handle_text_box_keys!(
self,
key,
self.app.data.radarr_data.search.as_mut().unwrap()
self.app.data.radarr_data.movies.search.as_mut().unwrap()
)
}
ActiveRadarrBlock::FilterMovies => {
handle_text_box_keys!(
self,
key,
self.app.data.radarr_data.filter.as_mut().unwrap()
self.app.data.radarr_data.movies.filter.as_mut().unwrap()
)
}
_ => (),