From fb91c2edd61d3241a809d5c21f74fd00b501dcbf Mon Sep 17 00:00:00 2001 From: Alex Clarke Date: Tue, 1 Sep 2026 16:38:09 -0600 Subject: [PATCH] feat(readarr): delete an item from the blocklist and expose the command on the CLI --- src/cli/readarr/delete_command_handler.rs | 16 ++++ .../readarr/delete_command_handler_tests.rs | 81 +++++++++++++++++++ src/network/readarr_network/blocklist/mod.rs | 22 +++++ .../readarr_blocklist_network_tests.rs | 35 ++++++++ src/network/readarr_network/mod.rs | 6 ++ .../readarr_network/readarr_network_tests.rs | 1 + 6 files changed, 161 insertions(+) diff --git a/src/cli/readarr/delete_command_handler.rs b/src/cli/readarr/delete_command_handler.rs index 35ef2188..cf280076 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 the specified item from the Readarr blocklist")] + BlocklistItem { + #[arg( + long, + help = "The ID of the blocklist item to remove from the blocklist", + required = true + )] + blocklist_item_id: i64, + }, #[command(about = "Delete a book from your Readarr library")] Book { #[arg(long, help = "The ID of the book to delete", required = true)] @@ -103,6 +112,13 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, ReadarrDeleteCommand> .await?; serde_json::to_string_pretty(&resp)? } + ReadarrDeleteCommand::BlocklistItem { blocklist_item_id } => { + let resp = self + .network + .handle_network_event(ReadarrEvent::DeleteBlocklistItem(blocklist_item_id).into()) + .await?; + serde_json::to_string_pretty(&resp)? + } ReadarrDeleteCommand::Book { book_id, delete_files_from_disk, diff --git a/src/cli/readarr/delete_command_handler_tests.rs b/src/cli/readarr/delete_command_handler_tests.rs index 3b763ee9..5cb6b2b2 100644 --- a/src/cli/readarr/delete_command_handler_tests.rs +++ b/src/cli/readarr/delete_command_handler_tests.rs @@ -104,6 +104,57 @@ mod tests { assert_eq!(delete_command, expected_args); } + #[test] + fn test_delete_blocklist_item_requires_arguments() { + let result = + Cli::command().try_get_matches_from(["managarr", "readarr", "delete", "blocklist-item"]); + + assert_err!(&result); + assert_eq!( + result.unwrap_err().kind(), + ErrorKind::MissingRequiredArgument + ); + } + + #[test] + fn test_delete_blocklist_item_blocklist_item_id_requires_a_number() { + let result = Cli::command().try_get_matches_from([ + "managarr", + "readarr", + "delete", + "blocklist-item", + "--blocklist-item-id", + "not_a_number", + ]); + + assert_err!(&result); + assert_eq!(result.unwrap_err().kind(), ErrorKind::ValueValidation); + } + + #[test] + fn test_delete_blocklist_item_success() { + let expected_args = ReadarrDeleteCommand::BlocklistItem { + blocklist_item_id: 7, + }; + + let result = Cli::try_parse_from([ + "managarr", + "readarr", + "delete", + "blocklist-item", + "--blocklist-item-id", + "7", + ]); + + 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_requires_arguments() { let result = Cli::command().try_get_matches_from(["managarr", "readarr", "delete", "book"]); @@ -453,6 +504,36 @@ mod tests { assert_ok!(&result); } + #[tokio::test] + async fn test_handle_delete_blocklist_item_command() { + let mut mock_network = MockNetworkTrait::new(); + mock_network + .expect_handle_network_event() + .with(eq::( + ReadarrEvent::DeleteBlocklistItem(7).into(), + )) + .times(1) + .returning(|_| { + Ok(Serdeable::Readarr(ReadarrSerdeable::Value( + json!({"testResponse": "response"}), + ))) + }); + let app_arc = Arc::new(Mutex::new(App::test_default())); + let delete_blocklist_item_command = ReadarrDeleteCommand::BlocklistItem { + blocklist_item_id: 7, + }; + + let result = ReadarrDeleteCommandHandler::with( + &app_arc, + delete_blocklist_item_command, + &mut mock_network, + ) + .handle() + .await; + + assert_ok!(&result); + } + #[tokio::test] async fn test_handle_delete_book_file_command() { let mut mock_network = MockNetworkTrait::new(); diff --git a/src/network/readarr_network/blocklist/mod.rs b/src/network/readarr_network/blocklist/mod.rs index 1268b0c7..4a773997 100644 --- a/src/network/readarr_network/blocklist/mod.rs +++ b/src/network/readarr_network/blocklist/mod.rs @@ -12,6 +12,28 @@ use crate::network::{Network, RequestMethod}; mod readarr_blocklist_network_tests; impl Network<'_, '_> { + pub(in crate::network::readarr_network) async fn delete_readarr_blocklist_item( + &mut self, + blocklist_item_id: i64, + ) -> Result<()> { + info!("Deleting Readarr blocklist item for item with id: {blocklist_item_id}"); + let event = ReadarrEvent::DeleteBlocklistItem(blocklist_item_id); + + let request_props = self + .request_props_from( + event, + RequestMethod::Delete, + None::<()>, + Some(format!("/{blocklist_item_id}")), + None, + ) + .await; + + self + .handle_request::<(), ()>(request_props, |_, _| ()) + .await + } + pub(in crate::network::readarr_network) async fn get_readarr_blocklist( &mut self, ) -> Result { diff --git a/src/network/readarr_network/blocklist/readarr_blocklist_network_tests.rs b/src/network/readarr_network/blocklist/readarr_blocklist_network_tests.rs index e005fae9..042cf920 100644 --- a/src/network/readarr_network/blocklist/readarr_blocklist_network_tests.rs +++ b/src/network/readarr_network/blocklist/readarr_blocklist_network_tests.rs @@ -12,6 +12,41 @@ mod tests { use rstest::rstest; use serde_json::{Number, Value, json}; + #[tokio::test] + async fn test_handle_delete_readarr_blocklist_item_event() { + let (mock, app, _server) = MockServarrApi::delete() + .path("/7") + .build_for(ReadarrEvent::DeleteBlocklistItem(7)) + .await; + app.lock().await.server_tabs.set_index(3); + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::DeleteBlocklistItem(7)) + .await; + + mock.assert_async().await; + assert_ok!(result); + } + + #[tokio::test] + async fn test_handle_delete_readarr_blocklist_item_event_failure() { + let (mock, app, _server) = MockServarrApi::delete() + .path("/7") + .status(500) + .build_for(ReadarrEvent::DeleteBlocklistItem(7)) + .await; + app.lock().await.server_tabs.set_index(3); + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::DeleteBlocklistItem(7)) + .await; + + mock.assert_async().await; + assert_err!(result); + } + #[rstest] #[tokio::test] async fn test_handle_get_readarr_blocklist_event( diff --git a/src/network/readarr_network/mod.rs b/src/network/readarr_network/mod.rs index 17c142e5..1e8bcd70 100644 --- a/src/network/readarr_network/mod.rs +++ b/src/network/readarr_network/mod.rs @@ -31,6 +31,7 @@ pub enum ReadarrEvent { AddRootFolder(AddReadarrRootFolderBody), AddTag(String), DeleteAuthor(DeleteParams), + DeleteBlocklistItem(i64), DeleteBook(DeleteParams), DeleteBookFile(i64), DeleteDownload(i64), @@ -86,6 +87,7 @@ impl NetworkResource for ReadarrEvent { | ReadarrEvent::ListAuthors | ReadarrEvent::ToggleAuthorMonitoring(_) => "/author", ReadarrEvent::SearchNewAuthor(_) => "/author/lookup", + ReadarrEvent::DeleteBlocklistItem(_) => "/blocklist", ReadarrEvent::GetBlocklist => "/blocklist?page=1&pageSize=10000", ReadarrEvent::DeleteBook(_) | ReadarrEvent::GetBookDetails(_) @@ -146,6 +148,10 @@ impl Network<'_, '_> { .delete_author(delete_author_params) .await .map(ReadarrSerdeable::from), + ReadarrEvent::DeleteBlocklistItem(blocklist_item_id) => self + .delete_readarr_blocklist_item(blocklist_item_id) + .await + .map(ReadarrSerdeable::from), ReadarrEvent::DeleteBook(delete_book_params) => self .delete_book(delete_book_params) .await diff --git a/src/network/readarr_network/readarr_network_tests.rs b/src/network/readarr_network/readarr_network_tests.rs index 5f3bdd5e..4278fe85 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::DeleteBlocklistItem(1), "/blocklist")] #[case(ReadarrEvent::GetBlocklist, "/blocklist?page=1&pageSize=10000")] #[case(ReadarrEvent::DeleteBook(DeleteParams::default()), "/book")] #[case(ReadarrEvent::GetBookDetails(1), "/book")]