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

feat(app): Dispatch support for all relevant Sonarr blocks

Browse Source
This commit is contained in:
Alex Clarke
2024-11-27 17:06:20 -07:00
parent 73a4129000
commit f139db07d9
86 changed files with 4075 additions and 3005 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/radarr_handlers/root_folders/mod.rs
+16 -16
View File
@@ -13,22 +13,22 @@ use crate::{handle_text_box_keys, handle_text_box_left_right_keys};
mod root_folders_handler_tests;
pub(super) struct RootFoldersHandler<'a, 'b> {
key: &'a Key,
key: Key,
app: &'a mut App<'b>,
active_radarr_block: &'a ActiveRadarrBlock,
_context: &'a Option<ActiveRadarrBlock>,
active_radarr_block: ActiveRadarrBlock,
_context: Option<ActiveRadarrBlock>,
}
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<'a, 'b> {
fn accepts(active_block: &'a ActiveRadarrBlock) -> bool {
ROOT_FOLDERS_BLOCKS.contains(active_block)
fn accepts(active_block: ActiveRadarrBlock) -> bool {
ROOT_FOLDERS_BLOCKS.contains(&active_block)
}
fn with(
key: &'a Key,
key: Key,
app: &'a mut App<'b>,
active_block: &'a ActiveRadarrBlock,
_context: &'a Option<ActiveRadarrBlock>,
active_block: ActiveRadarrBlock,
_context: Option<ActiveRadarrBlock>,
) -> RootFoldersHandler<'a, 'b> {
RootFoldersHandler {
key,
@@ -38,7 +38,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<'
}
}
fn get_key(&self) -> &Key {
fn get_key(&self) -> Key {
self.key
}
@@ -47,13 +47,13 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<'
}
fn handle_scroll_up(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::RootFolders {
if self.active_radarr_block == ActiveRadarrBlock::RootFolders {
self.app.data.radarr_data.root_folders.scroll_up()
}
}
fn handle_scroll_down(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::RootFolders {
if self.active_radarr_block == ActiveRadarrBlock::RootFolders {
self.app.data.radarr_data.root_folders.scroll_down()
}
}
@@ -89,7 +89,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<'
}
fn handle_delete(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::RootFolders {
if self.active_radarr_block == ActiveRadarrBlock::RootFolders {
self
.app
.push_navigation_stack(ActiveRadarrBlock::DeleteRootFolderPrompt.into())
@@ -121,7 +121,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<'
self.app.pop_navigation_stack();
}
_ if *self.active_radarr_block == ActiveRadarrBlock::AddRootFolderPrompt
_ if self.active_radarr_block == ActiveRadarrBlock::AddRootFolderPrompt
&& !self
.app
.data
@@ -161,10 +161,10 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<'
let key = self.key;
match self.active_radarr_block {
ActiveRadarrBlock::RootFolders => match self.key {
_ if *key == DEFAULT_KEYBINDINGS.refresh.key => {
_ if key == DEFAULT_KEYBINDINGS.refresh.key => {
self.app.should_refresh = true;
}
_ if *key == DEFAULT_KEYBINDINGS.add.key => {
_ if key == DEFAULT_KEYBINDINGS.add.key => {
self
.app
.push_navigation_stack(ActiveRadarrBlock::AddRootFolderPrompt.into());
@@ -181,7 +181,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<'
)
}
ActiveRadarrBlock::DeleteRootFolderPrompt => {
if *key == DEFAULT_KEYBINDINGS.confirm.key {
if key == DEFAULT_KEYBINDINGS.confirm.key {
self.app.data.radarr_data.prompt_confirm = true;
self.app.data.radarr_data.prompt_confirm_action =
Some(RadarrEvent::DeleteRootFolder(None));
src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs
+103 -118
View File
@@ -42,14 +42,14 @@ mod tests {
.root_folders
.set_items(simple_stateful_iterable_vec!(RootFolder, String, path));
RootFoldersHandler::with(&key, &mut app, &ActiveRadarrBlock::RootFolders, &None).handle();
RootFoldersHandler::with(key, &mut app, ActiveRadarrBlock::RootFolders, None).handle();
assert_str_eq!(
app.data.radarr_data.root_folders.current_selection().path,
"Test 1"
);
RootFoldersHandler::with(&key, &mut app, &ActiveRadarrBlock::RootFolders, &None).handle();
RootFoldersHandler::with(key, &mut app, ActiveRadarrBlock::RootFolders, None).handle();
assert_str_eq!(
app.data.radarr_data.root_folders.current_selection().path,
@@ -89,10 +89,10 @@ mod tests {
.set_items(extended_stateful_iterable_vec!(RootFolder, String, path));
RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::RootFolders,
&None,
ActiveRadarrBlock::RootFolders,
None,
)
.handle();
@@ -102,10 +102,10 @@ mod tests {
);
RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::RootFolders,
&None,
ActiveRadarrBlock::RootFolders,
None,
)
.handle();
@@ -126,10 +126,10 @@ mod tests {
app.data.radarr_data.edit_root_folder = Some("Test".into());
RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::AddRootFolderPrompt,
&None,
ActiveRadarrBlock::AddRootFolderPrompt,
None,
)
.handle();
@@ -146,10 +146,10 @@ mod tests {
);
RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::AddRootFolderPrompt,
&None,
ActiveRadarrBlock::AddRootFolderPrompt,
None,
)
.handle();
@@ -183,17 +183,11 @@ mod tests {
.root_folders
.set_items(vec![RootFolder::default()]);
RootFoldersHandler::with(
&DELETE_KEY,
&mut app,
&ActiveRadarrBlock::RootFolders,
&None,
)
.handle();
RootFoldersHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::RootFolders, None).handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::DeleteRootFolderPrompt.into()
ActiveRadarrBlock::DeleteRootFolderPrompt.into()
);
}
@@ -208,17 +202,11 @@ mod tests {
.root_folders
.set_items(vec![RootFolder::default()]);
RootFoldersHandler::with(
&DELETE_KEY,
&mut app,
&ActiveRadarrBlock::RootFolders,
&None,
)
.handle();
RootFoldersHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::RootFolders, None).handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::RootFolders.into()
ActiveRadarrBlock::RootFolders.into()
);
}
}
@@ -238,21 +226,18 @@ mod tests {
app.data.radarr_data.main_tabs.set_index(4);
RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
DEFAULT_KEYBINDINGS.left.key,
&mut app,
&ActiveRadarrBlock::RootFolders,
&None,
ActiveRadarrBlock::RootFolders,
None,
)
.handle();
assert_eq!(
app.data.radarr_data.main_tabs.get_active_route(),
&ActiveRadarrBlock::Blocklist.into()
);
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::Blocklist.into()
ActiveRadarrBlock::Blocklist.into()
);
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Blocklist.into());
}
#[rstest]
@@ -262,18 +247,18 @@ mod tests {
app.data.radarr_data.main_tabs.set_index(4);
RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
DEFAULT_KEYBINDINGS.right.key,
&mut app,
&ActiveRadarrBlock::RootFolders,
&None,
ActiveRadarrBlock::RootFolders,
None,
)
.handle();
assert_eq!(
app.data.radarr_data.main_tabs.get_active_route(),
&ActiveRadarrBlock::Indexers.into()
ActiveRadarrBlock::Indexers.into()
);
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
}
#[rstest]
@@ -283,20 +268,20 @@ mod tests {
let mut app = App::default();
RootFoldersHandler::with(
&key,
key,
&mut app,
&ActiveRadarrBlock::DeleteRootFolderPrompt,
&None,
ActiveRadarrBlock::DeleteRootFolderPrompt,
None,
)
.handle();
assert!(app.data.radarr_data.prompt_confirm);
RootFoldersHandler::with(
&key,
key,
&mut app,
&ActiveRadarrBlock::DeleteRootFolderPrompt,
&None,
ActiveRadarrBlock::DeleteRootFolderPrompt,
None,
)
.handle();
@@ -309,10 +294,10 @@ mod tests {
app.data.radarr_data.edit_root_folder = Some("Test".into());
RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
DEFAULT_KEYBINDINGS.left.key,
&mut app,
&ActiveRadarrBlock::AddRootFolderPrompt,
&None,
ActiveRadarrBlock::AddRootFolderPrompt,
None,
)
.handle();
@@ -329,10 +314,10 @@ mod tests {
);
RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
DEFAULT_KEYBINDINGS.right.key,
&mut app,
&ActiveRadarrBlock::AddRootFolderPrompt,
&None,
ActiveRadarrBlock::AddRootFolderPrompt,
None,
)
.handle();
@@ -374,10 +359,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::AddRootFolderPrompt.into());
RootFoldersHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::AddRootFolderPrompt,
&None,
ActiveRadarrBlock::AddRootFolderPrompt,
None,
)
.handle();
@@ -389,7 +374,7 @@ mod tests {
);
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::RootFolders.into()
ActiveRadarrBlock::RootFolders.into()
);
}
@@ -403,10 +388,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::AddRootFolderPrompt.into());
RootFoldersHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::AddRootFolderPrompt,
&None,
ActiveRadarrBlock::AddRootFolderPrompt,
None,
)
.handle();
@@ -415,7 +400,7 @@ mod tests {
assert!(app.data.radarr_data.prompt_confirm_action.is_none());
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AddRootFolderPrompt.into()
ActiveRadarrBlock::AddRootFolderPrompt.into()
);
}
@@ -432,10 +417,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::DeleteRootFolderPrompt.into());
RootFoldersHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::DeleteRootFolderPrompt,
&None,
ActiveRadarrBlock::DeleteRootFolderPrompt,
None,
)
.handle();
@@ -446,7 +431,7 @@ mod tests {
);
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::RootFolders.into()
ActiveRadarrBlock::RootFolders.into()
);
}
@@ -462,10 +447,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::DeleteRootFolderPrompt.into());
RootFoldersHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::DeleteRootFolderPrompt,
&None,
ActiveRadarrBlock::DeleteRootFolderPrompt,
None,
)
.handle();
@@ -473,7 +458,7 @@ mod tests {
assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::RootFolders.into()
ActiveRadarrBlock::RootFolders.into()
);
}
}
@@ -493,16 +478,16 @@ mod tests {
app.data.radarr_data.prompt_confirm = true;
RootFoldersHandler::with(
&ESC_KEY,
ESC_KEY,
&mut app,
&ActiveRadarrBlock::DeleteRootFolderPrompt,
&None,
ActiveRadarrBlock::DeleteRootFolderPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::RootFolders.into()
ActiveRadarrBlock::RootFolders.into()
);
assert!(!app.data.radarr_data.prompt_confirm);
}
@@ -516,16 +501,16 @@ mod tests {
app.should_ignore_quit_key = true;
RootFoldersHandler::with(
&ESC_KEY,
ESC_KEY,
&mut app,
&ActiveRadarrBlock::AddRootFolderPrompt,
&None,
ActiveRadarrBlock::AddRootFolderPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::RootFolders.into()
ActiveRadarrBlock::RootFolders.into()
);
assert!(app.data.radarr_data.edit_root_folder.is_none());
@@ -541,11 +526,11 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
RootFoldersHandler::with(&ESC_KEY, &mut app, &ActiveRadarrBlock::RootFolders, &None).handle();
RootFoldersHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::RootFolders, None).handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::RootFolders.into()
ActiveRadarrBlock::RootFolders.into()
);
assert!(app.error.text.is_empty());
}
@@ -568,16 +553,16 @@ mod tests {
.set_items(vec![RootFolder::default()]);
RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.add.key,
DEFAULT_KEYBINDINGS.add.key,
&mut app,
&ActiveRadarrBlock::RootFolders,
&None,
ActiveRadarrBlock::RootFolders,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AddRootFolderPrompt.into()
ActiveRadarrBlock::AddRootFolderPrompt.into()
);
assert!(app.should_ignore_quit_key);
assert!(app.data.radarr_data.edit_root_folder.is_some());
@@ -595,16 +580,16 @@ mod tests {
.set_items(vec![RootFolder::default()]);
RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.add.key,
DEFAULT_KEYBINDINGS.add.key,
&mut app,
&ActiveRadarrBlock::RootFolders,
&None,
ActiveRadarrBlock::RootFolders,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::RootFolders.into()
ActiveRadarrBlock::RootFolders.into()
);
assert!(!app.should_ignore_quit_key);
assert!(app.data.radarr_data.edit_root_folder.is_none());
@@ -621,16 +606,16 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.refresh.key,
DEFAULT_KEYBINDINGS.refresh.key,
&mut app,
&ActiveRadarrBlock::RootFolders,
&None,
ActiveRadarrBlock::RootFolders,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::RootFolders.into()
ActiveRadarrBlock::RootFolders.into()
);
assert!(app.should_refresh);
}
@@ -647,16 +632,16 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::RootFolders.into());
RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.refresh.key,
DEFAULT_KEYBINDINGS.refresh.key,
&mut app,
&ActiveRadarrBlock::RootFolders,
&None,
ActiveRadarrBlock::RootFolders,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::RootFolders.into()
ActiveRadarrBlock::RootFolders.into()
);
assert!(!app.should_refresh);
}
@@ -672,10 +657,10 @@ mod tests {
app.data.radarr_data.edit_root_folder = Some("/nfs/test".into());
RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
&ActiveRadarrBlock::AddRootFolderPrompt,
&None,
ActiveRadarrBlock::AddRootFolderPrompt,
None,
)
.handle();
@@ -696,10 +681,10 @@ mod tests {
app.data.radarr_data.edit_root_folder = Some(HorizontallyScrollableText::default());
RootFoldersHandler::with(
&Key::Char('h'),
Key::Char('h'),
&mut app,
&ActiveRadarrBlock::AddRootFolderPrompt,
&None,
ActiveRadarrBlock::AddRootFolderPrompt,
None,
)
.handle();
@@ -721,10 +706,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::DeleteRootFolderPrompt.into());
RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.confirm.key,
DEFAULT_KEYBINDINGS.confirm.key,
&mut app,
&ActiveRadarrBlock::DeleteRootFolderPrompt,
&None,
ActiveRadarrBlock::DeleteRootFolderPrompt,
None,
)
.handle();
@@ -735,7 +720,7 @@ mod tests {
);
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::RootFolders.into()
ActiveRadarrBlock::RootFolders.into()
);
}
}
@@ -744,9 +729,9 @@ mod tests {
fn test_root_folders_handler_accepts() {
ActiveRadarrBlock::iter().for_each(|active_radarr_block| {
if ROOT_FOLDERS_BLOCKS.contains(&active_radarr_block) {
assert!(RootFoldersHandler::accepts(&active_radarr_block));
assert!(RootFoldersHandler::accepts(active_radarr_block));
} else {
assert!(!RootFoldersHandler::accepts(&active_radarr_block));
assert!(!RootFoldersHandler::accepts(active_radarr_block));
}
})
}
@@ -757,10 +742,10 @@ mod tests {
app.is_loading = true;
let handler = RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::RootFolders,
&None,
ActiveRadarrBlock::RootFolders,
None,
);
assert!(!handler.is_ready());
@@ -772,10 +757,10 @@ mod tests {
app.is_loading = false;
let handler = RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::RootFolders,
&None,
ActiveRadarrBlock::RootFolders,
None,
);
assert!(!handler.is_ready());
@@ -792,10 +777,10 @@ mod tests {
.root_folders
.set_items(vec![RootFolder::default()]);
let handler = RootFoldersHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::RootFolders,
&None,
ActiveRadarrBlock::RootFolders,
None,
);
assert!(handler.is_ready());