fix(sonarr): Provide the task name directly alongside all StartTask events when publishing to the networking channel
This commit is contained in:
@@ -83,7 +83,7 @@ pub enum SonarrEvent {
|
||||
ListSeries,
|
||||
MarkHistoryItemAsFailed(i64),
|
||||
SearchNewSeries(String),
|
||||
StartTask(Option<SonarrTaskName>),
|
||||
StartTask(SonarrTaskName),
|
||||
TestIndexer(Option<i64>),
|
||||
TestAllIndexers,
|
||||
ToggleSeasonMonitoring(Option<(i64, i64)>),
|
||||
@@ -2025,23 +2025,9 @@ impl<'a, 'b> Network<'a, 'b> {
|
||||
.await
|
||||
}
|
||||
|
||||
async fn start_sonarr_task(&mut self, task: Option<SonarrTaskName>) -> Result<Value> {
|
||||
let event = SonarrEvent::StartTask(None);
|
||||
let task_name = if let Some(t_name) = task {
|
||||
t_name
|
||||
} else {
|
||||
self
|
||||
.app
|
||||
.lock()
|
||||
.await
|
||||
.data
|
||||
.sonarr_data
|
||||
.tasks
|
||||
.current_selection()
|
||||
.task_name
|
||||
}
|
||||
.to_string();
|
||||
|
||||
async fn start_sonarr_task(&mut self, task: SonarrTaskName) -> Result<Value> {
|
||||
let event = SonarrEvent::StartTask(task);
|
||||
let task_name = task.to_string();
|
||||
info!("Starting Sonarr task: {task_name}");
|
||||
|
||||
let body = CommandBody { name: task_name };
|
||||
|
||||
@@ -192,7 +192,7 @@ mod test {
|
||||
fn test_resource_command(
|
||||
#[values(
|
||||
SonarrEvent::GetQueuedEvents,
|
||||
SonarrEvent::StartTask(None),
|
||||
SonarrEvent::StartTask(SonarrTaskName::default()),
|
||||
SonarrEvent::TriggerAutomaticEpisodeSearch(None),
|
||||
SonarrEvent::TriggerAutomaticSeasonSearch(None),
|
||||
SonarrEvent::TriggerAutomaticSeriesSearch(None),
|
||||
@@ -4763,7 +4763,7 @@ mod test {
|
||||
})),
|
||||
Some(response.clone()),
|
||||
None,
|
||||
SonarrEvent::StartTask(None),
|
||||
SonarrEvent::StartTask(SonarrTaskName::ApplicationUpdateCheck),
|
||||
None,
|
||||
None,
|
||||
)
|
||||
@@ -4781,34 +4781,9 @@ mod test {
|
||||
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
|
||||
|
||||
if let SonarrSerdeable::Value(value) = network
|
||||
.handle_sonarr_event(SonarrEvent::StartTask(None))
|
||||
.await
|
||||
.unwrap()
|
||||
{
|
||||
async_server.assert_async().await;
|
||||
assert_eq!(value, response);
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_handle_start_sonarr_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": "ApplicationUpdateCheck"
|
||||
})),
|
||||
Some(response.clone()),
|
||||
None,
|
||||
SonarrEvent::StartTask(None),
|
||||
None,
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
|
||||
|
||||
if let SonarrSerdeable::Value(value) = network
|
||||
.handle_sonarr_event(SonarrEvent::StartTask(Some(SonarrTaskName::default())))
|
||||
.handle_sonarr_event(SonarrEvent::StartTask(
|
||||
SonarrTaskName::ApplicationUpdateCheck,
|
||||
))
|
||||
.await
|
||||
.unwrap()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user