feat(network): Support for starting a Sonarr task

This commit is contained in:
2024-11-22 16:57:09 -07:00
parent 8df74585bc
commit 33db3efacf
6 changed files with 125 additions and 22 deletions
-6
View File
@@ -116,12 +116,6 @@ pub struct CollectionMovie {
pub ratings: RatingsList, pub ratings: RatingsList,
} }
#[derive(Default, Serialize, Debug)]
#[serde(rename_all = "camelCase")]
pub struct CommandBody {
pub name: String,
}
#[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq, Eq)] #[derive(Serialize, Deserialize, Default, Clone, Debug, PartialEq, Eq)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Credit { pub struct Credit {
+6
View File
@@ -74,6 +74,12 @@ impl Display for CertificateValidation {
} }
} }
#[derive(Default, Serialize, Debug)]
#[serde(rename_all = "camelCase")]
pub struct CommandBody {
pub name: String,
}
#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)] #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct DiskSpace { pub struct DiskSpace {
+10 -10
View File
@@ -8,10 +8,9 @@ use urlencoding::encode;
use crate::models::radarr_models::{ use crate::models::radarr_models::{
AddMovieBody, AddMovieSearchResult, AddOptions, BlocklistResponse, Collection, CollectionMovie, AddMovieBody, AddMovieSearchResult, AddOptions, BlocklistResponse, Collection, CollectionMovie,
CommandBody, Credit, CreditType, DeleteMovieParams, DownloadRecord, DownloadsResponse, Credit, CreditType, DeleteMovieParams, DownloadRecord, DownloadsResponse, EditCollectionParams,
EditCollectionParams, EditIndexerParams, EditMovieParams, IndexerSettings, IndexerTestResult, EditIndexerParams, EditMovieParams, IndexerSettings, IndexerTestResult, Movie, MovieCommandBody,
Movie, MovieCommandBody, MovieHistoryItem, RadarrSerdeable, RadarrTask, RadarrTaskName, MovieHistoryItem, RadarrSerdeable, RadarrTask, RadarrTaskName, ReleaseDownloadBody, SystemStatus,
ReleaseDownloadBody, SystemStatus,
}; };
use crate::models::servarr_data::radarr::modals::{ use crate::models::servarr_data::radarr::modals::{
AddMovieModal, EditCollectionModal, EditIndexerModal, EditMovieModal, IndexerTestResultModalItem, AddMovieModal, EditCollectionModal, EditIndexerModal, EditMovieModal, IndexerTestResultModalItem,
@@ -19,8 +18,8 @@ use crate::models::servarr_data::radarr::modals::{
}; };
use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock; use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
use crate::models::servarr_models::{ use crate::models::servarr_models::{
AddRootFolderBody, DiskSpace, HostConfig, Indexer, LogResponse, QualityProfile, QueueEvent, AddRootFolderBody, CommandBody, DiskSpace, HostConfig, Indexer, LogResponse, QualityProfile,
Release, RootFolder, SecurityConfig, Tag, Update, QueueEvent, Release, RootFolder, SecurityConfig, Tag, Update,
}; };
use crate::models::stateful_table::StatefulTable; use crate::models::stateful_table::StatefulTable;
use crate::models::{HorizontallyScrollableText, Route, Scrollable, ScrollableText}; use crate::models::{HorizontallyScrollableText, Route, Scrollable, ScrollableText};
@@ -252,9 +251,10 @@ impl<'a, 'b> Network<'a, 'b> {
RadarrEvent::SearchNewMovie(query) => { RadarrEvent::SearchNewMovie(query) => {
self.search_movie(query).await.map(RadarrSerdeable::from) self.search_movie(query).await.map(RadarrSerdeable::from)
} }
RadarrEvent::StartTask(task_name) => { RadarrEvent::StartTask(task_name) => self
self.start_task(task_name).await.map(RadarrSerdeable::from) .start_radarr_task(task_name)
} .await
.map(RadarrSerdeable::from),
RadarrEvent::TestIndexer(indexer_id) => self RadarrEvent::TestIndexer(indexer_id) => self
.test_indexer(indexer_id) .test_indexer(indexer_id)
.await .await
@@ -2006,7 +2006,7 @@ impl<'a, 'b> Network<'a, 'b> {
} }
} }
async fn start_task(&mut self, task: Option<RadarrTaskName>) -> Result<Value> { async fn start_radarr_task(&mut self, task: Option<RadarrTaskName>) -> Result<Value> {
let event = RadarrEvent::StartTask(None); let event = RadarrEvent::StartTask(None);
let task_name = if let Some(t_name) = task { let task_name = if let Some(t_name) = task {
t_name t_name
+2 -2
View File
@@ -713,7 +713,7 @@ mod test {
} }
#[tokio::test] #[tokio::test]
async fn test_handle_start_task_event() { async fn test_handle_start_radarr_task_event() {
let response = json!({ "test": "test"}); let response = json!({ "test": "test"});
let (async_server, app_arc, _server) = mock_servarr_api( let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Post, RequestMethod::Post,
@@ -750,7 +750,7 @@ mod test {
} }
#[tokio::test] #[tokio::test]
async fn test_handle_start_task_event_uses_provided_task_name() { async fn test_handle_start_radarr_task_event_uses_provided_task_name() {
let response = json!({ "test": "test"}); let response = json!({ "test": "test"});
let (async_server, app_arc, _server) = mock_servarr_api( let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Post, RequestMethod::Post,
+40 -3
View File
@@ -10,12 +10,13 @@ use crate::{
sonarr_data::ActiveSonarrBlock, sonarr_data::ActiveSonarrBlock,
}, },
servarr_models::{ servarr_models::{
AddRootFolderBody, DiskSpace, HostConfig, Indexer, LogResponse, QualityProfile, QueueEvent, AddRootFolderBody, CommandBody, DiskSpace, HostConfig, Indexer, LogResponse, QualityProfile,
Release, RootFolder, SecurityConfig, Tag, Update, QueueEvent, Release, RootFolder, SecurityConfig, Tag, Update,
}, },
sonarr_models::{ sonarr_models::{
BlocklistResponse, DownloadRecord, DownloadsResponse, Episode, IndexerSettings, Series, BlocklistResponse, DownloadRecord, DownloadsResponse, Episode, IndexerSettings, Series,
SonarrHistoryItem, SonarrHistoryWrapper, SonarrSerdeable, SonarrTask, SystemStatus, SonarrHistoryItem, SonarrHistoryWrapper, SonarrSerdeable, SonarrTask, SonarrTaskName,
SystemStatus,
}, },
stateful_table::StatefulTable, stateful_table::StatefulTable,
HorizontallyScrollableText, Route, Scrollable, ScrollableText, HorizontallyScrollableText, Route, Scrollable, ScrollableText,
@@ -65,6 +66,7 @@ pub enum SonarrEvent {
HealthCheck, HealthCheck,
ListSeries, ListSeries,
MarkHistoryItemAsFailed(i64), MarkHistoryItemAsFailed(i64),
StartTask(Option<SonarrTaskName>),
} }
impl NetworkResource for SonarrEvent { impl NetworkResource for SonarrEvent {
@@ -95,6 +97,7 @@ impl NetworkResource for SonarrEvent {
SonarrEvent::HealthCheck => "/health", SonarrEvent::HealthCheck => "/health",
SonarrEvent::ListSeries | SonarrEvent::GetSeriesDetails(_) => "/series", SonarrEvent::ListSeries | SonarrEvent::GetSeriesDetails(_) => "/series",
SonarrEvent::MarkHistoryItemAsFailed(_) => "/history/failed", SonarrEvent::MarkHistoryItemAsFailed(_) => "/history/failed",
SonarrEvent::StartTask(_) => "/command",
} }
} }
} }
@@ -217,6 +220,10 @@ impl<'a, 'b> Network<'a, 'b> {
.mark_sonarr_history_item_as_failed(history_item_id) .mark_sonarr_history_item_as_failed(history_item_id)
.await .await
.map(SonarrSerdeable::from), .map(SonarrSerdeable::from),
SonarrEvent::StartTask(task_name) => self
.start_sonarr_task(task_name)
.await
.map(SonarrSerdeable::from),
} }
} }
@@ -1274,6 +1281,36 @@ impl<'a, 'b> Network<'a, 'b> {
.await .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();
info!("Starting Sonarr task: {task_name}");
let body = CommandBody { name: task_name };
let request_props = self
.request_props_from(event, RequestMethod::Post, Some(body), None, None)
.await;
self
.handle_request::<CommandBody, Value>(request_props, |_, _| ())
.await
}
async fn extract_series_id(&mut self, series_id: Option<i64>) -> (i64, String) { async fn extract_series_id(&mut self, series_id: Option<i64>) -> (i64, String) {
let series_id = if let Some(id) = series_id { let series_id = if let Some(id) = series_id {
id id
+67 -1
View File
@@ -159,7 +159,9 @@ mod test {
} }
#[rstest] #[rstest]
fn test_resource_command(#[values(SonarrEvent::GetQueuedEvents)] event: SonarrEvent) { fn test_resource_command(
#[values(SonarrEvent::GetQueuedEvents, SonarrEvent::StartTask(None))] event: SonarrEvent,
) {
assert_str_eq!(event.resource(), "/command"); assert_str_eq!(event.resource(), "/command");
} }
@@ -3861,6 +3863,70 @@ mod test {
async_server.assert_async().await; async_server.assert_async().await;
} }
#[tokio::test]
async fn test_handle_start_sonarr_task_event() {
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;
app_arc
.lock()
.await
.data
.sonarr_data
.tasks
.set_items(vec![SonarrTask {
task_name: SonarrTaskName::default(),
..SonarrTask::default()
}]);
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())))
.await
.unwrap()
{
async_server.assert_async().await;
assert_eq!(value, response);
}
}
#[tokio::test] #[tokio::test]
async fn test_extract_series_id() { async fn test_extract_series_id() {
let app_arc = Arc::new(Mutex::new(App::default())); let app_arc = Arc::new(Mutex::new(App::default()));