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/indexers/edit_indexer_handler.rs
+15 -15
View File
@@ -11,22 +11,22 @@ use crate::{handle_text_box_keys, handle_text_box_left_right_keys};
mod edit_indexer_handler_tests;
pub(super) struct EditIndexerHandler<'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 EditIndexerHandler<'a, 'b> {
fn accepts(active_block: &'a ActiveRadarrBlock) -> bool {
EDIT_INDEXER_BLOCKS.contains(active_block)
fn accepts(active_block: ActiveRadarrBlock) -> bool {
EDIT_INDEXER_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>,
) -> EditIndexerHandler<'a, 'b> {
EditIndexerHandler {
key,
@@ -36,7 +36,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditIndexerHandler<'
}
}
fn get_key(&self) -> &Key {
fn get_key(&self) -> Key {
self.key
}
@@ -45,13 +45,13 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditIndexerHandler<'
}
fn handle_scroll_up(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::EditIndexerPrompt {
if self.active_radarr_block == ActiveRadarrBlock::EditIndexerPrompt {
self.app.data.radarr_data.selected_block.previous();
}
}
fn handle_scroll_down(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::EditIndexerPrompt {
if self.active_radarr_block == ActiveRadarrBlock::EditIndexerPrompt {
self.app.data.radarr_data.selected_block.next();
}
}
@@ -184,7 +184,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditIndexerHandler<'
match self.active_radarr_block {
ActiveRadarrBlock::EditIndexerPrompt => {
if self.app.data.radarr_data.selected_block.get_active_block()
== &ActiveRadarrBlock::EditIndexerConfirmPrompt
== ActiveRadarrBlock::EditIndexerConfirmPrompt
{
handle_prompt_toggle(self.app, self.key);
} else {
@@ -270,7 +270,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditIndexerHandler<'
fn handle_submit(&mut self) {
match self.active_radarr_block {
ActiveRadarrBlock::EditIndexerPrompt => {
let selected_block = *self.app.data.radarr_data.selected_block.get_active_block();
let selected_block = self.app.data.radarr_data.selected_block.get_active_block();
match selected_block {
ActiveRadarrBlock::EditIndexerConfirmPrompt => {
let radarr_data = &mut self.app.data.radarr_data;
@@ -431,8 +431,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for EditIndexerHandler<'
}
ActiveRadarrBlock::EditIndexerPrompt => {
if self.app.data.radarr_data.selected_block.get_active_block()
== &ActiveRadarrBlock::EditIndexerConfirmPrompt
&& *self.key == DEFAULT_KEYBINDINGS.confirm.key
== ActiveRadarrBlock::EditIndexerConfirmPrompt
&& self.key == DEFAULT_KEYBINDINGS.confirm.key
{
self.app.data.radarr_data.prompt_confirm = true;
self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::EditIndexer(None));
src/handlers/radarr_handlers/indexers/edit_indexer_handler_tests.rs
+193 -203
View File
@@ -28,18 +28,17 @@ mod tests {
BlockSelectionState::new(&EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
app.data.radarr_data.selected_block.next();
EditIndexerHandler::with(&key, &mut app, &ActiveRadarrBlock::EditIndexerPrompt, &None)
.handle();
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
if key == Key::Up {
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&ActiveRadarrBlock::EditIndexerNameInput
ActiveRadarrBlock::EditIndexerNameInput
);
} else {
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&ActiveRadarrBlock::EditIndexerToggleEnableAutomaticSearch
ActiveRadarrBlock::EditIndexerToggleEnableAutomaticSearch
);
}
}
@@ -55,12 +54,11 @@ mod tests {
BlockSelectionState::new(&EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
app.data.radarr_data.selected_block.next();
EditIndexerHandler::with(&key, &mut app, &ActiveRadarrBlock::EditIndexerPrompt, &None)
.handle();
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&ActiveRadarrBlock::EditIndexerToggleEnableRss
ActiveRadarrBlock::EditIndexerToggleEnableRss
);
}
}
@@ -83,10 +81,10 @@ mod tests {
});
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::EditIndexerNameInput,
&None,
ActiveRadarrBlock::EditIndexerNameInput,
None,
)
.handle();
@@ -104,10 +102,10 @@ mod tests {
);
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::EditIndexerNameInput,
&None,
ActiveRadarrBlock::EditIndexerNameInput,
None,
)
.handle();
@@ -134,10 +132,10 @@ mod tests {
});
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::EditIndexerUrlInput,
&None,
ActiveRadarrBlock::EditIndexerUrlInput,
None,
)
.handle();
@@ -155,10 +153,10 @@ mod tests {
);
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::EditIndexerUrlInput,
&None,
ActiveRadarrBlock::EditIndexerUrlInput,
None,
)
.handle();
@@ -185,10 +183,10 @@ mod tests {
});
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::EditIndexerApiKeyInput,
&None,
ActiveRadarrBlock::EditIndexerApiKeyInput,
None,
)
.handle();
@@ -206,10 +204,10 @@ mod tests {
);
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::EditIndexerApiKeyInput,
&None,
ActiveRadarrBlock::EditIndexerApiKeyInput,
None,
)
.handle();
@@ -236,10 +234,10 @@ mod tests {
});
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::EditIndexerSeedRatioInput,
&None,
ActiveRadarrBlock::EditIndexerSeedRatioInput,
None,
)
.handle();
@@ -257,10 +255,10 @@ mod tests {
);
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::EditIndexerSeedRatioInput,
&None,
ActiveRadarrBlock::EditIndexerSeedRatioInput,
None,
)
.handle();
@@ -287,10 +285,10 @@ mod tests {
});
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::EditIndexerTagsInput,
&None,
ActiveRadarrBlock::EditIndexerTagsInput,
None,
)
.handle();
@@ -308,10 +306,10 @@ mod tests {
);
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::EditIndexerTagsInput,
&None,
ActiveRadarrBlock::EditIndexerTagsInput,
None,
)
.handle();
@@ -351,13 +349,11 @@ mod tests {
BlockSelectionState::new(&EDIT_INDEXER_TORRENT_SELECTION_BLOCKS);
app.data.radarr_data.selected_block.index = EDIT_INDEXER_TORRENT_SELECTION_BLOCKS.len() - 1;
EditIndexerHandler::with(&key, &mut app, &ActiveRadarrBlock::EditIndexerPrompt, &None)
.handle();
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert!(app.data.radarr_data.prompt_confirm);
EditIndexerHandler::with(&key, &mut app, &ActiveRadarrBlock::EditIndexerPrompt, &None)
.handle();
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert!(!app.data.radarr_data.prompt_confirm);
}
@@ -396,23 +392,21 @@ mod tests {
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&left_block
left_block
);
EditIndexerHandler::with(&key, &mut app, &ActiveRadarrBlock::EditIndexerPrompt, &None)
.handle();
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&right_block
right_block
);
EditIndexerHandler::with(&key, &mut app, &ActiveRadarrBlock::EditIndexerPrompt, &None)
.handle();
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&left_block
left_block
);
}
@@ -445,23 +439,21 @@ mod tests {
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&left_block
left_block
);
EditIndexerHandler::with(&key, &mut app, &ActiveRadarrBlock::EditIndexerPrompt, &None)
.handle();
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&right_block
right_block
);
EditIndexerHandler::with(&key, &mut app, &ActiveRadarrBlock::EditIndexerPrompt, &None)
.handle();
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&left_block
left_block
);
}
@@ -477,23 +469,21 @@ mod tests {
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&ActiveRadarrBlock::EditIndexerToggleEnableInteractiveSearch
ActiveRadarrBlock::EditIndexerToggleEnableInteractiveSearch
);
EditIndexerHandler::with(&key, &mut app, &ActiveRadarrBlock::EditIndexerPrompt, &None)
.handle();
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&ActiveRadarrBlock::EditIndexerConfirmPrompt
ActiveRadarrBlock::EditIndexerConfirmPrompt
);
EditIndexerHandler::with(&key, &mut app, &ActiveRadarrBlock::EditIndexerPrompt, &None)
.handle();
EditIndexerHandler::with(key, &mut app, ActiveRadarrBlock::EditIndexerPrompt, None).handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&ActiveRadarrBlock::EditIndexerConfirmPrompt
ActiveRadarrBlock::EditIndexerConfirmPrompt
);
assert!(app.data.radarr_data.prompt_confirm);
}
@@ -507,10 +497,10 @@ mod tests {
});
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
DEFAULT_KEYBINDINGS.left.key,
&mut app,
&ActiveRadarrBlock::EditIndexerNameInput,
&None,
ActiveRadarrBlock::EditIndexerNameInput,
None,
)
.handle();
@@ -528,10 +518,10 @@ mod tests {
);
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
DEFAULT_KEYBINDINGS.right.key,
&mut app,
&ActiveRadarrBlock::EditIndexerNameInput,
&None,
ActiveRadarrBlock::EditIndexerNameInput,
None,
)
.handle();
@@ -558,10 +548,10 @@ mod tests {
});
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
DEFAULT_KEYBINDINGS.left.key,
&mut app,
&ActiveRadarrBlock::EditIndexerUrlInput,
&None,
ActiveRadarrBlock::EditIndexerUrlInput,
None,
)
.handle();
@@ -579,10 +569,10 @@ mod tests {
);
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
DEFAULT_KEYBINDINGS.right.key,
&mut app,
&ActiveRadarrBlock::EditIndexerUrlInput,
&None,
ActiveRadarrBlock::EditIndexerUrlInput,
None,
)
.handle();
@@ -609,10 +599,10 @@ mod tests {
});
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
DEFAULT_KEYBINDINGS.left.key,
&mut app,
&ActiveRadarrBlock::EditIndexerApiKeyInput,
&None,
ActiveRadarrBlock::EditIndexerApiKeyInput,
None,
)
.handle();
@@ -630,10 +620,10 @@ mod tests {
);
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
DEFAULT_KEYBINDINGS.right.key,
&mut app,
&ActiveRadarrBlock::EditIndexerApiKeyInput,
&None,
ActiveRadarrBlock::EditIndexerApiKeyInput,
None,
)
.handle();
@@ -660,10 +650,10 @@ mod tests {
});
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
DEFAULT_KEYBINDINGS.left.key,
&mut app,
&ActiveRadarrBlock::EditIndexerSeedRatioInput,
&None,
ActiveRadarrBlock::EditIndexerSeedRatioInput,
None,
)
.handle();
@@ -681,10 +671,10 @@ mod tests {
);
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
DEFAULT_KEYBINDINGS.right.key,
&mut app,
&ActiveRadarrBlock::EditIndexerSeedRatioInput,
&None,
ActiveRadarrBlock::EditIndexerSeedRatioInput,
None,
)
.handle();
@@ -711,10 +701,10 @@ mod tests {
});
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
DEFAULT_KEYBINDINGS.left.key,
&mut app,
&ActiveRadarrBlock::EditIndexerTagsInput,
&None,
ActiveRadarrBlock::EditIndexerTagsInput,
None,
)
.handle();
@@ -732,10 +722,10 @@ mod tests {
);
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
DEFAULT_KEYBINDINGS.right.key,
&mut app,
&ActiveRadarrBlock::EditIndexerTagsInput,
&None,
ActiveRadarrBlock::EditIndexerTagsInput,
None,
)
.handle();
@@ -784,14 +774,14 @@ mod tests {
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerPrompt,
&None,
ActiveRadarrBlock::EditIndexerPrompt,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
assert!(!app.should_refresh);
assert_eq!(app.data.radarr_data.edit_indexer_modal, None);
@@ -813,14 +803,14 @@ mod tests {
app.data.radarr_data.prompt_confirm = true;
EditIndexerHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerPrompt,
&None,
ActiveRadarrBlock::EditIndexerPrompt,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert!(app.data.radarr_data.edit_indexer_modal.is_some());
assert!(app.should_refresh);
assert_eq!(
@@ -839,16 +829,16 @@ mod tests {
app.data.radarr_data.prompt_confirm = true;
EditIndexerHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerPrompt,
&None,
ActiveRadarrBlock::EditIndexerPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditIndexerPrompt.into()
ActiveRadarrBlock::EditIndexerPrompt.into()
);
assert!(app.data.radarr_data.edit_indexer_modal.is_some());
assert!(!app.should_refresh);
@@ -877,14 +867,14 @@ mod tests {
.set_index(starting_index);
EditIndexerHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerPrompt,
&None,
ActiveRadarrBlock::EditIndexerPrompt,
None,
)
.handle();
assert_eq!(app.get_current_route(), &block.into());
assert_eq!(app.get_current_route(), block.into());
assert!(app.should_ignore_quit_key);
}
@@ -898,16 +888,16 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
EditIndexerHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerPrompt,
&None,
ActiveRadarrBlock::EditIndexerPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditIndexerPrompt.into()
ActiveRadarrBlock::EditIndexerPrompt.into()
);
assert!(app
.data
@@ -919,16 +909,16 @@ mod tests {
.unwrap());
EditIndexerHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerPrompt,
&None,
ActiveRadarrBlock::EditIndexerPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditIndexerPrompt.into()
ActiveRadarrBlock::EditIndexerPrompt.into()
);
assert!(!app
.data
@@ -950,16 +940,16 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
EditIndexerHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerPrompt,
&None,
ActiveRadarrBlock::EditIndexerPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditIndexerPrompt.into()
ActiveRadarrBlock::EditIndexerPrompt.into()
);
assert!(app
.data
@@ -971,16 +961,16 @@ mod tests {
.unwrap());
EditIndexerHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerPrompt,
&None,
ActiveRadarrBlock::EditIndexerPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditIndexerPrompt.into()
ActiveRadarrBlock::EditIndexerPrompt.into()
);
assert!(!app
.data
@@ -1002,16 +992,16 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerPrompt.into());
EditIndexerHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerPrompt,
&None,
ActiveRadarrBlock::EditIndexerPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditIndexerPrompt.into()
ActiveRadarrBlock::EditIndexerPrompt.into()
);
assert!(app
.data
@@ -1023,16 +1013,16 @@ mod tests {
.unwrap());
EditIndexerHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerPrompt,
&None,
ActiveRadarrBlock::EditIndexerPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditIndexerPrompt.into()
ActiveRadarrBlock::EditIndexerPrompt.into()
);
assert!(!app
.data
@@ -1056,10 +1046,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerNameInput.into());
EditIndexerHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerNameInput,
&None,
ActiveRadarrBlock::EditIndexerNameInput,
None,
)
.handle();
@@ -1075,7 +1065,7 @@ mod tests {
.is_empty());
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditIndexerPrompt.into()
ActiveRadarrBlock::EditIndexerPrompt.into()
);
}
@@ -1091,10 +1081,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerUrlInput.into());
EditIndexerHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerUrlInput,
&None,
ActiveRadarrBlock::EditIndexerUrlInput,
None,
)
.handle();
@@ -1110,7 +1100,7 @@ mod tests {
.is_empty());
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditIndexerPrompt.into()
ActiveRadarrBlock::EditIndexerPrompt.into()
);
}
@@ -1126,10 +1116,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerApiKeyInput.into());
EditIndexerHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerApiKeyInput,
&None,
ActiveRadarrBlock::EditIndexerApiKeyInput,
None,
)
.handle();
@@ -1145,7 +1135,7 @@ mod tests {
.is_empty());
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditIndexerPrompt.into()
ActiveRadarrBlock::EditIndexerPrompt.into()
);
}
@@ -1161,10 +1151,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerSeedRatioInput.into());
EditIndexerHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerSeedRatioInput,
&None,
ActiveRadarrBlock::EditIndexerSeedRatioInput,
None,
)
.handle();
@@ -1180,7 +1170,7 @@ mod tests {
.is_empty());
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditIndexerPrompt.into()
ActiveRadarrBlock::EditIndexerPrompt.into()
);
}
@@ -1196,10 +1186,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::EditIndexerTagsInput.into());
EditIndexerHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerTagsInput,
&None,
ActiveRadarrBlock::EditIndexerTagsInput,
None,
)
.handle();
@@ -1215,7 +1205,7 @@ mod tests {
.is_empty());
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditIndexerPrompt.into()
ActiveRadarrBlock::EditIndexerPrompt.into()
);
}
}
@@ -1239,14 +1229,14 @@ mod tests {
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
&ESC_KEY,
ESC_KEY,
&mut app,
&ActiveRadarrBlock::EditIndexerPrompt,
&None,
ActiveRadarrBlock::EditIndexerPrompt,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert!(!app.data.radarr_data.prompt_confirm);
assert_eq!(app.data.radarr_data.edit_indexer_modal, None);
}
@@ -1268,9 +1258,9 @@ mod tests {
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
app.should_ignore_quit_key = true;
EditIndexerHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
EditIndexerHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert!(!app.should_ignore_quit_key);
assert_eq!(
app.data.radarr_data.edit_indexer_modal,
@@ -1298,10 +1288,10 @@ mod tests {
});
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
&ActiveRadarrBlock::EditIndexerNameInput,
&None,
ActiveRadarrBlock::EditIndexerNameInput,
None,
)
.handle();
@@ -1327,10 +1317,10 @@ mod tests {
});
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
&ActiveRadarrBlock::EditIndexerUrlInput,
&None,
ActiveRadarrBlock::EditIndexerUrlInput,
None,
)
.handle();
@@ -1356,10 +1346,10 @@ mod tests {
});
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
&ActiveRadarrBlock::EditIndexerApiKeyInput,
&None,
ActiveRadarrBlock::EditIndexerApiKeyInput,
None,
)
.handle();
@@ -1385,10 +1375,10 @@ mod tests {
});
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
&ActiveRadarrBlock::EditIndexerSeedRatioInput,
&None,
ActiveRadarrBlock::EditIndexerSeedRatioInput,
None,
)
.handle();
@@ -1414,10 +1404,10 @@ mod tests {
});
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
&ActiveRadarrBlock::EditIndexerTagsInput,
&None,
ActiveRadarrBlock::EditIndexerTagsInput,
None,
)
.handle();
@@ -1440,10 +1430,10 @@ mod tests {
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
&Key::Char('h'),
Key::Char('h'),
&mut app,
&ActiveRadarrBlock::EditIndexerNameInput,
&None,
ActiveRadarrBlock::EditIndexerNameInput,
None,
)
.handle();
@@ -1466,10 +1456,10 @@ mod tests {
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
&Key::Char('h'),
Key::Char('h'),
&mut app,
&ActiveRadarrBlock::EditIndexerUrlInput,
&None,
ActiveRadarrBlock::EditIndexerUrlInput,
None,
)
.handle();
@@ -1492,10 +1482,10 @@ mod tests {
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
&Key::Char('h'),
Key::Char('h'),
&mut app,
&ActiveRadarrBlock::EditIndexerApiKeyInput,
&None,
ActiveRadarrBlock::EditIndexerApiKeyInput,
None,
)
.handle();
@@ -1518,10 +1508,10 @@ mod tests {
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
&Key::Char('h'),
Key::Char('h'),
&mut app,
&ActiveRadarrBlock::EditIndexerSeedRatioInput,
&None,
ActiveRadarrBlock::EditIndexerSeedRatioInput,
None,
)
.handle();
@@ -1544,10 +1534,10 @@ mod tests {
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
&Key::Char('h'),
Key::Char('h'),
&mut app,
&ActiveRadarrBlock::EditIndexerTagsInput,
&None,
ActiveRadarrBlock::EditIndexerTagsInput,
None,
)
.handle();
@@ -1579,14 +1569,14 @@ mod tests {
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.confirm.key,
DEFAULT_KEYBINDINGS.confirm.key,
&mut app,
&ActiveRadarrBlock::EditIndexerPrompt,
&None,
ActiveRadarrBlock::EditIndexerPrompt,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert!(app.data.radarr_data.edit_indexer_modal.is_some());
assert!(app.should_refresh);
assert_eq!(
@@ -1600,9 +1590,9 @@ mod tests {
fn test_indexer_settings_handler_accepts() {
ActiveRadarrBlock::iter().for_each(|active_radarr_block| {
if EDIT_INDEXER_BLOCKS.contains(&active_radarr_block) {
assert!(EditIndexerHandler::accepts(&active_radarr_block));
assert!(EditIndexerHandler::accepts(active_radarr_block));
} else {
assert!(!EditIndexerHandler::accepts(&active_radarr_block));
assert!(!EditIndexerHandler::accepts(active_radarr_block));
}
})
}
@@ -1613,10 +1603,10 @@ mod tests {
app.is_loading = true;
let handler = EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::EditIndexerPrompt,
&None,
ActiveRadarrBlock::EditIndexerPrompt,
None,
);
assert!(!handler.is_ready());
@@ -1628,10 +1618,10 @@ mod tests {
app.is_loading = false;
let handler = EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::EditIndexerPrompt,
&None,
ActiveRadarrBlock::EditIndexerPrompt,
None,
);
assert!(!handler.is_ready());
@@ -1644,10 +1634,10 @@ mod tests {
app.data.radarr_data.edit_indexer_modal = Some(EditIndexerModal::default());
let handler = EditIndexerHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::EditIndexerPrompt,
&None,
ActiveRadarrBlock::EditIndexerPrompt,
None,
);
assert!(handler.is_ready());
src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler.rs
+15 -15
View File
@@ -13,22 +13,22 @@ use crate::{handle_text_box_keys, handle_text_box_left_right_keys};
mod edit_indexer_settings_handler_tests;
pub(super) struct IndexerSettingsHandler<'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 IndexerSettingsHandler<'a, 'b> {
fn accepts(active_block: &'a ActiveRadarrBlock) -> bool {
INDEXER_SETTINGS_BLOCKS.contains(active_block)
fn accepts(active_block: ActiveRadarrBlock) -> bool {
INDEXER_SETTINGS_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>,
) -> IndexerSettingsHandler<'a, 'b> {
IndexerSettingsHandler {
key,
@@ -38,7 +38,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
}
}
fn get_key(&self) -> &Key {
fn get_key(&self) -> Key {
self.key
}
@@ -105,7 +105,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
}
fn handle_home(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput {
if self.active_radarr_block == ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput {
self
.app
.data
@@ -119,7 +119,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
}
fn handle_end(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput {
if self.active_radarr_block == ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput {
self
.app
.data
@@ -138,7 +138,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
match self.active_radarr_block {
ActiveRadarrBlock::AllIndexerSettingsPrompt => {
if self.app.data.radarr_data.selected_block.get_active_block()
== &ActiveRadarrBlock::IndexerSettingsConfirmPrompt
== ActiveRadarrBlock::IndexerSettingsConfirmPrompt
{
handle_prompt_toggle(self.app, self.key);
} else {
@@ -187,7 +187,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
| ActiveRadarrBlock::IndexerSettingsRssSyncIntervalInput => {
self.app.push_navigation_stack(
(
*self.app.data.radarr_data.selected_block.get_active_block(),
self.app.data.radarr_data.selected_block.get_active_block(),
None,
)
.into(),
@@ -258,8 +258,8 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexerSettingsHandl
}
ActiveRadarrBlock::AllIndexerSettingsPrompt => {
if self.app.data.radarr_data.selected_block.get_active_block()
== &ActiveRadarrBlock::IndexerSettingsConfirmPrompt
&& *self.key == DEFAULT_KEYBINDINGS.confirm.key
== ActiveRadarrBlock::IndexerSettingsConfirmPrompt
&& self.key == DEFAULT_KEYBINDINGS.confirm.key
{
self.app.data.radarr_data.prompt_confirm = true;
self.app.data.radarr_data.prompt_confirm_action =
src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs
+116 -116
View File
@@ -27,7 +27,7 @@ mod tests {
let mut app = App::default();
app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
IndexerSettingsHandler::with(&$key, &mut app, &$block, &None).handle();
IndexerSettingsHandler::with($key, &mut app, $block, None).handle();
if $key == Key::Up {
assert_eq!(
@@ -64,7 +64,7 @@ mod tests {
0
);
IndexerSettingsHandler::with(&Key::Up, &mut app, &$block, &None).handle();
IndexerSettingsHandler::with(Key::Up, &mut app, $block, None).handle();
assert_eq!(
app
@@ -77,7 +77,7 @@ mod tests {
1
);
IndexerSettingsHandler::with(&$key, &mut app, &$block, &None).handle();
IndexerSettingsHandler::with($key, &mut app, $block, None).handle();
assert_eq!(
app
.data
@@ -102,22 +102,22 @@ mod tests {
app.data.radarr_data.selected_block.next();
IndexerSettingsHandler::with(
&key,
key,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
if key == Key::Up {
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&ActiveRadarrBlock::IndexerSettingsMinimumAgeInput
ActiveRadarrBlock::IndexerSettingsMinimumAgeInput
);
} else {
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&ActiveRadarrBlock::IndexerSettingsMaximumSizeInput
ActiveRadarrBlock::IndexerSettingsMaximumSizeInput
);
}
}
@@ -134,16 +134,16 @@ mod tests {
app.data.radarr_data.selected_block.next();
IndexerSettingsHandler::with(
&key,
key,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&ActiveRadarrBlock::IndexerSettingsRetentionInput
ActiveRadarrBlock::IndexerSettingsRetentionInput
);
}
@@ -218,10 +218,10 @@ mod tests {
});
IndexerSettingsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
&None,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
None,
)
.handle();
@@ -239,10 +239,10 @@ mod tests {
);
IndexerSettingsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
&None,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
None,
)
.handle();
@@ -280,20 +280,20 @@ mod tests {
app.data.radarr_data.selected_block.index = INDEXER_SETTINGS_SELECTION_BLOCKS.len() - 1;
IndexerSettingsHandler::with(
&key,
key,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert!(app.data.radarr_data.prompt_confirm);
IndexerSettingsHandler::with(
&key,
key,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
@@ -334,33 +334,33 @@ mod tests {
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&left_block
left_block
);
IndexerSettingsHandler::with(
&key,
key,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&right_block
right_block
);
IndexerSettingsHandler::with(
&key,
key,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert_eq!(
app.data.radarr_data.selected_block.get_active_block(),
&left_block
left_block
);
}
@@ -373,10 +373,10 @@ mod tests {
});
IndexerSettingsHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
DEFAULT_KEYBINDINGS.left.key,
&mut app,
&ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
&None,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
None,
)
.handle();
@@ -394,10 +394,10 @@ mod tests {
);
IndexerSettingsHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
DEFAULT_KEYBINDINGS.right.key,
&mut app,
&ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
&None,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
None,
)
.handle();
@@ -447,14 +447,14 @@ mod tests {
app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
IndexerSettingsHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
assert!(!app.should_refresh);
assert_eq!(app.data.radarr_data.indexer_settings, None);
@@ -476,14 +476,14 @@ mod tests {
app.data.radarr_data.prompt_confirm = true;
IndexerSettingsHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert_eq!(
app.data.radarr_data.prompt_confirm_action,
Some(RadarrEvent::EditAllIndexerSettings(None))
@@ -502,16 +502,16 @@ mod tests {
app.data.radarr_data.prompt_confirm = true;
IndexerSettingsHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
);
assert!(!app.should_refresh);
}
@@ -534,14 +534,14 @@ mod tests {
app.data.radarr_data.selected_block.set_index(index);
IndexerSettingsHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert_eq!(app.get_current_route(), &selected_block.into());
assert_eq!(app.get_current_route(), selected_block.into());
}
#[rstest]
@@ -557,16 +557,16 @@ mod tests {
app.data.radarr_data.selected_block.set_index(index);
IndexerSettingsHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
);
}
@@ -580,16 +580,16 @@ mod tests {
app.data.radarr_data.selected_block.set_index(7);
IndexerSettingsHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput.into()
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput.into()
);
assert!(app.should_ignore_quit_key);
}
@@ -604,16 +604,16 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
IndexerSettingsHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
);
assert!(
app
@@ -626,16 +626,16 @@ mod tests {
);
IndexerSettingsHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
);
assert!(
!app
@@ -658,16 +658,16 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
IndexerSettingsHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
);
assert!(
app
@@ -680,16 +680,16 @@ mod tests {
);
IndexerSettingsHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
);
assert!(
!app
@@ -716,10 +716,10 @@ mod tests {
);
IndexerSettingsHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
&None,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
None,
)
.handle();
@@ -735,7 +735,7 @@ mod tests {
.is_empty());
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
);
}
@@ -755,11 +755,11 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
app.push_navigation_stack(active_radarr_block.into());
IndexerSettingsHandler::with(&SUBMIT_KEY, &mut app, &active_radarr_block, &None).handle();
IndexerSettingsHandler::with(SUBMIT_KEY, &mut app, active_radarr_block, None).handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
);
}
}
@@ -783,14 +783,14 @@ mod tests {
app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
IndexerSettingsHandler::with(
&ESC_KEY,
ESC_KEY,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert!(!app.data.radarr_data.prompt_confirm);
assert_eq!(app.data.radarr_data.indexer_settings, None);
}
@@ -806,14 +806,14 @@ mod tests {
app.should_ignore_quit_key = true;
IndexerSettingsHandler::with(
&ESC_KEY,
ESC_KEY,
&mut app,
&ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
&None,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert!(!app.should_ignore_quit_key);
assert_eq!(
app.data.radarr_data.indexer_settings,
@@ -838,9 +838,9 @@ mod tests {
app.push_navigation_stack(active_radarr_block.into());
app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
IndexerSettingsHandler::with(&ESC_KEY, &mut app, &active_radarr_block, &None).handle();
IndexerSettingsHandler::with(ESC_KEY, &mut app, active_radarr_block, None).handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert_eq!(
app.data.radarr_data.indexer_settings,
Some(IndexerSettings::default())
@@ -870,10 +870,10 @@ mod tests {
});
IndexerSettingsHandler::with(
&DEFAULT_KEYBINDINGS.backspace.key,
DEFAULT_KEYBINDINGS.backspace.key,
&mut app,
&ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
&None,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
None,
)
.handle();
@@ -896,10 +896,10 @@ mod tests {
app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
IndexerSettingsHandler::with(
&Key::Char('h'),
Key::Char('h'),
&mut app,
&ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
&None,
ActiveRadarrBlock::IndexerSettingsWhitelistedSubtitleTagsInput,
None,
)
.handle();
@@ -931,14 +931,14 @@ mod tests {
app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
IndexerSettingsHandler::with(
&DEFAULT_KEYBINDINGS.confirm.key,
DEFAULT_KEYBINDINGS.confirm.key,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert_eq!(
app.data.radarr_data.prompt_confirm_action,
Some(RadarrEvent::EditAllIndexerSettings(None))
@@ -952,9 +952,9 @@ mod tests {
fn test_indexer_settings_handler_accepts() {
ActiveRadarrBlock::iter().for_each(|active_radarr_block| {
if INDEXER_SETTINGS_BLOCKS.contains(&active_radarr_block) {
assert!(IndexerSettingsHandler::accepts(&active_radarr_block));
assert!(IndexerSettingsHandler::accepts(active_radarr_block));
} else {
assert!(!IndexerSettingsHandler::accepts(&active_radarr_block));
assert!(!IndexerSettingsHandler::accepts(active_radarr_block));
}
})
}
@@ -965,10 +965,10 @@ mod tests {
app.is_loading = true;
let handler = IndexerSettingsHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
);
assert!(!handler.is_ready());
@@ -980,10 +980,10 @@ mod tests {
app.is_loading = false;
let handler = IndexerSettingsHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
);
assert!(!handler.is_ready());
@@ -996,10 +996,10 @@ mod tests {
app.data.radarr_data.indexer_settings = Some(IndexerSettings::default());
let handler = IndexerSettingsHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::AllIndexerSettingsPrompt,
&None,
ActiveRadarrBlock::AllIndexerSettingsPrompt,
None,
);
assert!(handler.is_ready());
src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs
+99 -111
View File
@@ -47,14 +47,14 @@ mod tests {
.indexers
.set_items(simple_stateful_iterable_vec!(Indexer, String, protocol));
IndexersHandler::with(&key, &mut app, &ActiveRadarrBlock::Indexers, &None).handle();
IndexersHandler::with(key, &mut app, ActiveRadarrBlock::Indexers, None).handle();
assert_str_eq!(
app.data.radarr_data.indexers.current_selection().protocol,
"Test 1"
);
IndexersHandler::with(&key, &mut app, &ActiveRadarrBlock::Indexers, &None).handle();
IndexersHandler::with(key, &mut app, ActiveRadarrBlock::Indexers, None).handle();
assert_str_eq!(
app.data.radarr_data.indexers.current_selection().protocol,
@@ -89,10 +89,10 @@ mod tests {
.set_items(extended_stateful_iterable_vec!(Indexer, String, protocol));
IndexersHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
)
.handle();
@@ -102,10 +102,10 @@ mod tests {
);
IndexersHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
)
.handle();
@@ -132,11 +132,11 @@ mod tests {
.indexers
.set_items(vec![Indexer::default()]);
IndexersHandler::with(&DELETE_KEY, &mut app, &ActiveRadarrBlock::Indexers, &None).handle();
IndexersHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::DeleteIndexerPrompt.into()
ActiveRadarrBlock::DeleteIndexerPrompt.into()
);
}
@@ -151,9 +151,9 @@ mod tests {
.indexers
.set_items(vec![Indexer::default()]);
IndexersHandler::with(&DELETE_KEY, &mut app, &ActiveRadarrBlock::Indexers, &None).handle();
IndexersHandler::with(DELETE_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
}
}
@@ -170,20 +170,20 @@ mod tests {
app.data.radarr_data.main_tabs.set_index(5);
IndexersHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
DEFAULT_KEYBINDINGS.left.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
)
.handle();
assert_eq!(
app.data.radarr_data.main_tabs.get_active_route(),
&ActiveRadarrBlock::RootFolders.into()
ActiveRadarrBlock::RootFolders.into()
);
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::RootFolders.into()
ActiveRadarrBlock::RootFolders.into()
);
}
@@ -194,18 +194,18 @@ mod tests {
app.data.radarr_data.main_tabs.set_index(5);
IndexersHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
DEFAULT_KEYBINDINGS.right.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
)
.handle();
assert_eq!(
app.data.radarr_data.main_tabs.get_active_route(),
&ActiveRadarrBlock::System.into()
ActiveRadarrBlock::System.into()
);
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::System.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::System.into());
}
#[rstest]
@@ -214,23 +214,11 @@ mod tests {
) {
let mut app = App::default();
IndexersHandler::with(
&key,
&mut app,
&ActiveRadarrBlock::DeleteIndexerPrompt,
&None,
)
.handle();
IndexersHandler::with(key, &mut app, ActiveRadarrBlock::DeleteIndexerPrompt, None).handle();
assert!(app.data.radarr_data.prompt_confirm);
IndexersHandler::with(
&key,
&mut app,
&ActiveRadarrBlock::DeleteIndexerPrompt,
&None,
)
.handle();
IndexersHandler::with(key, &mut app, ActiveRadarrBlock::DeleteIndexerPrompt, None).handle();
assert!(!app.data.radarr_data.prompt_confirm);
}
@@ -306,11 +294,11 @@ mod tests {
radarr_data.indexers.set_items(vec![indexer]);
app.data.radarr_data = radarr_data;
IndexersHandler::with(&SUBMIT_KEY, &mut app, &ActiveRadarrBlock::Indexers, &None).handle();
IndexersHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::EditIndexerPrompt.into()
ActiveRadarrBlock::EditIndexerPrompt.into()
);
assert_eq!(
app.data.radarr_data.edit_indexer_modal,
@@ -344,9 +332,9 @@ mod tests {
.indexers
.set_items(vec![Indexer::default()]);
IndexersHandler::with(&SUBMIT_KEY, &mut app, &ActiveRadarrBlock::Indexers, &None).handle();
IndexersHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert_eq!(app.data.radarr_data.edit_indexer_modal, None);
}
@@ -363,10 +351,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into());
IndexersHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::DeleteIndexerPrompt,
&None,
ActiveRadarrBlock::DeleteIndexerPrompt,
None,
)
.handle();
@@ -375,7 +363,7 @@ mod tests {
app.data.radarr_data.prompt_confirm_action,
Some(RadarrEvent::DeleteIndexer(None))
);
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
}
#[test]
@@ -390,16 +378,16 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into());
IndexersHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::DeleteIndexerPrompt,
&None,
ActiveRadarrBlock::DeleteIndexerPrompt,
None,
)
.handle();
assert!(!app.data.radarr_data.prompt_confirm);
assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
}
}
@@ -419,14 +407,14 @@ mod tests {
app.data.radarr_data.prompt_confirm = true;
IndexersHandler::with(
&ESC_KEY,
ESC_KEY,
&mut app,
&ActiveRadarrBlock::DeleteIndexerPrompt,
&None,
ActiveRadarrBlock::DeleteIndexerPrompt,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert!(!app.data.radarr_data.prompt_confirm);
}
@@ -438,9 +426,9 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
app.push_navigation_stack(ActiveRadarrBlock::TestIndexer.into());
IndexersHandler::with(&ESC_KEY, &mut app, &ActiveRadarrBlock::TestIndexer, &None).handle();
IndexersHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::TestIndexer, None).handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert_eq!(app.data.radarr_data.indexer_test_error, None);
}
@@ -452,9 +440,9 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
IndexersHandler::with(&ESC_KEY, &mut app, &ActiveRadarrBlock::Indexers, &None).handle();
IndexersHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::Indexers, None).handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert!(app.error.text.is_empty());
}
}
@@ -479,16 +467,16 @@ mod tests {
.set_items(vec![Indexer::default()]);
IndexersHandler::with(
&DEFAULT_KEYBINDINGS.add.key,
DEFAULT_KEYBINDINGS.add.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AddIndexer.into()
ActiveRadarrBlock::AddIndexer.into()
);
}
@@ -504,14 +492,14 @@ mod tests {
.set_items(vec![Indexer::default()]);
IndexersHandler::with(
&DEFAULT_KEYBINDINGS.add.key,
DEFAULT_KEYBINDINGS.add.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
}
#[test]
@@ -525,14 +513,14 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
IndexersHandler::with(
&DEFAULT_KEYBINDINGS.refresh.key,
DEFAULT_KEYBINDINGS.refresh.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert!(app.should_refresh);
}
@@ -548,14 +536,14 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::Indexers.into());
IndexersHandler::with(
&DEFAULT_KEYBINDINGS.refresh.key,
DEFAULT_KEYBINDINGS.refresh.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert!(!app.should_refresh);
}
@@ -569,16 +557,16 @@ mod tests {
.set_items(vec![Indexer::default()]);
IndexersHandler::with(
&DEFAULT_KEYBINDINGS.settings.key,
DEFAULT_KEYBINDINGS.settings.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
ActiveRadarrBlock::AllIndexerSettingsPrompt.into()
);
assert_eq!(
app.data.radarr_data.selected_block.blocks,
@@ -598,14 +586,14 @@ mod tests {
.set_items(vec![Indexer::default()]);
IndexersHandler::with(
&DEFAULT_KEYBINDINGS.settings.key,
DEFAULT_KEYBINDINGS.settings.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
}
#[test]
@@ -618,16 +606,16 @@ mod tests {
.set_items(vec![Indexer::default()]);
IndexersHandler::with(
&DEFAULT_KEYBINDINGS.test.key,
DEFAULT_KEYBINDINGS.test.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::TestIndexer.into()
ActiveRadarrBlock::TestIndexer.into()
);
}
@@ -643,14 +631,14 @@ mod tests {
.set_items(vec![Indexer::default()]);
IndexersHandler::with(
&DEFAULT_KEYBINDINGS.test.key,
DEFAULT_KEYBINDINGS.test.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
}
#[test]
@@ -663,16 +651,16 @@ mod tests {
.set_items(vec![Indexer::default()]);
IndexersHandler::with(
&DEFAULT_KEYBINDINGS.test_all.key,
DEFAULT_KEYBINDINGS.test_all.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::TestAllIndexers.into()
ActiveRadarrBlock::TestAllIndexers.into()
);
}
@@ -688,14 +676,14 @@ mod tests {
.set_items(vec![Indexer::default()]);
IndexersHandler::with(
&DEFAULT_KEYBINDINGS.test_all.key,
DEFAULT_KEYBINDINGS.test_all.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
}
#[test]
@@ -710,10 +698,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into());
IndexersHandler::with(
&DEFAULT_KEYBINDINGS.confirm.key,
DEFAULT_KEYBINDINGS.confirm.key,
&mut app,
&ActiveRadarrBlock::DeleteIndexerPrompt,
&None,
ActiveRadarrBlock::DeleteIndexerPrompt,
None,
)
.handle();
@@ -722,7 +710,7 @@ mod tests {
app.data.radarr_data.prompt_confirm_action,
Some(RadarrEvent::DeleteIndexer(None))
);
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
}
}
@@ -791,9 +779,9 @@ mod tests {
ActiveRadarrBlock::iter().for_each(|active_radarr_block| {
if indexers_blocks.contains(&active_radarr_block) {
assert!(IndexersHandler::accepts(&active_radarr_block));
assert!(IndexersHandler::accepts(active_radarr_block));
} else {
assert!(!IndexersHandler::accepts(&active_radarr_block));
assert!(!IndexersHandler::accepts(active_radarr_block));
}
})
}
@@ -804,10 +792,10 @@ mod tests {
app.is_loading = true;
let handler = IndexersHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
);
assert!(!handler.is_ready());
@@ -819,10 +807,10 @@ mod tests {
app.is_loading = false;
let handler = IndexersHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
);
assert!(!handler.is_ready());
@@ -839,10 +827,10 @@ mod tests {
.set_items(vec![Indexer::default()]);
let handler = IndexersHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::Indexers,
&None,
ActiveRadarrBlock::Indexers,
None,
);
assert!(handler.is_ready());
src/handlers/radarr_handlers/indexers/mod.rs
+20 -20
View File
@@ -23,10 +23,10 @@ mod test_all_indexers_handler;
mod indexers_handler_tests;
pub(super) struct IndexersHandler<'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 IndexersHandler<'a, 'b> {
@@ -48,18 +48,18 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a,
}
}
fn accepts(active_block: &'a ActiveRadarrBlock) -> bool {
fn accepts(active_block: ActiveRadarrBlock) -> bool {
EditIndexerHandler::accepts(active_block)
|| IndexerSettingsHandler::accepts(active_block)
|| TestAllIndexersHandler::accepts(active_block)
|| INDEXERS_BLOCKS.contains(active_block)
|| INDEXERS_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>,
) -> IndexersHandler<'a, 'b> {
IndexersHandler {
key,
@@ -69,7 +69,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a,
}
}
fn get_key(&self) -> &Key {
fn get_key(&self) -> Key {
self.key
}
@@ -78,31 +78,31 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a,
}
fn handle_scroll_up(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::Indexers {
if self.active_radarr_block == ActiveRadarrBlock::Indexers {
self.app.data.radarr_data.indexers.scroll_up();
}
}
fn handle_scroll_down(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::Indexers {
if self.active_radarr_block == ActiveRadarrBlock::Indexers {
self.app.data.radarr_data.indexers.scroll_down();
}
}
fn handle_home(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::Indexers {
if self.active_radarr_block == ActiveRadarrBlock::Indexers {
self.app.data.radarr_data.indexers.scroll_to_top();
}
}
fn handle_end(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::Indexers {
if self.active_radarr_block == ActiveRadarrBlock::Indexers {
self.app.data.radarr_data.indexers.scroll_to_bottom();
}
}
fn handle_delete(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::Indexers {
if self.active_radarr_block == ActiveRadarrBlock::Indexers {
self
.app
.push_navigation_stack(ActiveRadarrBlock::DeleteIndexerPrompt.into());
@@ -169,25 +169,25 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a,
let key = self.key;
match self.active_radarr_block {
ActiveRadarrBlock::Indexers => match self.key {
_ if *key == DEFAULT_KEYBINDINGS.add.key => {
_ if key == DEFAULT_KEYBINDINGS.add.key => {
self
.app
.push_navigation_stack(ActiveRadarrBlock::AddIndexer.into());
}
_ if *key == DEFAULT_KEYBINDINGS.refresh.key => {
_ if key == DEFAULT_KEYBINDINGS.refresh.key => {
self.app.should_refresh = true;
}
_ if *key == DEFAULT_KEYBINDINGS.test.key => {
_ if key == DEFAULT_KEYBINDINGS.test.key => {
self
.app
.push_navigation_stack(ActiveRadarrBlock::TestIndexer.into());
}
_ if *key == DEFAULT_KEYBINDINGS.test_all.key => {
_ if key == DEFAULT_KEYBINDINGS.test_all.key => {
self
.app
.push_navigation_stack(ActiveRadarrBlock::TestAllIndexers.into());
}
_ if *key == DEFAULT_KEYBINDINGS.settings.key => {
_ if key == DEFAULT_KEYBINDINGS.settings.key => {
self
.app
.push_navigation_stack(ActiveRadarrBlock::AllIndexerSettingsPrompt.into());
@@ -197,7 +197,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for IndexersHandler<'a,
_ => (),
},
ActiveRadarrBlock::DeleteIndexerPrompt => {
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::DeleteIndexer(None));
src/handlers/radarr_handlers/indexers/test_all_indexers_handler.rs
+14 -14
View File
@@ -9,22 +9,22 @@ use crate::models::Scrollable;
mod test_all_indexers_handler_tests;
pub(super) struct TestAllIndexersHandler<'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 TestAllIndexersHandler<'a, 'b> {
fn accepts(active_block: &'a ActiveRadarrBlock) -> bool {
active_block == &ActiveRadarrBlock::TestAllIndexers
fn accepts(active_block: ActiveRadarrBlock) -> bool {
active_block == ActiveRadarrBlock::TestAllIndexers
}
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>,
) -> TestAllIndexersHandler<'a, 'b> {
TestAllIndexersHandler {
key,
@@ -34,7 +34,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for TestAllIndexersHandl
}
}
fn get_key(&self) -> &Key {
fn get_key(&self) -> Key {
self.key
}
@@ -49,7 +49,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for TestAllIndexersHandl
}
fn handle_scroll_up(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::TestAllIndexers {
if self.active_radarr_block == ActiveRadarrBlock::TestAllIndexers {
self
.app
.data
@@ -62,7 +62,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for TestAllIndexersHandl
}
fn handle_scroll_down(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::TestAllIndexers {
if self.active_radarr_block == ActiveRadarrBlock::TestAllIndexers {
self
.app
.data
@@ -75,7 +75,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for TestAllIndexersHandl
}
fn handle_home(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::TestAllIndexers {
if self.active_radarr_block == ActiveRadarrBlock::TestAllIndexers {
self
.app
.data
@@ -88,7 +88,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for TestAllIndexersHandl
}
fn handle_end(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::TestAllIndexers {
if self.active_radarr_block == ActiveRadarrBlock::TestAllIndexers {
self
.app
.data
@@ -107,7 +107,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for TestAllIndexersHandl
fn handle_submit(&mut self) {}
fn handle_esc(&mut self) {
if self.active_radarr_block == &ActiveRadarrBlock::TestAllIndexers {
if self.active_radarr_block == ActiveRadarrBlock::TestAllIndexers {
self.app.pop_navigation_stack();
self.app.data.radarr_data.indexer_test_all_results = None;
}
src/handlers/radarr_handlers/indexers/test_all_indexers_handler_tests.rs
+34 -34
View File
@@ -33,7 +33,7 @@ mod tests {
));
app.data.radarr_data.indexer_test_all_results = Some(indexer_test_results);
TestAllIndexersHandler::with(&key, &mut app, &ActiveRadarrBlock::TestAllIndexers, &None)
TestAllIndexersHandler::with(key, &mut app, ActiveRadarrBlock::TestAllIndexers, None)
.handle();
assert_str_eq!(
@@ -48,7 +48,7 @@ mod tests {
"Test 2"
);
TestAllIndexersHandler::with(&key, &mut app, &ActiveRadarrBlock::TestAllIndexers, &None)
TestAllIndexersHandler::with(key, &mut app, ActiveRadarrBlock::TestAllIndexers, None)
.handle();
assert_str_eq!(
@@ -78,7 +78,7 @@ mod tests {
));
app.data.radarr_data.indexer_test_all_results = Some(indexer_test_results);
TestAllIndexersHandler::with(&key, &mut app, &ActiveRadarrBlock::TestAllIndexers, &None)
TestAllIndexersHandler::with(key, &mut app, ActiveRadarrBlock::TestAllIndexers, None)
.handle();
assert_str_eq!(
@@ -93,7 +93,7 @@ mod tests {
"Test 1"
);
TestAllIndexersHandler::with(&key, &mut app, &ActiveRadarrBlock::TestAllIndexers, &None)
TestAllIndexersHandler::with(key, &mut app, ActiveRadarrBlock::TestAllIndexers, None)
.handle();
assert_str_eq!(
@@ -130,10 +130,10 @@ mod tests {
app.data.radarr_data.indexer_test_all_results = Some(indexer_test_results);
TestAllIndexersHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::TestAllIndexers,
&None,
ActiveRadarrBlock::TestAllIndexers,
None,
)
.handle();
@@ -150,10 +150,10 @@ mod tests {
);
TestAllIndexersHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::TestAllIndexers,
&None,
ActiveRadarrBlock::TestAllIndexers,
None,
)
.handle();
@@ -183,10 +183,10 @@ mod tests {
app.data.radarr_data.indexer_test_all_results = Some(indexer_test_results);
TestAllIndexersHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::TestAllIndexers,
&None,
ActiveRadarrBlock::TestAllIndexers,
None,
)
.handle();
@@ -203,10 +203,10 @@ mod tests {
);
TestAllIndexersHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::TestAllIndexers,
&None,
ActiveRadarrBlock::TestAllIndexers,
None,
)
.handle();
@@ -239,14 +239,14 @@ mod tests {
app.data.radarr_data.indexer_test_all_results = Some(StatefulTable::default());
TestAllIndexersHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::TestAllIndexers,
&None,
ActiveRadarrBlock::TestAllIndexers,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::Indexers.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::Indexers.into());
assert!(!app.data.radarr_data.prompt_confirm);
assert!(app.data.radarr_data.indexer_test_all_results.is_none());
}
@@ -256,9 +256,9 @@ mod tests {
fn test_test_all_indexers_handler_accepts() {
ActiveRadarrBlock::iter().for_each(|active_radarr_block| {
if active_radarr_block == ActiveRadarrBlock::TestAllIndexers {
assert!(TestAllIndexersHandler::accepts(&active_radarr_block));
assert!(TestAllIndexersHandler::accepts(active_radarr_block));
} else {
assert!(!TestAllIndexersHandler::accepts(&active_radarr_block));
assert!(!TestAllIndexersHandler::accepts(active_radarr_block));
}
});
}
@@ -269,10 +269,10 @@ mod tests {
app.is_loading = true;
let handler = TestAllIndexersHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::TestAllIndexers,
&None,
ActiveRadarrBlock::TestAllIndexers,
None,
);
assert!(!handler.is_ready());
@@ -284,10 +284,10 @@ mod tests {
app.is_loading = false;
let handler = TestAllIndexersHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::TestAllIndexers,
&None,
ActiveRadarrBlock::TestAllIndexers,
None,
);
assert!(!handler.is_ready());
@@ -300,10 +300,10 @@ mod tests {
app.data.radarr_data.indexer_test_all_results = Some(StatefulTable::default());
let handler = TestAllIndexersHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::TestAllIndexers,
&None,
ActiveRadarrBlock::TestAllIndexers,
None,
);
assert!(!handler.is_ready());
@@ -318,10 +318,10 @@ mod tests {
app.data.radarr_data.indexer_test_all_results = Some(indexer_test_results);
let handler = TestAllIndexersHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::TestAllIndexers,
&None,
ActiveRadarrBlock::TestAllIndexers,
None,
);
assert!(handler.is_ready());