feat(network): Support for deleting an indexer from Sonarr
This commit is contained in:
@@ -160,7 +160,7 @@ impl<'a, 'b> Network<'a, 'b> {
|
|||||||
.await
|
.await
|
||||||
.map(RadarrSerdeable::from),
|
.map(RadarrSerdeable::from),
|
||||||
RadarrEvent::DeleteIndexer(indexer_id) => self
|
RadarrEvent::DeleteIndexer(indexer_id) => self
|
||||||
.delete_indexer(indexer_id)
|
.delete_radarr_indexer(indexer_id)
|
||||||
.await
|
.await
|
||||||
.map(RadarrSerdeable::from),
|
.map(RadarrSerdeable::from),
|
||||||
RadarrEvent::DeleteMovie(params) => {
|
RadarrEvent::DeleteMovie(params) => {
|
||||||
@@ -537,7 +537,7 @@ impl<'a, 'b> Network<'a, 'b> {
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn delete_indexer(&mut self, indexer_id: Option<i64>) -> Result<()> {
|
async fn delete_radarr_indexer(&mut self, indexer_id: Option<i64>) -> Result<()> {
|
||||||
let event = RadarrEvent::DeleteIndexer(None);
|
let event = RadarrEvent::DeleteIndexer(None);
|
||||||
let id = if let Some(i_id) = indexer_id {
|
let id = if let Some(i_id) = indexer_id {
|
||||||
i_id
|
i_id
|
||||||
|
|||||||
@@ -3282,7 +3282,7 @@ mod test {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_handle_delete_indexer_event() {
|
async fn test_handle_delete_radarr_indexer_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,
|
||||||
@@ -3311,7 +3311,7 @@ mod test {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_handle_delete_indexer_event_uses_provided_id() {
|
async fn test_handle_delete_radarr_indexer_event_uses_provided_id() {
|
||||||
let (async_server, app_arc, _server) = mock_servarr_api(
|
let (async_server, app_arc, _server) = mock_servarr_api(
|
||||||
RequestMethod::Delete,
|
RequestMethod::Delete,
|
||||||
None,
|
None,
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ pub enum SonarrEvent {
|
|||||||
ClearBlocklist,
|
ClearBlocklist,
|
||||||
DeleteBlocklistItem(Option<i64>),
|
DeleteBlocklistItem(Option<i64>),
|
||||||
DeleteDownload(Option<i64>),
|
DeleteDownload(Option<i64>),
|
||||||
|
DeleteIndexer(Option<i64>),
|
||||||
GetAllIndexerSettings,
|
GetAllIndexerSettings,
|
||||||
GetBlocklist,
|
GetBlocklist,
|
||||||
GetDownloads,
|
GetDownloads,
|
||||||
@@ -66,7 +67,7 @@ impl NetworkResource for SonarrEvent {
|
|||||||
SonarrEvent::GetEpisodes(_) | SonarrEvent::GetEpisodeDetails(_) => "/episode",
|
SonarrEvent::GetEpisodes(_) | SonarrEvent::GetEpisodeDetails(_) => "/episode",
|
||||||
SonarrEvent::GetHistory(_) | SonarrEvent::GetEpisodeHistory(_) => "/history",
|
SonarrEvent::GetHistory(_) | SonarrEvent::GetEpisodeHistory(_) => "/history",
|
||||||
SonarrEvent::GetHostConfig | SonarrEvent::GetSecurityConfig => "/config/host",
|
SonarrEvent::GetHostConfig | SonarrEvent::GetSecurityConfig => "/config/host",
|
||||||
SonarrEvent::GetIndexers => "/indexer",
|
SonarrEvent::GetIndexers | SonarrEvent::DeleteIndexer(_) => "/indexer",
|
||||||
SonarrEvent::GetLogs(_) => "/log",
|
SonarrEvent::GetLogs(_) => "/log",
|
||||||
SonarrEvent::GetQualityProfiles => "/qualityprofile",
|
SonarrEvent::GetQualityProfiles => "/qualityprofile",
|
||||||
SonarrEvent::GetQueuedEvents => "/command",
|
SonarrEvent::GetQueuedEvents => "/command",
|
||||||
@@ -107,6 +108,10 @@ impl<'a, 'b> Network<'a, 'b> {
|
|||||||
.delete_sonarr_download(download_id)
|
.delete_sonarr_download(download_id)
|
||||||
.await
|
.await
|
||||||
.map(SonarrSerdeable::from),
|
.map(SonarrSerdeable::from),
|
||||||
|
SonarrEvent::DeleteIndexer(indexer_id) => self
|
||||||
|
.delete_sonarr_indexer(indexer_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
|
||||||
@@ -268,6 +273,39 @@ impl<'a, 'b> Network<'a, 'b> {
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn delete_sonarr_indexer(&mut self, indexer_id: Option<i64>) -> Result<()> {
|
||||||
|
let event = SonarrEvent::DeleteIndexer(None);
|
||||||
|
let id = if let Some(i_id) = indexer_id {
|
||||||
|
i_id
|
||||||
|
} else {
|
||||||
|
self
|
||||||
|
.app
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.data
|
||||||
|
.sonarr_data
|
||||||
|
.indexers
|
||||||
|
.current_selection()
|
||||||
|
.id
|
||||||
|
};
|
||||||
|
|
||||||
|
info!("Deleting Sonarr indexer for indexer with id: {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;
|
||||||
|
|||||||
@@ -151,7 +151,9 @@ mod test {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[rstest]
|
#[rstest]
|
||||||
fn test_resource_indexer(#[values(SonarrEvent::GetIndexers)] event: SonarrEvent) {
|
fn test_resource_indexer(
|
||||||
|
#[values(SonarrEvent::GetIndexers, SonarrEvent::DeleteIndexer(None))] event: SonarrEvent,
|
||||||
|
) {
|
||||||
assert_str_eq!(event.resource(), "/indexer");
|
assert_str_eq!(event.resource(), "/indexer");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -326,6 +328,57 @@ mod test {
|
|||||||
async_server.assert_async().await;
|
async_server.assert_async().await;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_handle_delete_sonarr_indexer_event() {
|
||||||
|
let (async_server, app_arc, _server) = mock_servarr_api(
|
||||||
|
RequestMethod::Delete,
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
SonarrEvent::DeleteIndexer(None),
|
||||||
|
Some("/1"),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
app_arc
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.data
|
||||||
|
.sonarr_data
|
||||||
|
.indexers
|
||||||
|
.set_items(vec![indexer()]);
|
||||||
|
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
|
||||||
|
|
||||||
|
assert!(network
|
||||||
|
.handle_sonarr_event(SonarrEvent::DeleteIndexer(None))
|
||||||
|
.await
|
||||||
|
.is_ok());
|
||||||
|
|
||||||
|
async_server.assert_async().await;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_handle_delete_sonarr_indexer_event_uses_provided_id() {
|
||||||
|
let (async_server, app_arc, _server) = mock_servarr_api(
|
||||||
|
RequestMethod::Delete,
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
SonarrEvent::DeleteIndexer(None),
|
||||||
|
Some("/1"),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
|
||||||
|
|
||||||
|
assert!(network
|
||||||
|
.handle_sonarr_event(SonarrEvent::DeleteIndexer(Some(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