From fbfd64eb2ab47a04534643f63f9a07322d7b3e7f Mon Sep 17 00:00:00 2001 From: Alex Clarke Date: Thu, 27 Aug 2026 16:19:49 -0600 Subject: [PATCH] feat(readarr): delete a book and expose the command on the CLI The delete flags travel as query parameters rather than a request body, and Readarr spells the exclusion key addImportListExclusion, not the addImportExclusion that Radarr uses. --- src/cli/readarr/delete_command_handler.rs | 25 ++++ .../readarr/delete_command_handler_tests.rs | 107 ++++++++++++++++++ .../readarr_network/library/books/mod.rs | 34 +++++- .../books/readarr_books_network_tests.rs | 56 ++++++++- src/network/readarr_network/mod.rs | 8 +- .../readarr_network/readarr_network_tests.rs | 1 + 6 files changed, 228 insertions(+), 3 deletions(-) diff --git a/src/cli/readarr/delete_command_handler.rs b/src/cli/readarr/delete_command_handler.rs index 118a50c6..7667160c 100644 --- a/src/cli/readarr/delete_command_handler.rs +++ b/src/cli/readarr/delete_command_handler.rs @@ -27,6 +27,15 @@ pub enum ReadarrDeleteCommand { #[arg(long, help = "Add a list exclusion for this author")] add_list_exclusion: bool, }, + #[command(about = "Delete a book from your Readarr library")] + Book { + #[arg(long, help = "The ID of the book to delete", required = true)] + book_id: i64, + #[arg(long, help = "Delete the book files from disk as well")] + delete_files_from_disk: bool, + #[arg(long, help = "Add a list exclusion for this book")] + add_list_exclusion: bool, + }, #[command(about = "Delete the root folder with the given ID")] RootFolder { #[arg(long, help = "The ID of the root folder to delete", required = true)] @@ -84,6 +93,22 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, ReadarrDeleteCommand> .await?; serde_json::to_string_pretty(&resp)? } + ReadarrDeleteCommand::Book { + book_id, + delete_files_from_disk, + add_list_exclusion, + } => { + let delete_book_params = DeleteParams { + id: book_id, + delete_files: delete_files_from_disk, + add_import_list_exclusion: add_list_exclusion, + }; + let resp = self + .network + .handle_network_event(ReadarrEvent::DeleteBook(delete_book_params).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 4d4ee145..21488b2b 100644 --- a/src/cli/readarr/delete_command_handler_tests.rs +++ b/src/cli/readarr/delete_command_handler_tests.rs @@ -104,6 +104,79 @@ mod tests { assert_eq!(delete_command, expected_args); } + #[test] + fn test_delete_book_requires_arguments() { + let result = Cli::command().try_get_matches_from(["managarr", "readarr", "delete", "book"]); + + assert_err!(&result); + assert_eq!( + result.unwrap_err().kind(), + ErrorKind::MissingRequiredArgument + ); + } + + #[test] + fn test_delete_book_book_id_requires_a_number() { + let result = Cli::command().try_get_matches_from([ + "managarr", + "readarr", + "delete", + "book", + "--book-id", + "not_a_number", + ]); + + assert_err!(&result); + assert_eq!(result.unwrap_err().kind(), ErrorKind::ValueValidation); + } + + #[test] + fn test_delete_book_defaults() { + let expected_args = ReadarrDeleteCommand::Book { + book_id: 1, + delete_files_from_disk: false, + add_list_exclusion: false, + }; + + let result = Cli::try_parse_from(["managarr", "readarr", "delete", "book", "--book-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_book_all_args_defined() { + let expected_args = ReadarrDeleteCommand::Book { + book_id: 1, + delete_files_from_disk: true, + add_list_exclusion: true, + }; + + let result = Cli::try_parse_from([ + "managarr", + "readarr", + "delete", + "book", + "--book-id", + "1", + "--delete-files-from-disk", + "--add-list-exclusion", + ]); + + 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 = @@ -248,6 +321,40 @@ mod tests { assert_ok!(&result); } + #[tokio::test] + async fn test_handle_delete_book_command() { + let expected_delete_book_params = DeleteParams { + id: 1, + delete_files: true, + add_import_list_exclusion: false, + }; + let mut mock_network = MockNetworkTrait::new(); + mock_network + .expect_handle_network_event() + .with(eq::( + ReadarrEvent::DeleteBook(expected_delete_book_params).into(), + )) + .times(1) + .returning(|_| { + Ok(Serdeable::Readarr(ReadarrSerdeable::Value( + json!({"testResponse": "response"}), + ))) + }); + let app_arc = Arc::new(Mutex::new(App::test_default())); + let delete_book_command = ReadarrDeleteCommand::Book { + book_id: 1, + delete_files_from_disk: true, + add_list_exclusion: false, + }; + + let result = + ReadarrDeleteCommandHandler::with(&app_arc, delete_book_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/library/books/mod.rs b/src/network/readarr_network/library/books/mod.rs index 2f4e9d56..b4cb29e7 100644 --- a/src/network/readarr_network/library/books/mod.rs +++ b/src/network/readarr_network/library/books/mod.rs @@ -4,7 +4,7 @@ use serde_json::{Value, json}; use crate::models::Route; use crate::models::readarr_models::{ - Book, BookFile, Edition, ReadarrCommandBody, ReadarrHistoryItem, + Book, BookFile, DeleteParams, Edition, ReadarrCommandBody, ReadarrHistoryItem, }; use crate::models::servarr_data::readarr::readarr_data::ActiveReadarrBlock; use crate::network::readarr_network::ReadarrEvent; @@ -15,6 +15,38 @@ use crate::network::{Network, RequestMethod}; mod readarr_books_network_tests; impl Network<'_, '_> { + pub(in crate::network::readarr_network) async fn delete_book( + &mut self, + delete_book_params: DeleteParams, + ) -> Result<()> { + let event = ReadarrEvent::DeleteBook(DeleteParams::default()); + let DeleteParams { + id, + delete_files, + add_import_list_exclusion, + } = delete_book_params; + + info!( + "Deleting Readarr book with ID: {id} with deleteFiles={delete_files} and addImportListExclusion={add_import_list_exclusion}" + ); + + let request_props = self + .request_props_from( + event, + RequestMethod::Delete, + None::<()>, + Some(format!("/{id}")), + Some(format!( + "deleteFiles={delete_files}&addImportListExclusion={add_import_list_exclusion}" + )), + ) + .await; + + self + .handle_request::<(), ()>(request_props, |_, _| ()) + .await + } + pub(in crate::network::readarr_network) async fn get_book_details( &mut self, book_id: i64, diff --git a/src/network/readarr_network/library/books/readarr_books_network_tests.rs b/src/network/readarr_network/library/books/readarr_books_network_tests.rs index d3b88315..dfb4fc5c 100644 --- a/src/network/readarr_network/library/books/readarr_books_network_tests.rs +++ b/src/network/readarr_network/library/books/readarr_books_network_tests.rs @@ -1,7 +1,7 @@ #[cfg(test)] mod tests { use crate::models::readarr_models::{ - Book, BookFile, Edition, ReadarrHistoryItem, ReadarrSerdeable, + Book, BookFile, DeleteParams, Edition, ReadarrHistoryItem, ReadarrSerdeable, }; use crate::models::servarr_data::readarr::modals::BookDetailsModal; use crate::models::servarr_data::readarr::readarr_data::ActiveReadarrBlock; @@ -18,6 +18,60 @@ mod tests { use rstest::rstest; use serde_json::{Value, json}; + #[rstest] + #[case(true, false, "deleteFiles=true&addImportListExclusion=false")] + #[case(false, true, "deleteFiles=false&addImportListExclusion=true")] + #[tokio::test] + async fn test_handle_delete_book_event( + #[case] delete_files: bool, + #[case] add_import_list_exclusion: bool, + #[case] expected_query: &str, + ) { + let delete_book_params = DeleteParams { + id: 1, + delete_files, + add_import_list_exclusion, + }; + let (mock, app, _server) = MockServarrApi::delete() + .path("/1") + .query(expected_query) + .build_for(ReadarrEvent::DeleteBook(delete_book_params.clone())) + .await; + app.lock().await.server_tabs.set_index(3); + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::DeleteBook(delete_book_params)) + .await; + + mock.assert_async().await; + assert_ok!(result); + } + + #[tokio::test] + async fn test_handle_delete_book_event_failure() { + let delete_book_params = DeleteParams { + id: 1, + delete_files: true, + add_import_list_exclusion: false, + }; + let (mock, app, _server) = MockServarrApi::delete() + .path("/1") + .query("deleteFiles=true&addImportListExclusion=false") + .status(500) + .build_for(ReadarrEvent::DeleteBook(delete_book_params.clone())) + .await; + app.lock().await.server_tabs.set_index(3); + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::DeleteBook(delete_book_params)) + .await; + + mock.assert_async().await; + assert_err!(result); + } + #[tokio::test] async fn test_handle_get_book_details_event() { let expected_book: Book = serde_json::from_str(BOOK_JSON).unwrap(); diff --git a/src/network/readarr_network/mod.rs b/src/network/readarr_network/mod.rs index 108a7e20..0a9f40f7 100644 --- a/src/network/readarr_network/mod.rs +++ b/src/network/readarr_network/mod.rs @@ -28,6 +28,7 @@ pub enum ReadarrEvent { AddRootFolder(AddReadarrRootFolderBody), AddTag(String), DeleteAuthor(DeleteParams), + DeleteBook(DeleteParams), DeleteRootFolder(i64), DeleteTag(i64), EditAuthor(EditAuthorParams), @@ -72,7 +73,8 @@ impl NetworkResource for ReadarrEvent { | ReadarrEvent::ListAuthors | ReadarrEvent::ToggleAuthorMonitoring(_) => "/author", ReadarrEvent::SearchNewAuthor(_) => "/author/lookup", - ReadarrEvent::GetBookDetails(_) + ReadarrEvent::DeleteBook(_) + | ReadarrEvent::GetBookDetails(_) | ReadarrEvent::GetBooks(_) | ReadarrEvent::ToggleBookMonitoring(_) => "/book", ReadarrEvent::GetBookFiles(_) => "/bookfile", @@ -123,6 +125,10 @@ impl Network<'_, '_> { .delete_author(delete_author_params) .await .map(ReadarrSerdeable::from), + ReadarrEvent::DeleteBook(delete_book_params) => self + .delete_book(delete_book_params) + .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 a443d127..c0e205d8 100644 --- a/src/network/readarr_network/readarr_network_tests.rs +++ b/src/network/readarr_network/readarr_network_tests.rs @@ -22,6 +22,7 @@ mod tests { #[case(ReadarrEvent::ListAuthors, "/author")] #[case(ReadarrEvent::ToggleAuthorMonitoring(1), "/author")] #[case(ReadarrEvent::SearchNewAuthor(String::new()), "/author/lookup")] + #[case(ReadarrEvent::DeleteBook(DeleteParams::default()), "/book")] #[case(ReadarrEvent::GetBookDetails(1), "/book")] #[case(ReadarrEvent::GetBooks(1), "/book")] #[case(ReadarrEvent::ToggleBookMonitoring(1), "/book")]