feat(network): Support for triggering an automatic series search in Sonarr

This commit is contained in:
2024-11-22 17:53:09 -07:00
parent 8807adea83
commit 3497a54c39
5 changed files with 109 additions and 10 deletions
+12
View File
@@ -389,6 +389,18 @@ pub struct SonarrHistoryItem {
pub data: SonarrHistoryData, pub data: SonarrHistoryData,
} }
#[derive(Default, Serialize, Debug)]
#[serde(rename_all = "camelCase")]
pub struct SonarrCommandBody {
pub name: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub series_id: Option<i64>,
#[serde(skip_serializing_if = "Option::is_none")]
pub season_number: Option<i64>,
#[serde(skip_serializing_if = "Option::is_none")]
pub episode_ids: Option<Vec<i64>>,
}
#[derive(Default, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)] #[derive(Default, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct SonarrTask { pub struct SonarrTask {
+3 -3
View File
@@ -264,7 +264,7 @@ impl<'a, 'b> Network<'a, 'b> {
.await .await
.map(RadarrSerdeable::from), .map(RadarrSerdeable::from),
RadarrEvent::TriggerAutomaticSearch(movie_id) => self RadarrEvent::TriggerAutomaticSearch(movie_id) => self
.trigger_automatic_search(movie_id) .trigger_automatic_movie_search(movie_id)
.await .await
.map(RadarrSerdeable::from), .map(RadarrSerdeable::from),
RadarrEvent::UpdateAllMovies => self.update_all_movies().await.map(RadarrSerdeable::from), RadarrEvent::UpdateAllMovies => self.update_all_movies().await.map(RadarrSerdeable::from),
@@ -2145,8 +2145,8 @@ impl<'a, 'b> Network<'a, 'b> {
.await .await
} }
async fn trigger_automatic_search(&mut self, movie_id: Option<i64>) -> Result<Value> { async fn trigger_automatic_movie_search(&mut self, movie_id: Option<i64>) -> Result<Value> {
let event = RadarrEvent::TriggerAutomaticSearch(None); let event = RadarrEvent::TriggerAutomaticSearch(movie_id);
let (id, _) = self.extract_movie_id(movie_id).await; let (id, _) = self.extract_movie_id(movie_id).await;
info!("Searching indexers for movie with ID: {id}"); info!("Searching indexers for movie with ID: {id}");
let body = MovieCommandBody { let body = MovieCommandBody {
+2 -2
View File
@@ -1162,7 +1162,7 @@ mod test {
} }
#[tokio::test] #[tokio::test]
async fn test_handle_trigger_automatic_search_event() { async fn test_handle_trigger_automatic_movie_search_event() {
let (async_server, app_arc, _server) = mock_servarr_api( let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Post, RequestMethod::Post,
Some(json!({ Some(json!({
@@ -1194,7 +1194,7 @@ mod test {
} }
#[tokio::test] #[tokio::test]
async fn test_handle_trigger_automatic_search_event_uses_provided_id() { async fn test_handle_trigger_automatic_movie_search_event_uses_provided_id() {
let (async_server, app_arc, _server) = mock_servarr_api( let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Post, RequestMethod::Post,
Some(json!({ Some(json!({
+29 -4
View File
@@ -19,8 +19,8 @@ use crate::{
}, },
sonarr_models::{ sonarr_models::{
BlocklistResponse, DownloadRecord, DownloadsResponse, Episode, IndexerSettings, Series, BlocklistResponse, DownloadRecord, DownloadsResponse, Episode, IndexerSettings, Series,
SonarrHistoryItem, SonarrHistoryWrapper, SonarrSerdeable, SonarrTask, SonarrTaskName, SonarrCommandBody, SonarrHistoryItem, SonarrHistoryWrapper, SonarrSerdeable, SonarrTask,
SystemStatus, SonarrTaskName, SystemStatus,
}, },
stateful_table::StatefulTable, stateful_table::StatefulTable,
HorizontallyScrollableText, Route, Scrollable, ScrollableText, HorizontallyScrollableText, Route, Scrollable, ScrollableText,
@@ -73,6 +73,7 @@ pub enum SonarrEvent {
StartTask(Option<SonarrTaskName>), StartTask(Option<SonarrTaskName>),
TestIndexer(Option<i64>), TestIndexer(Option<i64>),
TestAllIndexers, TestAllIndexers,
TriggerAutomaticSeriesSearch(Option<i64>),
} }
impl NetworkResource for SonarrEvent { impl NetworkResource for SonarrEvent {
@@ -91,7 +92,9 @@ impl NetworkResource for SonarrEvent {
SonarrEvent::GetLogs(_) => "/log", SonarrEvent::GetLogs(_) => "/log",
SonarrEvent::GetDiskSpace => "/diskspace", SonarrEvent::GetDiskSpace => "/diskspace",
SonarrEvent::GetQualityProfiles => "/qualityprofile", SonarrEvent::GetQualityProfiles => "/qualityprofile",
SonarrEvent::GetQueuedEvents => "/command", SonarrEvent::GetQueuedEvents
| SonarrEvent::StartTask(_)
| SonarrEvent::TriggerAutomaticSeriesSearch(_) => "/command",
SonarrEvent::GetRootFolders SonarrEvent::GetRootFolders
| SonarrEvent::DeleteRootFolder(_) | SonarrEvent::DeleteRootFolder(_)
| SonarrEvent::AddRootFolder(_) => "/rootfolder", | SonarrEvent::AddRootFolder(_) => "/rootfolder",
@@ -103,7 +106,6 @@ 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",
SonarrEvent::TestIndexer(_) => "/indexer/test", SonarrEvent::TestIndexer(_) => "/indexer/test",
SonarrEvent::TestAllIndexers => "/indexer/testall", SonarrEvent::TestAllIndexers => "/indexer/testall",
} }
@@ -240,6 +242,10 @@ impl<'a, 'b> Network<'a, 'b> {
.test_all_sonarr_indexers() .test_all_sonarr_indexers()
.await .await
.map(SonarrSerdeable::from), .map(SonarrSerdeable::from),
SonarrEvent::TriggerAutomaticSeriesSearch(series_id) => self
.trigger_automatic_series_search(series_id)
.await
.map(SonarrSerdeable::from),
} }
} }
@@ -1433,6 +1439,25 @@ impl<'a, 'b> Network<'a, 'b> {
.await .await
} }
async fn trigger_automatic_series_search(&mut self, series_id: Option<i64>) -> Result<Value> {
let event = SonarrEvent::TriggerAutomaticSeriesSearch(series_id);
let (id, _) = self.extract_series_id(series_id).await;
info!("Searching indexers for series with ID: {id}");
let body = SonarrCommandBody {
name: "SeriesSearch".to_owned(),
series_id: Some(id),
..SonarrCommandBody::default()
};
let request_props = self
.request_props_from(event, RequestMethod::Post, Some(body), None, None)
.await;
self
.handle_request::<SonarrCommandBody, 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
+63 -1
View File
@@ -163,7 +163,12 @@ mod test {
#[rstest] #[rstest]
fn test_resource_command( fn test_resource_command(
#[values(SonarrEvent::GetQueuedEvents, SonarrEvent::StartTask(None))] event: SonarrEvent, #[values(
SonarrEvent::GetQueuedEvents,
SonarrEvent::StartTask(None),
SonarrEvent::TriggerAutomaticSeriesSearch(None)
)]
event: SonarrEvent,
) { ) {
assert_str_eq!(event.resource(), "/command"); assert_str_eq!(event.resource(), "/command");
} }
@@ -4228,6 +4233,63 @@ mod test {
} }
} }
#[tokio::test]
async fn test_handle_trigger_automatic_series_search_event() {
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Post,
Some(json!({
"name": "SeriesSearch",
"seriesId": 1
})),
Some(json!({})),
None,
SonarrEvent::TriggerAutomaticSeriesSearch(None),
None,
None,
)
.await;
app_arc
.lock()
.await
.data
.sonarr_data
.series
.set_items(vec![series()]);
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
assert!(network
.handle_sonarr_event(SonarrEvent::TriggerAutomaticSeriesSearch(None))
.await
.is_ok());
async_server.assert_async().await;
}
#[tokio::test]
async fn test_handle_trigger_automatic_series_search_event_uses_provided_id() {
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Post,
Some(json!({
"name": "SeriesSearch",
"seriesId": 1
})),
Some(json!({})),
None,
SonarrEvent::TriggerAutomaticSeriesSearch(None),
None,
None,
)
.await;
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
assert!(network
.handle_sonarr_event(SonarrEvent::TriggerAutomaticSeriesSearch(Some(1)))
.await
.is_ok());
async_server.assert_async().await;
}
#[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()));