From 208acafc73c8dce99aea57fd8b462391d6b46b2d Mon Sep 17 00:00:00 2001 From: Alex Clarke Date: Fri, 22 Nov 2024 15:02:30 -0700 Subject: [PATCH] feat(network): Support for deleting tags from Sonarr --- src/network/radarr_network.rs | 7 +++++-- src/network/radarr_network_tests.rs | 2 +- src/network/sonarr_network.rs | 26 +++++++++++++++++++++++++- src/network/sonarr_network_tests.rs | 26 +++++++++++++++++++++++++- 4 files changed, 56 insertions(+), 5 deletions(-) diff --git a/src/network/radarr_network.rs b/src/network/radarr_network.rs index cef03a1..faecf90 100644 --- a/src/network/radarr_network.rs +++ b/src/network/radarr_network.rs @@ -172,7 +172,10 @@ impl<'a, 'b> Network<'a, 'b> { .delete_radarr_root_folder(root_folder_id) .await .map(RadarrSerdeable::from), - RadarrEvent::DeleteTag(tag_id) => self.delete_tag(tag_id).await.map(RadarrSerdeable::from), + RadarrEvent::DeleteTag(tag_id) => self + .delete_radarr_tag(tag_id) + .await + .map(RadarrSerdeable::from), RadarrEvent::DownloadRelease(params) => self .download_release(params) .await @@ -426,7 +429,7 @@ impl<'a, 'b> Network<'a, 'b> { .await } - async fn delete_tag(&mut self, id: i64) -> Result<()> { + async fn delete_radarr_tag(&mut self, id: i64) -> Result<()> { info!("Deleting Radarr tag with id: {id}"); let event = RadarrEvent::DeleteTag(id); diff --git a/src/network/radarr_network_tests.rs b/src/network/radarr_network_tests.rs index ddfa1a3..c5bc4b3 100644 --- a/src/network/radarr_network_tests.rs +++ b/src/network/radarr_network_tests.rs @@ -2861,7 +2861,7 @@ mod test { } #[tokio::test] - async fn test_handle_delete_tag_event() { + async fn test_handle_delete_radarr_tag_event() { let (async_server, app_arc, _server) = mock_servarr_api( RequestMethod::Delete, None, diff --git a/src/network/sonarr_network.rs b/src/network/sonarr_network.rs index 31bebdc..3075215 100644 --- a/src/network/sonarr_network.rs +++ b/src/network/sonarr_network.rs @@ -38,6 +38,7 @@ pub enum SonarrEvent { DeleteDownload(Option), DeleteIndexer(Option), DeleteRootFolder(Option), + DeleteTag(i64), GetAllIndexerSettings, GetBlocklist, GetDownloads, @@ -64,7 +65,7 @@ pub enum SonarrEvent { impl NetworkResource for SonarrEvent { fn resource(&self) -> &'static str { match &self { - SonarrEvent::AddTag(_) => "/tag", + SonarrEvent::AddTag(_) | SonarrEvent::DeleteTag(_) => "/tag", SonarrEvent::ClearBlocklist => "/blocklist/bulk", SonarrEvent::DeleteBlocklistItem(_) => "/blocklist", SonarrEvent::GetAllIndexerSettings => "/config/indexer", @@ -130,6 +131,10 @@ impl<'a, 'b> Network<'a, 'b> { .delete_sonarr_root_folder(root_folder_id) .await .map(SonarrSerdeable::from), + SonarrEvent::DeleteTag(tag_id) => self + .delete_sonarr_tag(tag_id) + .await + .map(SonarrSerdeable::from), SonarrEvent::GetBlocklist => self.get_sonarr_blocklist().await.map(SonarrSerdeable::from), SonarrEvent::GetDownloads => self.get_sonarr_downloads().await.map(SonarrSerdeable::from), SonarrEvent::GetEpisodes(series_id) => self @@ -414,6 +419,25 @@ impl<'a, 'b> Network<'a, 'b> { .await } + async fn delete_sonarr_tag(&mut self, id: i64) -> Result<()> { + info!("Deleting Sonarr tag with id: {id}"); + let event = SonarrEvent::DeleteTag(id); + + let request_props = self + .request_props_from( + event, + RequestMethod::Delete, + None::<()>, + Some(format!("/{id}")), + None, + ) + .await; + + self + .handle_request::<(), ()>(request_props, |_, _| ()) + .await + } + async fn get_all_sonarr_indexer_settings(&mut self) -> Result { info!("Fetching Sonarr indexer settings"); let event = SonarrEvent::GetAllIndexerSettings; diff --git a/src/network/sonarr_network_tests.rs b/src/network/sonarr_network_tests.rs index dc432f0..5de32ac 100644 --- a/src/network/sonarr_network_tests.rs +++ b/src/network/sonarr_network_tests.rs @@ -139,7 +139,9 @@ mod test { } #[rstest] - fn test_resource_tag(#[values(SonarrEvent::AddTag(String::new()))] event: SonarrEvent) { + fn test_resource_tag( + #[values(SonarrEvent::AddTag(String::new()), SonarrEvent::DeleteTag(0))] event: SonarrEvent, + ) { assert_str_eq!(event.resource(), "/tag"); } @@ -548,6 +550,28 @@ mod test { async_server.assert_async().await; } + #[tokio::test] + async fn test_handle_delete_sonarr_tag_event() { + let (async_server, app_arc, _server) = mock_servarr_api( + RequestMethod::Delete, + None, + None, + None, + SonarrEvent::DeleteTag(1), + Some("/1"), + None, + ) + .await; + let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new()); + + assert!(network + .handle_sonarr_event(SonarrEvent::DeleteTag(1)) + .await + .is_ok()); + + async_server.assert_async().await; + } + #[rstest] #[tokio::test] async fn test_handle_get_sonarr_blocklist_event(#[values(true, false)] use_custom_sorting: bool) {