diff --git a/src/network/radarr_network.rs b/src/network/radarr_network.rs index faecf90..717fe32 100644 --- a/src/network/radarr_network.rs +++ b/src/network/radarr_network.rs @@ -242,7 +242,7 @@ impl<'a, 'b> Network<'a, 'b> { .await .map(RadarrSerdeable::from), RadarrEvent::GetStatus => self.get_radarr_status().await.map(RadarrSerdeable::from), - RadarrEvent::GetTags => self.get_tags().await.map(RadarrSerdeable::from), + RadarrEvent::GetTags => self.get_radarr_tags().await.map(RadarrSerdeable::from), RadarrEvent::GetTasks => self.get_tasks().await.map(RadarrSerdeable::from), RadarrEvent::GetUpdates => self.get_updates().await.map(RadarrSerdeable::from), RadarrEvent::HealthCheck => self @@ -1837,7 +1837,7 @@ impl<'a, 'b> Network<'a, 'b> { .await } - async fn get_tags(&mut self) -> Result> { + async fn get_radarr_tags(&mut self) -> Result> { info!("Fetching Radarr tags"); let event = RadarrEvent::GetTags; diff --git a/src/network/radarr_network_tests.rs b/src/network/radarr_network_tests.rs index c5bc4b3..bfadf03 100644 --- a/src/network/radarr_network_tests.rs +++ b/src/network/radarr_network_tests.rs @@ -2633,7 +2633,7 @@ mod test { } #[tokio::test] - async fn test_handle_get_tags_event() { + async fn test_handle_get_radarr_tags_event() { let tags_json = json!([{ "id": 2222, "label": "usenet" diff --git a/src/network/sonarr_network.rs b/src/network/sonarr_network.rs index 3075215..22341b5 100644 --- a/src/network/sonarr_network.rs +++ b/src/network/sonarr_network.rs @@ -58,6 +58,7 @@ pub enum SonarrEvent { GetSeriesDetails(Option), GetSeriesHistory(Option), GetStatus, + GetTags, HealthCheck, ListSeries, } @@ -65,7 +66,7 @@ pub enum SonarrEvent { impl NetworkResource for SonarrEvent { fn resource(&self) -> &'static str { match &self { - SonarrEvent::AddTag(_) | SonarrEvent::DeleteTag(_) => "/tag", + SonarrEvent::AddTag(_) | SonarrEvent::DeleteTag(_) | SonarrEvent::GetTags => "/tag", SonarrEvent::ClearBlocklist => "/blocklist/bulk", SonarrEvent::DeleteBlocklistItem(_) => "/blocklist", SonarrEvent::GetAllIndexerSettings => "/config/indexer", @@ -195,6 +196,7 @@ impl<'a, 'b> Network<'a, 'b> { .await .map(SonarrSerdeable::from), SonarrEvent::GetStatus => self.get_sonarr_status().await.map(SonarrSerdeable::from), + SonarrEvent::GetTags => self.get_sonarr_tags().await.map(SonarrSerdeable::from), SonarrEvent::HealthCheck => self .get_sonarr_healthcheck() .await @@ -1112,6 +1114,24 @@ impl<'a, 'b> Network<'a, 'b> { .await } + async fn get_sonarr_tags(&mut self) -> Result> { + info!("Fetching Sonarr tags"); + let event = SonarrEvent::GetTags; + + let request_props = self + .request_props_from(event, RequestMethod::Get, None::<()>, None, None) + .await; + + self + .handle_request::<(), Vec>(request_props, |tags_vec, mut app| { + app.data.sonarr_data.tags_map = tags_vec + .into_iter() + .map(|tag| (tag.id, tag.label)) + .collect(); + }) + .await + } + async fn extract_series_id(&mut self, series_id: Option) -> (i64, String) { let series_id = if let Some(id) = series_id { id diff --git a/src/network/sonarr_network_tests.rs b/src/network/sonarr_network_tests.rs index 5de32ac..1401935 100644 --- a/src/network/sonarr_network_tests.rs +++ b/src/network/sonarr_network_tests.rs @@ -140,7 +140,12 @@ mod test { #[rstest] fn test_resource_tag( - #[values(SonarrEvent::AddTag(String::new()), SonarrEvent::DeleteTag(0))] event: SonarrEvent, + #[values( + SonarrEvent::AddTag(String::new()), + SonarrEvent::DeleteTag(0), + SonarrEvent::GetTags + )] + event: SonarrEvent, ) { assert_str_eq!(event.resource(), "/tag"); } @@ -3588,6 +3593,39 @@ mod test { } } + #[tokio::test] + async fn test_handle_get_sonarr_tags_event() { + let tags_json = json!([{ + "id": 2222, + "label": "usenet" + }]); + let response: Vec = serde_json::from_value(tags_json.clone()).unwrap(); + let (async_server, app_arc, _server) = mock_servarr_api( + RequestMethod::Get, + None, + Some(tags_json), + None, + SonarrEvent::GetTags, + None, + None, + ) + .await; + let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new()); + + if let SonarrSerdeable::Tags(tags) = network + .handle_sonarr_event(SonarrEvent::GetTags) + .await + .unwrap() + { + async_server.assert_async().await; + assert_eq!( + app_arc.lock().await.data.sonarr_data.tags_map, + BiMap::from_iter([(2222i64, "usenet".to_owned())]) + ); + assert_eq!(tags, response); + } + } + #[tokio::test] async fn test_extract_series_id() { let app_arc = Arc::new(Mutex::new(App::default()));