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

Did a lot of things in this one: Cleaned up a bit of leftover unused code from yesterday; deprecated the use of drain() on HorizontallyScrollableText; Refactored the uses of search and filter to be wrapped in Options; Fixed a race condition when closing the Add Movie modals in rapid succession; upgraded to ratatui 0.22.0; Fixed a bug in attempting to close an empty root folder; fixed a bug in attempting to close an empty filter; fixed a bug in attempting to close an empty search; fixed a bug in attempting to close an empty filter without resetting the view; fixed a bug in attempting to delete a movie after dynamically added one and updating the main library table

Browse Source
This commit is contained in:
Dark-Alex-17
2023-08-08 10:50:07 -06:00
parent 2d624e2648
commit 77fd9e621f
28 changed files with 1151 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/radarr_handlers/collections/collections_handler_tests.rs
+178 -30
View File
@@ -49,9 +49,7 @@ mod tests {
mod test_handle_home_end {
use pretty_assertions::assert_eq;
use crate::{
extended_stateful_iterable_vec, test_iterable_home_and_end, test_text_box_home_end_keys,
};
use crate::{extended_stateful_iterable_vec, test_iterable_home_and_end};
use super::*;
@@ -79,19 +77,93 @@ mod tests {
#[test]
fn test_collection_search_box_home_end_keys() {
test_text_box_home_end_keys!(
CollectionsHandler,
ActiveRadarrBlock::SearchCollection,
search
let mut app = App::default();
app.data.radarr_data.search = Some("Test".into());
CollectionsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::SearchCollection,
&None,
)
.handle();
assert_eq!(
*app
.data
.radarr_data
.search
.as_ref()
.unwrap()
.offset
.borrow(),
4
);
CollectionsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::SearchCollection,
&None,
)
.handle();
assert_eq!(
*app
.data
.radarr_data
.search
.as_ref()
.unwrap()
.offset
.borrow(),
0
);
}
#[test]
fn test_collection_filter_box_home_end_keys() {
test_text_box_home_end_keys!(
CollectionsHandler,
ActiveRadarrBlock::FilterCollections,
filter
let mut app = App::default();
app.data.radarr_data.filter = Some("Test".into());
CollectionsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::FilterCollections,
&None,
)
.handle();
assert_eq!(
*app
.data
.radarr_data
.filter
.as_ref()
.unwrap()
.offset
.borrow(),
4
);
CollectionsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::FilterCollections,
&None,
)
.handle();
assert_eq!(
*app
.data
.radarr_data
.filter
.as_ref()
.unwrap()
.offset
.borrow(),
0
);
}
}
@@ -100,8 +172,6 @@ mod tests {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::test_text_box_left_right_keys;
use super::*;
#[test]
@@ -179,19 +249,93 @@ mod tests {
#[test]
fn test_collection_search_box_left_right_keys() {
test_text_box_left_right_keys!(
CollectionsHandler,
ActiveRadarrBlock::SearchCollection,
search
let mut app = App::default();
app.data.radarr_data.search = Some("Test".into());
CollectionsHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
&mut app,
&ActiveRadarrBlock::SearchCollection,
&None,
)
.handle();
assert_eq!(
*app
.data
.radarr_data
.search
.as_ref()
.unwrap()
.offset
.borrow(),
1
);
CollectionsHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
&mut app,
&ActiveRadarrBlock::SearchCollection,
&None,
)
.handle();
assert_eq!(
*app
.data
.radarr_data
.search
.as_ref()
.unwrap()
.offset
.borrow(),
0
);
}
#[test]
fn test_collection_filter_box_left_right_keys() {
test_text_box_left_right_keys!(
CollectionsHandler,
ActiveRadarrBlock::FilterCollections,
filter
let mut app = App::default();
app.data.radarr_data.filter = Some("Test".into());
CollectionsHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
&mut app,
&ActiveRadarrBlock::FilterCollections,
&None,
)
.handle();
assert_eq!(
*app
.data
.radarr_data
.filter
.as_ref()
.unwrap()
.offset
.borrow(),
1
);
CollectionsHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
&mut app,
&ActiveRadarrBlock::FilterCollections,
&None,
)
.handle();
assert_eq!(
*app
.data
.radarr_data
.filter
.as_ref()
.unwrap()
.offset
.borrow(),
0
);
}
}
@@ -234,7 +378,7 @@ mod tests {
Collection,
HorizontallyScrollableText
));
app.data.radarr_data.search = "Test 2".to_owned().into();
app.data.radarr_data.search = Some("Test 2".into());
CollectionsHandler::with(
&SUBMIT_KEY,
@@ -267,7 +411,7 @@ mod tests {
Collection,
HorizontallyScrollableText
));
app.data.radarr_data.search = "Test 2".to_owned().into();
app.data.radarr_data.search = Some("Test 2".into());
CollectionsHandler::with(
&SUBMIT_KEY,
@@ -300,7 +444,7 @@ mod tests {
Collection,
HorizontallyScrollableText
));
app.data.radarr_data.filter = "Test".to_owned().into();
app.data.radarr_data.filter = Some("Test".into());
CollectionsHandler::with(
&SUBMIT_KEY,
@@ -507,6 +651,7 @@ mod tests {
);
assert!(app.data.radarr_data.is_searching);
assert!(app.should_ignore_quit_key);
assert!(app.data.radarr_data.search.is_some());
}
#[test]
@@ -527,6 +672,7 @@ mod tests {
);
assert!(app.data.radarr_data.is_filtering);
assert!(app.should_ignore_quit_key);
assert!(app.data.radarr_data.filter.is_some());
}
#[test]
@@ -564,7 +710,7 @@ mod tests {
#[test]
fn test_search_collections_box_backspace_key() {
let mut app = App::default();
app.data.radarr_data.search = "Test".to_owned().into();
app.data.radarr_data.search = Some("Test".into());
CollectionsHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
@@ -574,13 +720,13 @@ mod tests {
)
.handle();
assert_str_eq!(app.data.radarr_data.search.text, "Tes");
assert_str_eq!(app.data.radarr_data.search.as_ref().unwrap().text, "Tes");
}
#[test]
fn test_filter_collections_box_backspace_key() {
let mut app = App::default();
app.data.radarr_data.filter = "Test".to_owned().into();
app.data.radarr_data.filter = Some("Test".into());
CollectionsHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
@@ -590,12 +736,13 @@ mod tests {
)
.handle();
assert_str_eq!(app.data.radarr_data.filter.text, "Tes");
assert_str_eq!(app.data.radarr_data.filter.as_ref().unwrap().text, "Tes");
}
#[test]
fn test_search_collections_box_char_key() {
let mut app = App::default();
app.data.radarr_data.search = Some(HorizontallyScrollableText::default());
CollectionsHandler::with(
&Key::Char('h'),
@@ -605,12 +752,13 @@ mod tests {
)
.handle();
assert_str_eq!(app.data.radarr_data.search.text, "h");
assert_str_eq!(app.data.radarr_data.search.as_ref().unwrap().text, "h");
}
#[test]
fn test_filter_collections_box_char_key() {
let mut app = App::default();
app.data.radarr_data.filter = Some(HorizontallyScrollableText::default());
CollectionsHandler::with(
&Key::Char('h'),
@@ -620,7 +768,7 @@ mod tests {
)
.handle();
assert_str_eq!(app.data.radarr_data.filter.text, "h");
assert_str_eq!(app.data.radarr_data.filter.as_ref().unwrap().text, "h");
}
}
src/handlers/radarr_handlers/collections/edit_collection_handler_tests.rs
+13 -2
View File
@@ -445,7 +445,10 @@ mod tests {
fn test_edit_collection_root_folder_path_input_submit() {
let mut app = App::default();
app.should_ignore_quit_key = true;
app.data.radarr_data.edit_path = "Test Path".to_owned().into();
app.data.radarr_data.edit_collection_modal = Some(EditCollectionModal {
path: "Test Path".into(),
..EditCollectionModal::default()
});
app.push_navigation_stack(ActiveRadarrBlock::EditCollectionPrompt.into());
app.push_navigation_stack(ActiveRadarrBlock::EditCollectionRootFolderPathInput.into());
@@ -458,7 +461,15 @@ mod tests {
.handle();
assert!(!app.should_ignore_quit_key);
assert!(!app.data.radarr_data.edit_path.text.is_empty());
assert!(!app
.data
.radarr_data
.edit_collection_modal
.as_ref()
.unwrap()
.path
.text
.is_empty());
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditCollectionPrompt.into()
src/handlers/radarr_handlers/collections/mod.rs
+57 -10
View File
@@ -10,7 +10,7 @@ use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, COLLECTIONS_BLOCKS, EDIT_COLLECTION_SELECTION_BLOCKS,
};
use crate::models::{BlockSelectionState, Scrollable};
use crate::models::{BlockSelectionState, HorizontallyScrollableText, Scrollable};
use crate::network::radarr_network::RadarrEvent;
use crate::{handle_text_box_keys, handle_text_box_left_right_keys};
@@ -122,8 +122,22 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
self.app.data.radarr_data.collections.scroll_to_top()
}
}
ActiveRadarrBlock::SearchCollection => self.app.data.radarr_data.search.scroll_home(),
ActiveRadarrBlock::FilterCollections => self.app.data.radarr_data.filter.scroll_home(),
ActiveRadarrBlock::SearchCollection => self
.app
.data
.radarr_data
.search
.as_mut()
.unwrap()
.scroll_home(),
ActiveRadarrBlock::FilterCollections => self
.app
.data
.radarr_data
.filter
.as_mut()
.unwrap()
.scroll_home(),
_ => (),
}
}
@@ -149,8 +163,22 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
self.app.data.radarr_data.collections.scroll_to_bottom()
}
}
ActiveRadarrBlock::SearchCollection => self.app.data.radarr_data.search.reset_offset(),
ActiveRadarrBlock::FilterCollections => self.app.data.radarr_data.filter.reset_offset(),
ActiveRadarrBlock::SearchCollection => self
.app
.data
.radarr_data
.search
.as_mut()
.unwrap()
.reset_offset(),
ActiveRadarrBlock::FilterCollections => self
.app
.data
.radarr_data
.filter
.as_mut()
.unwrap()
.reset_offset(),
_ => (),
}
}
@@ -162,10 +190,18 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
ActiveRadarrBlock::Collections => handle_change_tab_left_right_keys(self.app, self.key),
ActiveRadarrBlock::UpdateAllCollectionsPrompt => handle_prompt_toggle(self.app, self.key),
ActiveRadarrBlock::SearchCollection => {
handle_text_box_left_right_keys!(self, self.key, self.app.data.radarr_data.search)
handle_text_box_left_right_keys!(
self,
self.key,
self.app.data.radarr_data.search.as_mut().unwrap()
)
}
ActiveRadarrBlock::FilterCollections => {
handle_text_box_left_right_keys!(self, self.key, self.app.data.radarr_data.filter)
handle_text_box_left_right_keys!(
self,
self.key,
self.app.data.radarr_data.filter.as_mut().unwrap()
)
}
_ => (),
}
@@ -269,6 +305,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
self
.app
.push_navigation_stack(ActiveRadarrBlock::SearchCollection.into());
self.app.data.radarr_data.search = Some(HorizontallyScrollableText::default());
self.app.data.radarr_data.is_searching = true;
self.app.should_ignore_quit_key = true;
}
@@ -276,6 +313,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
self
.app
.push_navigation_stack(ActiveRadarrBlock::FilterCollections.into());
self.app.data.radarr_data.filter = Some(HorizontallyScrollableText::default());
self.app.data.radarr_data.is_filtering = true;
self.app.should_ignore_quit_key = true;
}
@@ -287,7 +325,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
)
.into(),
);
self.app.data.radarr_data.edit_collection_modal = Some((&self.app.data.radarr_data).into());
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);
}
@@ -302,10 +341,18 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for CollectionsHandler<'
_ => (),
},
ActiveRadarrBlock::SearchCollection => {
handle_text_box_keys!(self, key, self.app.data.radarr_data.search)
handle_text_box_keys!(
self,
key,
self.app.data.radarr_data.search.as_mut().unwrap()
)
}
ActiveRadarrBlock::FilterCollections => {
handle_text_box_keys!(self, key, self.app.data.radarr_data.filter)
handle_text_box_keys!(
self,
key,
self.app.data.radarr_data.filter.as_mut().unwrap()
)
}
_ => (),
}