From e1be1df68ac2e171d39b12767b536e35cb677140 Mon Sep 17 00:00:00 2001 From: Alex Clarke Date: Wed, 26 Aug 2026 10:38:58 -0600 Subject: [PATCH] feat(readarr): delete Readarr root folders 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/mod.rs | 9 ++- .../readarr_network/readarr_network_tests.rs | 1 + .../readarr_network/root_folders/mod.rs | 22 ++++++ .../readarr_root_folders_network_tests.rs | 35 +++++++++ 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 cb483c90..a4da3e5c 100644 --- a/src/cli/readarr/delete_command_handler.rs +++ b/src/cli/readarr/delete_command_handler.rs @@ -17,6 +17,11 @@ mod delete_command_handler_tests; #[derive(Debug, Clone, PartialEq, Eq, Subcommand)] pub enum ReadarrDeleteCommand { + #[command(about = "Delete the root folder with the given ID")] + RootFolder { + #[arg(long, help = "The ID of the root folder to delete", required = true)] + root_folder_id: i64, + }, #[command(about = "Delete the tag with the specified ID")] Tag { #[arg(long, help = "The ID of the tag to delete", required = true)] @@ -53,6 +58,13 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, ReadarrDeleteCommand> async fn handle(self) -> Result { let result = match self.command { + ReadarrDeleteCommand::RootFolder { root_folder_id } => { + let resp = self + .network + .handle_network_event(ReadarrEvent::DeleteRootFolder(root_folder_id).into()) + .await?; + serde_json::to_string_pretty(&resp)? + } ReadarrDeleteCommand::Tag { tag_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 a1ccd3d1..3487186a 100644 --- a/src/cli/readarr/delete_command_handler_tests.rs +++ b/src/cli/readarr/delete_command_handler_tests.rs @@ -24,6 +24,55 @@ mod tests { use super::*; use pretty_assertions::assert_eq; + #[test] + fn test_delete_root_folder_requires_arguments() { + let result = + Cli::command().try_get_matches_from(["managarr", "readarr", "delete", "root-folder"]); + + assert_err!(&result); + assert_eq!( + result.unwrap_err().kind(), + ErrorKind::MissingRequiredArgument + ); + } + + #[test] + fn test_delete_root_folder_root_folder_id_requires_a_number() { + let result = Cli::command().try_get_matches_from([ + "managarr", + "readarr", + "delete", + "root-folder", + "--root-folder-id", + "not_a_number", + ]); + + assert_err!(&result); + assert_eq!(result.unwrap_err().kind(), ErrorKind::ValueValidation); + } + + #[test] + fn test_delete_root_folder_success() { + let expected_args = ReadarrDeleteCommand::RootFolder { root_folder_id: 1 }; + + let result = Cli::try_parse_from([ + "managarr", + "readarr", + "delete", + "root-folder", + "--root-folder-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_tag_requires_arguments() { let result = Cli::command().try_get_matches_from(["managarr", "readarr", "delete", "tag"]); @@ -85,6 +134,29 @@ mod tests { network::{MockNetworkTrait, NetworkEvent}, }; + #[tokio::test] + async fn test_handle_delete_root_folder_command() { + let mut mock_network = MockNetworkTrait::new(); + mock_network + .expect_handle_network_event() + .with(eq::(ReadarrEvent::DeleteRootFolder(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_root_folder_command = ReadarrDeleteCommand::RootFolder { root_folder_id: 1 }; + + let result = + ReadarrDeleteCommandHandler::with(&app_arc, delete_root_folder_command, &mut mock_network) + .handle() + .await; + + assert_ok!(&result); + } + #[tokio::test] async fn test_handle_delete_tag_command() { let mut mock_network = MockNetworkTrait::new(); diff --git a/src/network/readarr_network/mod.rs b/src/network/readarr_network/mod.rs index bce1edc4..3fc0878c 100644 --- a/src/network/readarr_network/mod.rs +++ b/src/network/readarr_network/mod.rs @@ -18,6 +18,7 @@ mod readarr_network_tests; pub enum ReadarrEvent { AddRootFolder(AddReadarrRootFolderBody), AddTag(String), + DeleteRootFolder(i64), DeleteTag(i64), GetDiskSpace, GetHostConfig, @@ -45,7 +46,9 @@ impl NetworkResource for ReadarrEvent { ReadarrEvent::GetLogs(_) => "/log", ReadarrEvent::GetMetadataProfiles => "/metadataprofile", ReadarrEvent::GetQualityProfiles => "/qualityprofile", - ReadarrEvent::AddRootFolder(_) | ReadarrEvent::GetRootFolders => "/rootfolder", + ReadarrEvent::AddRootFolder(_) + | ReadarrEvent::DeleteRootFolder(_) + | ReadarrEvent::GetRootFolders => "/rootfolder", ReadarrEvent::GetStatus => "/system/status", ReadarrEvent::GetTasks => "/system/task", ReadarrEvent::AddTag(_) | ReadarrEvent::DeleteTag(_) | ReadarrEvent::GetTags => "/tag", @@ -71,6 +74,10 @@ impl Network<'_, '_> { .await .map(ReadarrSerdeable::from), ReadarrEvent::AddTag(tag) => self.add_readarr_tag(tag).await.map(ReadarrSerdeable::from), + ReadarrEvent::DeleteRootFolder(root_folder_id) => self + .delete_readarr_root_folder(root_folder_id) + .await + .map(ReadarrSerdeable::from), ReadarrEvent::DeleteTag(tag_id) => self .delete_readarr_tag(tag_id) .await diff --git a/src/network/readarr_network/readarr_network_tests.rs b/src/network/readarr_network/readarr_network_tests.rs index 8fad713b..884fb639 100644 --- a/src/network/readarr_network/readarr_network_tests.rs +++ b/src/network/readarr_network/readarr_network_tests.rs @@ -26,6 +26,7 @@ mod tests { ReadarrEvent::AddRootFolder(AddReadarrRootFolderBody::default()), "/rootfolder" )] + #[case(ReadarrEvent::DeleteRootFolder(1), "/rootfolder")] #[case(ReadarrEvent::GetRootFolders, "/rootfolder")] #[case(ReadarrEvent::GetStatus, "/system/status")] #[case(ReadarrEvent::GetTasks, "/system/task")] diff --git a/src/network/readarr_network/root_folders/mod.rs b/src/network/readarr_network/root_folders/mod.rs index d683dc09..dca86c96 100644 --- a/src/network/readarr_network/root_folders/mod.rs +++ b/src/network/readarr_network/root_folders/mod.rs @@ -41,6 +41,28 @@ impl Network<'_, '_> { .await } + pub(in crate::network::readarr_network) async fn delete_readarr_root_folder( + &mut self, + root_folder_id: i64, + ) -> Result<()> { + info!("Deleting Readarr root folder with ID: {root_folder_id}"); + let event = ReadarrEvent::DeleteRootFolder(root_folder_id); + + let request_props = self + .request_props_from( + event, + RequestMethod::Delete, + None::<()>, + Some(format!("/{root_folder_id}")), + None, + ) + .await; + + self + .handle_request::<(), ()>(request_props, |_, _| ()) + .await + } + pub(in crate::network::readarr_network) async fn get_readarr_root_folders( &mut self, ) -> Result> { diff --git a/src/network/readarr_network/root_folders/readarr_root_folders_network_tests.rs b/src/network/readarr_network/root_folders/readarr_root_folders_network_tests.rs index 70eb63a8..3a1c8579 100644 --- a/src/network/readarr_network/root_folders/readarr_root_folders_network_tests.rs +++ b/src/network/readarr_network/root_folders/readarr_root_folders_network_tests.rs @@ -131,6 +131,41 @@ mod tests { assert_err!(result); } + #[tokio::test] + async fn test_handle_delete_readarr_root_folder_event() { + let (mock, app, _server) = MockServarrApi::delete() + .path("/1") + .build_for(ReadarrEvent::DeleteRootFolder(1)) + .await; + app.lock().await.server_tabs.set_index(3); + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::DeleteRootFolder(1)) + .await; + + mock.assert_async().await; + assert_ok!(result); + } + + #[tokio::test] + async fn test_handle_delete_readarr_root_folder_event_failure() { + let (mock, app, _server) = MockServarrApi::delete() + .path("/1") + .status(500) + .build_for(ReadarrEvent::DeleteRootFolder(1)) + .await; + app.lock().await.server_tabs.set_index(3); + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::DeleteRootFolder(1)) + .await; + + mock.assert_async().await; + assert_err!(result); + } + #[tokio::test] async fn test_handle_get_readarr_root_folders_event() { let root_folders_json = json!([