From 5c9fead72587fdcc0cbac998879ee4e41aeeabf2 Mon Sep 17 00:00:00 2001 From: Alex Clarke Date: Fri, 28 Aug 2026 13:18:53 -0600 Subject: [PATCH] feat(readarr): delete a download 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/downloads/mod.rs | 22 ++++++ .../readarr_downloads_network_tests.rs | 35 +++++++++ src/network/readarr_network/mod.rs | 7 +- .../readarr_network/readarr_network_tests.rs | 1 + 6 files changed, 148 insertions(+), 1 deletion(-) diff --git a/src/cli/readarr/delete_command_handler.rs b/src/cli/readarr/delete_command_handler.rs index 7e69bcfb..35ef2188 100644 --- a/src/cli/readarr/delete_command_handler.rs +++ b/src/cli/readarr/delete_command_handler.rs @@ -41,6 +41,11 @@ pub enum ReadarrDeleteCommand { #[arg(long, help = "The ID of the book file to delete", required = true)] book_file_id: i64, }, + #[command(about = "Delete the specified download")] + Download { + #[arg(long, help = "The ID of the download to delete", required = true)] + download_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)] @@ -121,6 +126,13 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, ReadarrDeleteCommand> .await?; serde_json::to_string_pretty(&resp)? } + ReadarrDeleteCommand::Download { download_id } => { + let resp = self + .network + .handle_network_event(ReadarrEvent::DeleteDownload(download_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 ae2cea42..3b763ee9 100644 --- a/src/cli/readarr/delete_command_handler_tests.rs +++ b/src/cli/readarr/delete_command_handler_tests.rs @@ -226,6 +226,55 @@ mod tests { assert_eq!(delete_command, expected_args); } + #[test] + fn test_delete_download_requires_arguments() { + let result = + Cli::command().try_get_matches_from(["managarr", "readarr", "delete", "download"]); + + assert_err!(&result); + assert_eq!( + result.unwrap_err().kind(), + ErrorKind::MissingRequiredArgument + ); + } + + #[test] + fn test_delete_download_download_id_requires_a_number() { + let result = Cli::command().try_get_matches_from([ + "managarr", + "readarr", + "delete", + "download", + "--download-id", + "not_a_number", + ]); + + assert_err!(&result); + assert_eq!(result.unwrap_err().kind(), ErrorKind::ValueValidation); + } + + #[test] + fn test_delete_download_success() { + let expected_args = ReadarrDeleteCommand::Download { download_id: 1 }; + + let result = Cli::try_parse_from([ + "managarr", + "readarr", + "delete", + "download", + "--download-id", + "1", + ]); + + 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 = @@ -427,6 +476,29 @@ mod tests { assert_ok!(&result); } + #[tokio::test] + async fn test_handle_delete_download_command() { + let mut mock_network = MockNetworkTrait::new(); + mock_network + .expect_handle_network_event() + .with(eq::(ReadarrEvent::DeleteDownload(1).into())) + .times(1) + .returning(|_| { + Ok(Serdeable::Readarr(ReadarrSerdeable::Value( + json!({"testResponse": "response"}), + ))) + }); + let app_arc = Arc::new(Mutex::new(App::test_default())); + let delete_download_command = ReadarrDeleteCommand::Download { download_id: 1 }; + + let result = + ReadarrDeleteCommandHandler::with(&app_arc, delete_download_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/downloads/mod.rs b/src/network/readarr_network/downloads/mod.rs index 2613c491..3ec87086 100644 --- a/src/network/readarr_network/downloads/mod.rs +++ b/src/network/readarr_network/downloads/mod.rs @@ -10,6 +10,28 @@ use crate::network::{Network, RequestMethod}; mod readarr_downloads_network_tests; impl Network<'_, '_> { + pub(in crate::network::readarr_network) async fn delete_readarr_download( + &mut self, + download_id: i64, + ) -> Result<()> { + let event = ReadarrEvent::DeleteDownload(download_id); + info!("Deleting Readarr download for download with id: {download_id}"); + + let request_props = self + .request_props_from( + event, + RequestMethod::Delete, + None::<()>, + Some(format!("/{download_id}")), + None, + ) + .await; + + self + .handle_request::<(), ()>(request_props, |_, _| ()) + .await + } + pub(in crate::network::readarr_network) async fn get_readarr_downloads( &mut self, count: u64, diff --git a/src/network/readarr_network/downloads/readarr_downloads_network_tests.rs b/src/network/readarr_network/downloads/readarr_downloads_network_tests.rs index 303ccddd..8d90ce7a 100644 --- a/src/network/readarr_network/downloads/readarr_downloads_network_tests.rs +++ b/src/network/readarr_network/downloads/readarr_downloads_network_tests.rs @@ -9,6 +9,41 @@ mod tests { use pretty_assertions::assert_eq; use serde_json::{Value, json}; + #[tokio::test] + async fn test_handle_delete_readarr_download_event() { + let (mock, app, _server) = MockServarrApi::delete() + .path("/7") + .build_for(ReadarrEvent::DeleteDownload(7)) + .await; + app.lock().await.server_tabs.set_index(3); + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::DeleteDownload(7)) + .await; + + mock.assert_async().await; + assert_ok!(result); + } + + #[tokio::test] + async fn test_handle_delete_readarr_download_event_failure() { + let (mock, app, _server) = MockServarrApi::delete() + .path("/7") + .status(500) + .build_for(ReadarrEvent::DeleteDownload(7)) + .await; + app.lock().await.server_tabs.set_index(3); + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::DeleteDownload(7)) + .await; + + mock.assert_async().await; + assert_err!(result); + } + #[tokio::test] async fn test_handle_get_downloads_event() { let downloads_json = json!({ diff --git a/src/network/readarr_network/mod.rs b/src/network/readarr_network/mod.rs index 4bba1c86..39062509 100644 --- a/src/network/readarr_network/mod.rs +++ b/src/network/readarr_network/mod.rs @@ -31,6 +31,7 @@ pub enum ReadarrEvent { DeleteAuthor(DeleteParams), DeleteBook(DeleteParams), DeleteBookFile(i64), + DeleteDownload(i64), DeleteRootFolder(i64), DeleteTag(i64), EditAuthor(EditAuthorParams), @@ -95,7 +96,7 @@ impl NetworkResource for ReadarrEvent { ReadarrEvent::GetLogs(_) => "/log", ReadarrEvent::GetMetadataProfiles => "/metadataprofile", ReadarrEvent::GetQualityProfiles => "/qualityprofile", - ReadarrEvent::GetDownloads(_) => "/queue", + ReadarrEvent::DeleteDownload(_) | ReadarrEvent::GetDownloads(_) => "/queue", ReadarrEvent::AddRootFolder(_) | ReadarrEvent::DeleteRootFolder(_) | ReadarrEvent::GetRootFolders => "/rootfolder", @@ -137,6 +138,10 @@ impl Network<'_, '_> { .delete_readarr_book_file(book_file_id) .await .map(ReadarrSerdeable::from), + ReadarrEvent::DeleteDownload(download_id) => self + .delete_readarr_download(download_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 9d4fc8c0..7bbfde94 100644 --- a/src/network/readarr_network/readarr_network_tests.rs +++ b/src/network/readarr_network/readarr_network_tests.rs @@ -44,6 +44,7 @@ mod tests { #[case(ReadarrEvent::GetLogs(500), "/log")] #[case(ReadarrEvent::GetMetadataProfiles, "/metadataprofile")] #[case(ReadarrEvent::GetQualityProfiles, "/qualityprofile")] + #[case(ReadarrEvent::DeleteDownload(1), "/queue")] #[case(ReadarrEvent::GetDownloads(500), "/queue")] #[case( ReadarrEvent::AddRootFolder(AddReadarrRootFolderBody::default()),