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

This commit is contained in:
2024-11-27 17:06:20 -07:00
parent 73a4129000
commit f139db07d9
86 changed files with 4075 additions and 3005 deletions
@@ -49,14 +49,14 @@ mod tests {
text
));
SystemDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::SystemLogs, &None).handle();
SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemLogs, None).handle();
assert_str_eq!(
app.data.radarr_data.log_details.current_selection().text,
"Test 1"
);
SystemDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::SystemLogs, &None).handle();
SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemLogs, None).handle();
assert_str_eq!(
app.data.radarr_data.log_details.current_selection().text,
@@ -76,14 +76,14 @@ mod tests {
.tasks
.set_items(simple_stateful_iterable_vec!(RadarrTask, String, name));
SystemDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::SystemTasks, &None).handle();
SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemTasks, None).handle();
assert_str_eq!(
app.data.radarr_data.tasks.current_selection().name,
"Test 2"
);
SystemDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::SystemTasks, &None).handle();
SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemTasks, None).handle();
assert_str_eq!(
app.data.radarr_data.tasks.current_selection().name,
@@ -104,14 +104,14 @@ mod tests {
.tasks
.set_items(simple_stateful_iterable_vec!(RadarrTask, String, name));
SystemDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::SystemTasks, &None).handle();
SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemTasks, None).handle();
assert_str_eq!(
app.data.radarr_data.tasks.current_selection().name,
"Test 1"
);
SystemDetailsHandler::with(&key, &mut app, &ActiveRadarrBlock::SystemTasks, &None).handle();
SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemTasks, None).handle();
assert_str_eq!(
app.data.radarr_data.tasks.current_selection().name,
@@ -131,26 +131,16 @@ mod tests {
.queued_events
.set_items(simple_stateful_iterable_vec!(QueueEvent, String, name));
SystemDetailsHandler::with(
&key,
&mut app,
&ActiveRadarrBlock::SystemQueuedEvents,
&None,
)
.handle();
SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, None)
.handle();
assert_str_eq!(
app.data.radarr_data.queued_events.current_selection().name,
"Test 2"
);
SystemDetailsHandler::with(
&key,
&mut app,
&ActiveRadarrBlock::SystemQueuedEvents,
&None,
)
.handle();
SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, None)
.handle();
assert_str_eq!(
app.data.radarr_data.queued_events.current_selection().name,
@@ -171,26 +161,16 @@ mod tests {
.queued_events
.set_items(simple_stateful_iterable_vec!(QueueEvent, String, name));
SystemDetailsHandler::with(
&key,
&mut app,
&ActiveRadarrBlock::SystemQueuedEvents,
&None,
)
.handle();
SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, None)
.handle();
assert_str_eq!(
app.data.radarr_data.queued_events.current_selection().name,
"Test 1"
);
SystemDetailsHandler::with(
&key,
&mut app,
&ActiveRadarrBlock::SystemQueuedEvents,
&None,
)
.handle();
SystemDetailsHandler::with(key, &mut app, ActiveRadarrBlock::SystemQueuedEvents, None)
.handle();
assert_str_eq!(
app.data.radarr_data.queued_events.current_selection().name,
@@ -204,20 +184,20 @@ mod tests {
app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.up.key,
DEFAULT_KEYBINDINGS.up.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
ActiveRadarrBlock::SystemUpdates,
None,
)
.handle();
assert_eq!(app.data.radarr_data.updates.offset, 0);
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.down.key,
DEFAULT_KEYBINDINGS.down.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
ActiveRadarrBlock::SystemUpdates,
None,
)
.handle();
@@ -231,20 +211,20 @@ mod tests {
app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.up.key,
DEFAULT_KEYBINDINGS.up.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
ActiveRadarrBlock::SystemUpdates,
None,
)
.handle();
assert_eq!(app.data.radarr_data.updates.offset, 0);
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.down.key,
DEFAULT_KEYBINDINGS.down.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
ActiveRadarrBlock::SystemUpdates,
None,
)
.handle();
@@ -283,10 +263,10 @@ mod tests {
));
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::SystemLogs,
&None,
ActiveRadarrBlock::SystemLogs,
None,
)
.handle();
@@ -296,10 +276,10 @@ mod tests {
);
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::SystemLogs,
&None,
ActiveRadarrBlock::SystemLogs,
None,
)
.handle();
@@ -321,10 +301,10 @@ mod tests {
.set_items(extended_stateful_iterable_vec!(RadarrTask, String, name));
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::SystemTasks,
&None,
ActiveRadarrBlock::SystemTasks,
None,
)
.handle();
@@ -334,10 +314,10 @@ mod tests {
);
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::SystemTasks,
&None,
ActiveRadarrBlock::SystemTasks,
None,
)
.handle();
@@ -360,10 +340,10 @@ mod tests {
.set_items(extended_stateful_iterable_vec!(RadarrTask, String, name));
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::SystemTasks,
&None,
ActiveRadarrBlock::SystemTasks,
None,
)
.handle();
@@ -373,10 +353,10 @@ mod tests {
);
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::SystemTasks,
&None,
ActiveRadarrBlock::SystemTasks,
None,
)
.handle();
@@ -398,10 +378,10 @@ mod tests {
.set_items(extended_stateful_iterable_vec!(QueueEvent, String, name));
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::SystemQueuedEvents,
&None,
ActiveRadarrBlock::SystemQueuedEvents,
None,
)
.handle();
@@ -411,10 +391,10 @@ mod tests {
);
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::SystemQueuedEvents,
&None,
ActiveRadarrBlock::SystemQueuedEvents,
None,
)
.handle();
@@ -437,10 +417,10 @@ mod tests {
.set_items(extended_stateful_iterable_vec!(QueueEvent, String, name));
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::SystemQueuedEvents,
&None,
ActiveRadarrBlock::SystemQueuedEvents,
None,
)
.handle();
@@ -450,10 +430,10 @@ mod tests {
);
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::SystemQueuedEvents,
&None,
ActiveRadarrBlock::SystemQueuedEvents,
None,
)
.handle();
@@ -469,20 +449,20 @@ mod tests {
app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
ActiveRadarrBlock::SystemUpdates,
None,
)
.handle();
assert_eq!(app.data.radarr_data.updates.offset, 1);
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
ActiveRadarrBlock::SystemUpdates,
None,
)
.handle();
@@ -496,20 +476,20 @@ mod tests {
app.data.radarr_data.updates = ScrollableText::with_string("Test 1\nTest 2".to_owned());
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.end.key,
DEFAULT_KEYBINDINGS.end.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
ActiveRadarrBlock::SystemUpdates,
None,
)
.handle();
assert_eq!(app.data.radarr_data.updates.offset, 0);
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.home.key,
DEFAULT_KEYBINDINGS.home.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
ActiveRadarrBlock::SystemUpdates,
None,
)
.handle();
@@ -534,10 +514,10 @@ mod tests {
.set_items(vec!["t1".into(), "t22".into()]);
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
DEFAULT_KEYBINDINGS.left.key,
&mut app,
&active_radarr_block,
&None,
active_radarr_block,
None,
)
.handle();
@@ -545,10 +525,10 @@ mod tests {
assert_eq!(app.data.radarr_data.log_details.items[1].to_string(), "t22");
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
DEFAULT_KEYBINDINGS.right.key,
&mut app,
&active_radarr_block,
&None,
active_radarr_block,
None,
)
.handle();
@@ -556,10 +536,10 @@ mod tests {
assert_eq!(app.data.radarr_data.log_details.items[1].to_string(), "22");
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
DEFAULT_KEYBINDINGS.right.key,
&mut app,
&active_radarr_block,
&None,
active_radarr_block,
None,
)
.handle();
@@ -567,10 +547,10 @@ mod tests {
assert_eq!(app.data.radarr_data.log_details.items[1].to_string(), "2");
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
DEFAULT_KEYBINDINGS.right.key,
&mut app,
&active_radarr_block,
&None,
active_radarr_block,
None,
)
.handle();
@@ -578,10 +558,10 @@ mod tests {
assert_eq!(app.data.radarr_data.log_details.items[1].to_string(), "");
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.right.key,
DEFAULT_KEYBINDINGS.right.key,
&mut app,
&active_radarr_block,
&None,
active_radarr_block,
None,
)
.handle();
@@ -589,10 +569,10 @@ mod tests {
assert_eq!(app.data.radarr_data.log_details.items[1].to_string(), "");
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
DEFAULT_KEYBINDINGS.left.key,
&mut app,
&active_radarr_block,
&None,
active_radarr_block,
None,
)
.handle();
@@ -600,10 +580,10 @@ mod tests {
assert_eq!(app.data.radarr_data.log_details.items[1].to_string(), "2");
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
DEFAULT_KEYBINDINGS.left.key,
&mut app,
&active_radarr_block,
&None,
active_radarr_block,
None,
)
.handle();
@@ -611,10 +591,10 @@ mod tests {
assert_eq!(app.data.radarr_data.log_details.items[1].to_string(), "22");
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.left.key,
DEFAULT_KEYBINDINGS.left.key,
&mut app,
&active_radarr_block,
&None,
active_radarr_block,
None,
)
.handle();
@@ -629,20 +609,20 @@ mod tests {
let mut app = App::default();
SystemDetailsHandler::with(
&key,
key,
&mut app,
&ActiveRadarrBlock::SystemTaskStartConfirmPrompt,
&None,
ActiveRadarrBlock::SystemTaskStartConfirmPrompt,
None,
)
.handle();
assert!(app.data.radarr_data.prompt_confirm);
SystemDetailsHandler::with(
&key,
key,
&mut app,
&ActiveRadarrBlock::SystemTaskStartConfirmPrompt,
&None,
ActiveRadarrBlock::SystemTaskStartConfirmPrompt,
None,
)
.handle();
@@ -664,17 +644,12 @@ mod tests {
let mut app = App::default();
app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned());
SystemDetailsHandler::with(
&SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::SystemTasks,
&None,
)
.handle();
SystemDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SystemTasks, None)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::SystemTaskStartConfirmPrompt.into()
ActiveRadarrBlock::SystemTaskStartConfirmPrompt.into()
);
}
@@ -685,17 +660,12 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::SystemTasks.into());
app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned());
SystemDetailsHandler::with(
&SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::SystemTasks,
&None,
)
.handle();
SystemDetailsHandler::with(SUBMIT_KEY, &mut app, ActiveRadarrBlock::SystemTasks, None)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::SystemTasks.into()
ActiveRadarrBlock::SystemTasks.into()
);
}
@@ -708,10 +678,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::SystemTaskStartConfirmPrompt.into());
SystemDetailsHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::SystemTaskStartConfirmPrompt,
&None,
ActiveRadarrBlock::SystemTaskStartConfirmPrompt,
None,
)
.handle();
@@ -722,7 +692,7 @@ mod tests {
);
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::SystemTasks.into()
ActiveRadarrBlock::SystemTasks.into()
);
}
@@ -734,10 +704,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::SystemTaskStartConfirmPrompt.into());
SystemDetailsHandler::with(
&SUBMIT_KEY,
SUBMIT_KEY,
&mut app,
&ActiveRadarrBlock::SystemTaskStartConfirmPrompt,
&None,
ActiveRadarrBlock::SystemTaskStartConfirmPrompt,
None,
)
.handle();
@@ -745,7 +715,7 @@ mod tests {
assert_eq!(app.data.radarr_data.prompt_confirm_action, None);
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::SystemTasks.into()
ActiveRadarrBlock::SystemTasks.into()
);
}
}
@@ -776,10 +746,9 @@ mod tests {
.log_details
.set_items(vec![HorizontallyScrollableText::default()]);
SystemDetailsHandler::with(&ESC_KEY, &mut app, &ActiveRadarrBlock::SystemLogs, &None)
.handle();
SystemDetailsHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::SystemLogs, None).handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::System.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::System.into());
assert!(app.data.radarr_data.log_details.items.is_empty());
}
@@ -795,10 +764,9 @@ mod tests {
.tasks
.set_items(vec![RadarrTask::default()]);
SystemDetailsHandler::with(&ESC_KEY, &mut app, &ActiveRadarrBlock::SystemTasks, &None)
.handle();
SystemDetailsHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::SystemTasks, None).handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::System.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::System.into());
}
#[rstest]
@@ -814,14 +782,14 @@ mod tests {
.set_items(vec![QueueEvent::default()]);
SystemDetailsHandler::with(
&ESC_KEY,
ESC_KEY,
&mut app,
&ActiveRadarrBlock::SystemQueuedEvents,
&None,
ActiveRadarrBlock::SystemQueuedEvents,
None,
)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::System.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::System.into());
}
#[rstest]
@@ -831,10 +799,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::System.into());
app.push_navigation_stack(ActiveRadarrBlock::SystemUpdates.into());
SystemDetailsHandler::with(&ESC_KEY, &mut app, &ActiveRadarrBlock::SystemUpdates, &None)
SystemDetailsHandler::with(ESC_KEY, &mut app, ActiveRadarrBlock::SystemUpdates, None)
.handle();
assert_eq!(app.get_current_route(), &ActiveRadarrBlock::System.into());
assert_eq!(app.get_current_route(), ActiveRadarrBlock::System.into());
}
#[test]
@@ -845,16 +813,16 @@ mod tests {
app.data.radarr_data.prompt_confirm = true;
SystemDetailsHandler::with(
&ESC_KEY,
ESC_KEY,
&mut app,
&ActiveRadarrBlock::SystemTaskStartConfirmPrompt,
&None,
ActiveRadarrBlock::SystemTaskStartConfirmPrompt,
None,
)
.handle();
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::SystemTasks.into()
ActiveRadarrBlock::SystemTasks.into()
);
assert!(!app.data.radarr_data.prompt_confirm);
}
@@ -882,14 +850,14 @@ mod tests {
app.push_navigation_stack(active_radarr_block.into());
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.refresh.key,
DEFAULT_KEYBINDINGS.refresh.key,
&mut app,
&active_radarr_block,
&None,
active_radarr_block,
None,
)
.handle();
assert_eq!(app.get_current_route(), &active_radarr_block.into());
assert_eq!(app.get_current_route(), active_radarr_block.into());
assert!(app.should_refresh);
}
@@ -909,14 +877,14 @@ mod tests {
app.push_navigation_stack(active_radarr_block.into());
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.refresh.key,
DEFAULT_KEYBINDINGS.refresh.key,
&mut app,
&active_radarr_block,
&None,
active_radarr_block,
None,
)
.handle();
assert_eq!(app.get_current_route(), &active_radarr_block.into());
assert_eq!(app.get_current_route(), active_radarr_block.into());
assert!(!app.should_refresh);
}
@@ -928,10 +896,10 @@ mod tests {
app.push_navigation_stack(ActiveRadarrBlock::SystemTaskStartConfirmPrompt.into());
SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.confirm.key,
DEFAULT_KEYBINDINGS.confirm.key,
&mut app,
&ActiveRadarrBlock::SystemTaskStartConfirmPrompt,
&None,
ActiveRadarrBlock::SystemTaskStartConfirmPrompt,
None,
)
.handle();
@@ -942,7 +910,7 @@ mod tests {
);
assert_eq!(
app.get_current_route(),
&ActiveRadarrBlock::SystemTasks.into()
ActiveRadarrBlock::SystemTasks.into()
);
}
}
@@ -951,9 +919,9 @@ mod tests {
fn test_system_details_handler_accepts() {
ActiveRadarrBlock::iter().for_each(|active_radarr_block| {
if SYSTEM_DETAILS_BLOCKS.contains(&active_radarr_block) {
assert!(SystemDetailsHandler::accepts(&active_radarr_block));
assert!(SystemDetailsHandler::accepts(active_radarr_block));
} else {
assert!(!SystemDetailsHandler::accepts(&active_radarr_block));
assert!(!SystemDetailsHandler::accepts(active_radarr_block));
}
})
}
@@ -964,10 +932,10 @@ mod tests {
app.is_loading = true;
let handler = SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
ActiveRadarrBlock::SystemUpdates,
None,
);
assert!(!handler.is_ready());
@@ -979,10 +947,10 @@ mod tests {
app.is_loading = false;
let handler = SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
ActiveRadarrBlock::SystemUpdates,
None,
);
assert!(!handler.is_ready());
@@ -999,10 +967,10 @@ mod tests {
.set_items(vec![HorizontallyScrollableText::default()]);
let handler = SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
ActiveRadarrBlock::SystemUpdates,
None,
);
assert!(handler.is_ready());
@@ -1015,10 +983,10 @@ mod tests {
app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned());
let handler = SystemDetailsHandler::with(
&DEFAULT_KEYBINDINGS.esc.key,
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
&ActiveRadarrBlock::SystemUpdates,
&None,
ActiveRadarrBlock::SystemUpdates,
None,
);
assert!(handler.is_ready());