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

fix(radarr): Pass in the task name alongside the StartTask event when publishing to the networking channel

Browse Source
This commit is contained in:
Alex Clarke
2024-12-17 21:13:47 -07:00
parent ede7f64c4b
commit 965c488468
6 changed files with 54 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/radarr/mod.rs
+1 -1
View File
@@ -231,7 +231,7 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, RadarrCommand> for RadarrCliHandler<'a, '
RadarrCommand::StartTask { task_name } => {
let resp = self
.network
.handle_network_event(RadarrEvent::StartTask(Some(task_name)).into())
.handle_network_event(RadarrEvent::StartTask(task_name).into())
.await?;
serde_json::to_string_pretty(&resp)?
}
src/cli/radarr/radarr_command_tests.rs
+1 -1
View File
@@ -394,7 +394,7 @@ mod tests {
mock_network
.expect_handle_network_event()
.with(eq::<NetworkEvent>(
RadarrEvent::StartTask(Some(expected_task_name)).into(),
RadarrEvent::StartTask(expected_task_name).into(),
))
.times(1)
.returning(|_| {
src/handlers/radarr_handlers/system/system_details_handler.rs
+9 -2
View File
@@ -2,6 +2,7 @@ use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::event::Key;
use crate::handlers::{handle_prompt_toggle, KeyEventHandler};
use crate::models::radarr_models::RadarrTaskName;
use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS};
use crate::models::stateful_list::StatefulList;
use crate::models::Scrollable;
@@ -18,6 +19,12 @@ pub(super) struct SystemDetailsHandler<'a, 'b> {
_context: Option<ActiveRadarrBlock>,
}
impl<'a, 'b> SystemDetailsHandler<'a, 'b> {
fn extract_task_name(&self) -> RadarrTaskName {
self.app.data.radarr_data.tasks.current_selection().task_name.clone()
}
}
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for SystemDetailsHandler<'a, 'b> {
fn accepts(active_block: ActiveRadarrBlock) -> bool {
SYSTEM_DETAILS_BLOCKS.contains(&active_block)
@@ -137,7 +144,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for SystemDetailsHandler
}
ActiveRadarrBlock::SystemTaskStartConfirmPrompt => {
if self.app.data.radarr_data.prompt_confirm {
self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::StartTask(None));
self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::StartTask(self.extract_task_name()));
}
self.app.pop_navigation_stack();
@@ -174,7 +181,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for SystemDetailsHandler
&& self.key == DEFAULT_KEYBINDINGS.confirm.key
{
self.app.data.radarr_data.prompt_confirm = true;
self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::StartTask(None));
self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::StartTask(self.extract_task_name()));
self.app.pop_navigation_stack();
}
}
src/handlers/radarr_handlers/system/system_details_handler_tests.rs
+33 -4
View File
@@ -1,6 +1,6 @@
#[cfg(test)]
mod tests {
use pretty_assertions::assert_str_eq;
use pretty_assertions::{assert_eq, assert_str_eq};
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
@@ -8,7 +8,7 @@ mod tests {
use crate::event::Key;
use crate::handlers::radarr_handlers::system::system_details_handler::SystemDetailsHandler;
use crate::handlers::KeyEventHandler;
use crate::models::radarr_models::RadarrTask;
use crate::models::radarr_models::{RadarrTask, RadarrTaskName};
use crate::models::servarr_data::radarr::radarr_data::{
ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS,
};
@@ -16,6 +16,7 @@ mod tests {
use crate::models::{HorizontallyScrollableText, ScrollableText};
mod test_handle_scroll_up_and_down {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::models::{HorizontallyScrollableText, ScrollableText};
@@ -236,6 +237,7 @@ mod tests {
mod test_handle_home_end {
use crate::models::{HorizontallyScrollableText, ScrollableText};
use crate::{extended_stateful_iterable_vec, test_iterable_home_and_end};
use pretty_assertions::assert_eq;
use super::*;
@@ -676,6 +678,10 @@ mod tests {
let mut app = App::default();
app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned());
app.data.radarr_data.prompt_confirm = true;
app.data.radarr_data.tasks.set_items(vec![RadarrTask {
task_name: RadarrTaskName::default(),
..RadarrTask::default()
}]);
app.push_navigation_stack(ActiveRadarrBlock::SystemTasks.into());
app.push_navigation_stack(ActiveRadarrBlock::SystemTaskStartConfirmPrompt.into());
@@ -690,7 +696,7 @@ mod tests {
assert!(app.data.radarr_data.prompt_confirm);
assert_eq!(
app.data.radarr_data.prompt_confirm_action,
Some(RadarrEvent::StartTask(None))
Some(RadarrEvent::StartTask(RadarrTaskName::default()))
);
assert_eq!(
app.get_current_route(),
@@ -831,6 +837,7 @@ mod tests {
}
mod test_handle_key_char {
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::network::radarr_network::RadarrEvent;
@@ -894,6 +901,10 @@ mod tests {
fn test_system_tasks_start_task_prompt_confirm() {
let mut app = App::default();
app.data.radarr_data.updates = ScrollableText::with_string("Test".to_owned());
app.data.radarr_data.tasks.set_items(vec![RadarrTask {
task_name: RadarrTaskName::default(),
..RadarrTask::default()
}]);
app.push_navigation_stack(ActiveRadarrBlock::SystemTasks.into());
app.push_navigation_stack(ActiveRadarrBlock::SystemTaskStartConfirmPrompt.into());
@@ -908,7 +919,7 @@ mod tests {
assert!(app.data.radarr_data.prompt_confirm);
assert_eq!(
app.data.radarr_data.prompt_confirm_action,
Some(RadarrEvent::StartTask(None))
Some(RadarrEvent::StartTask(RadarrTaskName::default()))
);
assert_eq!(
app.get_current_route(),
@@ -928,6 +939,24 @@ mod tests {
})
}
#[test]
fn test_extract_task_name() {
let mut app = App::default();
app.data.radarr_data.tasks.set_items(vec![RadarrTask {
task_name: RadarrTaskName::default(),
..RadarrTask::default()
}]);
let task_name = SystemDetailsHandler::with(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveRadarrBlock::SystemTasks,
None,
).extract_task_name();
assert_eq!(task_name, RadarrTaskName::default());
}
#[test]
fn test_system_details_handler_not_ready_when_loading() {
let mut app = App::default();
src/network/radarr_network.rs
+4 -18
View File
@@ -70,7 +70,7 @@ pub enum RadarrEvent {
GetUpdates,
HealthCheck,
SearchNewMovie(String),
StartTask(Option<RadarrTaskName>),
StartTask(RadarrTaskName),
TestIndexer(Option<i64>),
TestAllIndexers,
TriggerAutomaticSearch(Option<i64>),
@@ -1631,26 +1631,12 @@ impl<'a, 'b> Network<'a, 'b> {
.await
}
async fn start_radarr_task(&mut self, task: Option<RadarrTaskName>) -> Result<Value> {
let event = RadarrEvent::StartTask(None);
let task_name = if let Some(t_name) = task {
t_name
} else {
self
.app
.lock()
.await
.data
.radarr_data
.tasks
.current_selection()
.task_name
}
.to_string();
async fn start_radarr_task(&mut self, task_name: RadarrTaskName) -> Result<Value> {
let event = RadarrEvent::StartTask(task_name.clone());
info!("Starting Radarr task: {task_name}");
let body = CommandBody { name: task_name };
let body = CommandBody { name: task_name.to_string() };
let request_props = self
.request_props_from(event, RequestMethod::Post, Some(body), None, None)
src/network/radarr_network_tests.rs
+6 -42
View File
@@ -14,8 +14,9 @@ mod test {
use super::super::*;
use crate::models::radarr_models::{
AddMovieOptions, BlocklistItem, BlocklistItemMovie, CollectionMovie, EditCollectionParams,
EditMovieParams, IndexerSettings, MediaInfo, MinimumAvailability, MovieCollection, MovieFile, Rating, RatingsList
AddMovieOptions,
BlocklistItem, BlocklistItemMovie, CollectionMovie, EditCollectionParams, EditMovieParams,
IndexerSettings, MediaInfo, MinimumAvailability, MovieCollection, MovieFile, RadarrTaskName, Rating, RatingsList
};
use crate::models::servarr_data::radarr::modals::EditMovieModal;
use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
@@ -201,7 +202,7 @@ mod test {
#[rstest]
fn test_resource_command(
#[values(
RadarrEvent::StartTask(None),
RadarrEvent::StartTask(RadarrTaskName::default()),
RadarrEvent::GetQueuedEvents,
RadarrEvent::TriggerAutomaticSearch(None),
RadarrEvent::UpdateAndScan(None),
@@ -661,25 +662,15 @@ mod test {
})),
Some(response.clone()),
None,
RadarrEvent::StartTask(None),
RadarrEvent::StartTask(RadarrTaskName::ApplicationCheckUpdate),
None,
None,
)
.await;
app_arc
.lock()
.await
.data
.radarr_data
.tasks
.set_items(vec![RadarrTask {
task_name: RadarrTaskName::default(),
..RadarrTask::default()
}]);
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
if let RadarrSerdeable::Value(value) = network
.handle_radarr_event(RadarrEvent::StartTask(None))
.handle_radarr_event(RadarrEvent::StartTask(RadarrTaskName::ApplicationCheckUpdate))
.await
.unwrap()
{
@@ -721,33 +712,6 @@ mod test {
);
}
#[tokio::test]
async fn test_handle_start_radarr_task_event_uses_provided_task_name() {
let response = json!({ "test": "test"});
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Post,
Some(json!({
"name": "ApplicationCheckUpdate"
})),
Some(response.clone()),
None,
RadarrEvent::StartTask(None),
None,
None,
)
.await;
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
if let RadarrSerdeable::Value(value) = network
.handle_radarr_event(RadarrEvent::StartTask(Some(RadarrTaskName::default())))
.await
.unwrap()
{
async_server.assert_async().await;
assert_eq!(value, response);
}
}
#[tokio::test]
async fn test_handle_test_radarr_indexer_event_error() {
let indexer_details_json = json!({