From aea7fd2607f304c336c2f66113a4c411de84f6b0 Mon Sep 17 00:00:00 2001 From: Alex Clarke Date: Tue, 1 Sep 2026 17:16:23 -0600 Subject: [PATCH] feat(readarr): delete an indexer and expose the command on the CLI --- src/cli/readarr/delete_command_handler.rs | 12 ++++ .../readarr/delete_command_handler_tests.rs | 72 +++++++++++++++++++ src/network/readarr_network/indexers/mod.rs | 22 ++++++ .../readarr_indexers_network_tests.rs | 35 +++++++++ src/network/readarr_network/mod.rs | 9 ++- .../readarr_network/readarr_network_tests.rs | 1 + 6 files changed, 150 insertions(+), 1 deletion(-) diff --git a/src/cli/readarr/delete_command_handler.rs b/src/cli/readarr/delete_command_handler.rs index cf280076..f0edd0c5 100644 --- a/src/cli/readarr/delete_command_handler.rs +++ b/src/cli/readarr/delete_command_handler.rs @@ -55,6 +55,11 @@ pub enum ReadarrDeleteCommand { #[arg(long, help = "The ID of the download to delete", required = true)] download_id: i64, }, + #[command(about = "Delete the indexer with the given ID")] + Indexer { + #[arg(long, help = "The ID of the indexer to delete", required = true)] + indexer_id: i64, + }, #[command(about = "Delete the root folder with the given ID")] RootFolder { #[arg(long, help = "The ID of the root folder to delete", required = true)] @@ -149,6 +154,13 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, ReadarrDeleteCommand> .await?; serde_json::to_string_pretty(&resp)? } + ReadarrDeleteCommand::Indexer { indexer_id } => { + let resp = self + .network + .handle_network_event(ReadarrEvent::DeleteIndexer(indexer_id).into()) + .await?; + serde_json::to_string_pretty(&resp)? + } ReadarrDeleteCommand::RootFolder { root_folder_id } => { let resp = self .network diff --git a/src/cli/readarr/delete_command_handler_tests.rs b/src/cli/readarr/delete_command_handler_tests.rs index 5cb6b2b2..0b1bbe50 100644 --- a/src/cli/readarr/delete_command_handler_tests.rs +++ b/src/cli/readarr/delete_command_handler_tests.rs @@ -326,6 +326,55 @@ mod tests { assert_eq!(delete_command, expected_args); } + #[test] + fn test_delete_indexer_requires_arguments() { + let result = + Cli::command().try_get_matches_from(["managarr", "readarr", "delete", "indexer"]); + + assert_err!(&result); + assert_eq!( + result.unwrap_err().kind(), + ErrorKind::MissingRequiredArgument + ); + } + + #[test] + fn test_delete_indexer_indexer_id_requires_a_number() { + let result = Cli::command().try_get_matches_from([ + "managarr", + "readarr", + "delete", + "indexer", + "--indexer-id", + "not_a_number", + ]); + + assert_err!(&result); + assert_eq!(result.unwrap_err().kind(), ErrorKind::ValueValidation); + } + + #[test] + fn test_delete_indexer_success() { + let expected_args = ReadarrDeleteCommand::Indexer { indexer_id: 8 }; + + let result = Cli::try_parse_from([ + "managarr", + "readarr", + "delete", + "indexer", + "--indexer-id", + "8", + ]); + + assert_ok!(&result); + + let Some(Command::Readarr(ReadarrCommand::Delete(delete_command))) = result.unwrap().command + else { + panic!("Unexpected command type"); + }; + assert_eq!(delete_command, expected_args); + } + #[test] fn test_delete_root_folder_requires_arguments() { let result = @@ -580,6 +629,29 @@ mod tests { assert_ok!(&result); } + #[tokio::test] + async fn test_handle_delete_indexer_command() { + let mut mock_network = MockNetworkTrait::new(); + mock_network + .expect_handle_network_event() + .with(eq::(ReadarrEvent::DeleteIndexer(8).into())) + .times(1) + .returning(|_| { + Ok(Serdeable::Readarr(ReadarrSerdeable::Value( + json!({"testResponse": "response"}), + ))) + }); + let app_arc = Arc::new(Mutex::new(App::test_default())); + let delete_indexer_command = ReadarrDeleteCommand::Indexer { indexer_id: 8 }; + + let result = + ReadarrDeleteCommandHandler::with(&app_arc, delete_indexer_command, &mut mock_network) + .handle() + .await; + + assert_ok!(&result); + } + #[tokio::test] async fn test_handle_delete_root_folder_command() { let mut mock_network = MockNetworkTrait::new(); diff --git a/src/network/readarr_network/indexers/mod.rs b/src/network/readarr_network/indexers/mod.rs index d374a34f..165d8525 100644 --- a/src/network/readarr_network/indexers/mod.rs +++ b/src/network/readarr_network/indexers/mod.rs @@ -10,6 +10,28 @@ use serde_json::{Value, json}; mod readarr_indexers_network_tests; impl Network<'_, '_> { + pub(in crate::network::readarr_network) async fn delete_readarr_indexer( + &mut self, + indexer_id: i64, + ) -> Result<()> { + info!("Deleting Readarr indexer with id: {indexer_id}"); + let event = ReadarrEvent::DeleteIndexer(indexer_id); + + let request_props = self + .request_props_from( + event, + RequestMethod::Delete, + None::<()>, + Some(format!("/{indexer_id}")), + None, + ) + .await; + + self + .handle_request::<(), ()>(request_props, |_, _| ()) + .await + } + pub(in crate::network::readarr_network) async fn edit_readarr_indexer( &mut self, mut edit_indexer_params: EditIndexerParams, diff --git a/src/network/readarr_network/indexers/readarr_indexers_network_tests.rs b/src/network/readarr_network/indexers/readarr_indexers_network_tests.rs index e09db0f3..80bcacdf 100644 --- a/src/network/readarr_network/indexers/readarr_indexers_network_tests.rs +++ b/src/network/readarr_network/indexers/readarr_indexers_network_tests.rs @@ -13,6 +13,41 @@ mod tests { use pretty_assertions::assert_eq; use serde_json::{Value, json}; + #[tokio::test] + async fn test_handle_delete_readarr_indexer_event() { + let (mock, app, _server) = MockServarrApi::delete() + .path("/8") + .build_for(ReadarrEvent::DeleteIndexer(8)) + .await; + app.lock().await.server_tabs.set_index(3); + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::DeleteIndexer(8)) + .await; + + mock.assert_async().await; + assert_ok!(result); + } + + #[tokio::test] + async fn test_handle_delete_readarr_indexer_event_failure() { + let (mock, app, _server) = MockServarrApi::delete() + .path("/8") + .status(500) + .build_for(ReadarrEvent::DeleteIndexer(8)) + .await; + app.lock().await.server_tabs.set_index(3); + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::DeleteIndexer(8)) + .await; + + mock.assert_async().await; + assert_err!(result); + } + #[tokio::test] async fn test_handle_get_readarr_indexers_event() { let indexers_response_json = json!([serde_json::from_str::(INDEXER_JSON).unwrap()]); diff --git a/src/network/readarr_network/mod.rs b/src/network/readarr_network/mod.rs index bb6d179f..06cac640 100644 --- a/src/network/readarr_network/mod.rs +++ b/src/network/readarr_network/mod.rs @@ -39,6 +39,7 @@ pub enum ReadarrEvent { DeleteBook(DeleteParams), DeleteBookFile(i64), DeleteDownload(i64), + DeleteIndexer(i64), DeleteRootFolder(i64), DeleteTag(i64), DownloadRelease(ReleaseDownloadBody), @@ -115,7 +116,9 @@ impl NetworkResource for ReadarrEvent { ReadarrEvent::GetHistory(_) => "/history", ReadarrEvent::GetAuthorHistory(_) | ReadarrEvent::GetBookHistory(_, _) => "/history/author", ReadarrEvent::MarkHistoryItemAsFailed(_) => "/history/failed", - ReadarrEvent::EditIndexer(_) | ReadarrEvent::GetIndexers => "/indexer", + ReadarrEvent::DeleteIndexer(_) | ReadarrEvent::EditIndexer(_) | ReadarrEvent::GetIndexers => { + "/indexer" + } ReadarrEvent::GetLogs(_) => "/log", ReadarrEvent::GetMetadataProfiles => "/metadataprofile", ReadarrEvent::GetQualityProfiles => "/qualityprofile", @@ -176,6 +179,10 @@ impl Network<'_, '_> { .delete_readarr_download(download_id) .await .map(ReadarrSerdeable::from), + ReadarrEvent::DeleteIndexer(indexer_id) => self + .delete_readarr_indexer(indexer_id) + .await + .map(ReadarrSerdeable::from), ReadarrEvent::DeleteRootFolder(root_folder_id) => self .delete_readarr_root_folder(root_folder_id) .await diff --git a/src/network/readarr_network/readarr_network_tests.rs b/src/network/readarr_network/readarr_network_tests.rs index 3142fcef..555f9ca1 100644 --- a/src/network/readarr_network/readarr_network_tests.rs +++ b/src/network/readarr_network/readarr_network_tests.rs @@ -49,6 +49,7 @@ mod tests { #[case(ReadarrEvent::GetAuthorHistory(1), "/history/author")] #[case(ReadarrEvent::GetBookHistory(1, 2), "/history/author")] #[case(ReadarrEvent::MarkHistoryItemAsFailed(1), "/history/failed")] + #[case(ReadarrEvent::DeleteIndexer(1), "/indexer")] #[case(ReadarrEvent::EditIndexer(EditIndexerParams::default()), "/indexer")] #[case(ReadarrEvent::GetIndexers, "/indexer")] #[case(ReadarrEvent::GetLogs(500), "/log")]