feat(network): Support for deleting tags from Sonarr
This commit is contained in:
@@ -172,7 +172,10 @@ impl<'a, 'b> Network<'a, 'b> {
|
|||||||
.delete_radarr_root_folder(root_folder_id)
|
.delete_radarr_root_folder(root_folder_id)
|
||||||
.await
|
.await
|
||||||
.map(RadarrSerdeable::from),
|
.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
|
RadarrEvent::DownloadRelease(params) => self
|
||||||
.download_release(params)
|
.download_release(params)
|
||||||
.await
|
.await
|
||||||
@@ -426,7 +429,7 @@ impl<'a, 'b> Network<'a, 'b> {
|
|||||||
.await
|
.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}");
|
info!("Deleting Radarr tag with id: {id}");
|
||||||
let event = RadarrEvent::DeleteTag(id);
|
let event = RadarrEvent::DeleteTag(id);
|
||||||
|
|
||||||
|
|||||||
@@ -2861,7 +2861,7 @@ mod test {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::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(
|
let (async_server, app_arc, _server) = mock_servarr_api(
|
||||||
RequestMethod::Delete,
|
RequestMethod::Delete,
|
||||||
None,
|
None,
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ pub enum SonarrEvent {
|
|||||||
DeleteDownload(Option<i64>),
|
DeleteDownload(Option<i64>),
|
||||||
DeleteIndexer(Option<i64>),
|
DeleteIndexer(Option<i64>),
|
||||||
DeleteRootFolder(Option<i64>),
|
DeleteRootFolder(Option<i64>),
|
||||||
|
DeleteTag(i64),
|
||||||
GetAllIndexerSettings,
|
GetAllIndexerSettings,
|
||||||
GetBlocklist,
|
GetBlocklist,
|
||||||
GetDownloads,
|
GetDownloads,
|
||||||
@@ -64,7 +65,7 @@ pub enum SonarrEvent {
|
|||||||
impl NetworkResource for SonarrEvent {
|
impl NetworkResource for SonarrEvent {
|
||||||
fn resource(&self) -> &'static str {
|
fn resource(&self) -> &'static str {
|
||||||
match &self {
|
match &self {
|
||||||
SonarrEvent::AddTag(_) => "/tag",
|
SonarrEvent::AddTag(_) | SonarrEvent::DeleteTag(_) => "/tag",
|
||||||
SonarrEvent::ClearBlocklist => "/blocklist/bulk",
|
SonarrEvent::ClearBlocklist => "/blocklist/bulk",
|
||||||
SonarrEvent::DeleteBlocklistItem(_) => "/blocklist",
|
SonarrEvent::DeleteBlocklistItem(_) => "/blocklist",
|
||||||
SonarrEvent::GetAllIndexerSettings => "/config/indexer",
|
SonarrEvent::GetAllIndexerSettings => "/config/indexer",
|
||||||
@@ -130,6 +131,10 @@ impl<'a, 'b> Network<'a, 'b> {
|
|||||||
.delete_sonarr_root_folder(root_folder_id)
|
.delete_sonarr_root_folder(root_folder_id)
|
||||||
.await
|
.await
|
||||||
.map(SonarrSerdeable::from),
|
.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::GetBlocklist => self.get_sonarr_blocklist().await.map(SonarrSerdeable::from),
|
||||||
SonarrEvent::GetDownloads => self.get_sonarr_downloads().await.map(SonarrSerdeable::from),
|
SonarrEvent::GetDownloads => self.get_sonarr_downloads().await.map(SonarrSerdeable::from),
|
||||||
SonarrEvent::GetEpisodes(series_id) => self
|
SonarrEvent::GetEpisodes(series_id) => self
|
||||||
@@ -414,6 +419,25 @@ impl<'a, 'b> Network<'a, 'b> {
|
|||||||
.await
|
.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<IndexerSettings> {
|
async fn get_all_sonarr_indexer_settings(&mut self) -> Result<IndexerSettings> {
|
||||||
info!("Fetching Sonarr indexer settings");
|
info!("Fetching Sonarr indexer settings");
|
||||||
let event = SonarrEvent::GetAllIndexerSettings;
|
let event = SonarrEvent::GetAllIndexerSettings;
|
||||||
|
|||||||
@@ -139,7 +139,9 @@ mod test {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[rstest]
|
#[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");
|
assert_str_eq!(event.resource(), "/tag");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -548,6 +550,28 @@ mod test {
|
|||||||
async_server.assert_async().await;
|
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]
|
#[rstest]
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_handle_get_sonarr_blocklist_event(#[values(true, false)] use_custom_sorting: bool) {
|
async fn test_handle_get_sonarr_blocklist_event(#[values(true, false)] use_custom_sorting: bool) {
|
||||||
|
|||||||
Reference in New Issue
Block a user