From c94b2a40d006e1ed1e5a021755cd51d229fdf67c Mon Sep 17 00:00:00 2001 From: Alex Clarke Date: Tue, 1 Sep 2026 16:44:07 -0600 Subject: [PATCH] feat(readarr): clear the blocklist and expose the command on the CLI --- src/cli/readarr/mod.rs | 13 ++++ src/cli/readarr/readarr_command_tests.rs | 44 +++++++++++- src/network/readarr_network/blocklist/mod.rs | 34 +++++++++ .../readarr_blocklist_network_tests.rs | 71 +++++++++++++++++++ src/network/readarr_network/mod.rs | 6 ++ .../readarr_network/readarr_network_tests.rs | 1 + 6 files changed, 168 insertions(+), 1 deletion(-) diff --git a/src/cli/readarr/mod.rs b/src/cli/readarr/mod.rs index f0295f61..774dc62c 100644 --- a/src/cli/readarr/mod.rs +++ b/src/cli/readarr/mod.rs @@ -69,6 +69,8 @@ pub enum ReadarrCommand { about = "Commands to trigger automatic searches for releases of different resources in your Readarr instance" )] TriggerAutomaticSearch(ReadarrTriggerAutomaticSearchCommand), + #[command(about = "Clear the Readarr blocklist")] + ClearBlocklist, #[command(about = "Manually download the given release")] DownloadRelease { #[arg(long, help = "The GUID of the release to download", required = true)] @@ -196,6 +198,17 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, ReadarrCommand> for ReadarrCliHandler<'a, .handle() .await? } + ReadarrCommand::ClearBlocklist => { + self + .network + .handle_network_event(ReadarrEvent::GetBlocklist.into()) + .await?; + let resp = self + .network + .handle_network_event(ReadarrEvent::ClearBlocklist.into()) + .await?; + serde_json::to_string_pretty(&resp)? + } ReadarrCommand::DownloadRelease { guid, indexer_id } => { let params = ReleaseDownloadBody { guid, indexer_id }; let resp = self diff --git a/src/cli/readarr/readarr_command_tests.rs b/src/cli/readarr/readarr_command_tests.rs index a4a19013..c61d1cd2 100644 --- a/src/cli/readarr/readarr_command_tests.rs +++ b/src/cli/readarr/readarr_command_tests.rs @@ -188,6 +188,13 @@ mod tests { ); } + #[test] + fn test_clear_blocklist_has_no_arg_requirements() { + let result = Cli::command().try_get_matches_from(["managarr", "readarr", "clear-blocklist"]); + + assert_ok!(&result); + } + #[test] fn test_toggle_book_monitoring_requirements_satisfied() { let result = Cli::command().try_get_matches_from([ @@ -209,7 +216,9 @@ mod tests { use serde_json::json; use tokio::sync::Mutex; - use crate::models::readarr_models::{ReadarrSerdeable, ReadarrTaskName}; + use crate::models::readarr_models::{ + BlocklistItem, BlocklistResponse, ReadarrSerdeable, ReadarrTaskName, + }; use crate::models::servarr_models::ReleaseDownloadBody; use crate::{ app::App, @@ -390,5 +399,38 @@ mod tests { assert_ok!(&result); } + + #[tokio::test] + async fn test_clear_blocklist_command() { + let mut mock_network = MockNetworkTrait::new(); + mock_network + .expect_handle_network_event() + .with(eq::(ReadarrEvent::GetBlocklist.into())) + .times(1) + .returning(|_| { + Ok(Serdeable::Readarr(ReadarrSerdeable::BlocklistResponse( + BlocklistResponse { + records: vec![BlocklistItem::default()], + }, + ))) + }); + mock_network + .expect_handle_network_event() + .with(eq::(ReadarrEvent::ClearBlocklist.into())) + .times(1) + .returning(|_| { + Ok(Serdeable::Readarr(ReadarrSerdeable::Value( + json!({"testResponse": "response"}), + ))) + }); + let app_arc = Arc::new(Mutex::new(App::test_default())); + let clear_blocklist_command = ReadarrCommand::ClearBlocklist; + + let result = ReadarrCliHandler::with(&app_arc, clear_blocklist_command, &mut mock_network) + .handle() + .await; + + assert_ok!(&result); + } } } diff --git a/src/network/readarr_network/blocklist/mod.rs b/src/network/readarr_network/blocklist/mod.rs index 4a773997..15f98037 100644 --- a/src/network/readarr_network/blocklist/mod.rs +++ b/src/network/readarr_network/blocklist/mod.rs @@ -1,5 +1,6 @@ use anyhow::Result; use log::info; +use serde_json::{Value, json}; use crate::models::Route; use crate::models::readarr_models::{BlocklistItem, BlocklistResponse}; @@ -12,6 +13,39 @@ use crate::network::{Network, RequestMethod}; mod readarr_blocklist_network_tests; impl Network<'_, '_> { + pub(in crate::network::readarr_network) async fn clear_readarr_blocklist( + &mut self, + ) -> Result<()> { + info!("Clearing Readarr blocklist"); + let event = ReadarrEvent::ClearBlocklist; + + let ids = self + .app + .lock() + .await + .data + .readarr_data + .blocklist + .items + .iter() + .map(|item| item.id) + .collect::>(); + + let request_props = self + .request_props_from( + event, + RequestMethod::Delete, + Some(json!({ "ids": ids })), + None, + None, + ) + .await; + + self + .handle_request::(request_props, |_, _| ()) + .await + } + pub(in crate::network::readarr_network) async fn delete_readarr_blocklist_item( &mut self, blocklist_item_id: i64, 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 042cf920..e2f56609 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,77 @@ mod tests { use rstest::rstest; use serde_json::{Number, Value, json}; + #[tokio::test] + async fn test_handle_clear_readarr_blocklist_event() { + let blocklist_items = vec![ + BlocklistItem { + id: 7, + ..blocklist_item() + }, + BlocklistItem { + id: 42, + ..blocklist_item() + }, + BlocklistItem { + id: 99, + ..blocklist_item() + }, + ]; + let (mock, app, _server) = MockServarrApi::delete() + .with_request_body(json!({ "ids": [7, 42, 99] })) + .build_for(ReadarrEvent::ClearBlocklist) + .await; + { + let mut app = app.lock().await; + app.server_tabs.set_index(3); + app.data.readarr_data.blocklist.set_items(blocklist_items); + } + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::ClearBlocklist) + .await; + + mock.assert_async().await; + assert_ok!(result); + } + + #[tokio::test] + async fn test_handle_clear_readarr_blocklist_event_failure() { + let blocklist_items = vec![ + BlocklistItem { + id: 7, + ..blocklist_item() + }, + BlocklistItem { + id: 42, + ..blocklist_item() + }, + BlocklistItem { + id: 99, + ..blocklist_item() + }, + ]; + let (mock, app, _server) = MockServarrApi::delete() + .with_request_body(json!({ "ids": [7, 42, 99] })) + .status(500) + .build_for(ReadarrEvent::ClearBlocklist) + .await; + { + let mut app = app.lock().await; + app.server_tabs.set_index(3); + app.data.readarr_data.blocklist.set_items(blocklist_items); + } + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::ClearBlocklist) + .await; + + mock.assert_async().await; + assert_err!(result); + } + #[tokio::test] async fn test_handle_delete_readarr_blocklist_item_event() { let (mock, app, _server) = MockServarrApi::delete() diff --git a/src/network/readarr_network/mod.rs b/src/network/readarr_network/mod.rs index 1e8bcd70..4a35ee10 100644 --- a/src/network/readarr_network/mod.rs +++ b/src/network/readarr_network/mod.rs @@ -30,6 +30,7 @@ pub enum ReadarrEvent { AddAuthor(AddAuthorBody), AddRootFolder(AddReadarrRootFolderBody), AddTag(String), + ClearBlocklist, DeleteAuthor(DeleteParams), DeleteBlocklistItem(i64), DeleteBook(DeleteParams), @@ -88,6 +89,7 @@ impl NetworkResource for ReadarrEvent { | ReadarrEvent::ToggleAuthorMonitoring(_) => "/author", ReadarrEvent::SearchNewAuthor(_) => "/author/lookup", ReadarrEvent::DeleteBlocklistItem(_) => "/blocklist", + ReadarrEvent::ClearBlocklist => "/blocklist/bulk", ReadarrEvent::GetBlocklist => "/blocklist?page=1&pageSize=10000", ReadarrEvent::DeleteBook(_) | ReadarrEvent::GetBookDetails(_) @@ -144,6 +146,10 @@ impl Network<'_, '_> { .await .map(ReadarrSerdeable::from), ReadarrEvent::AddTag(tag) => self.add_readarr_tag(tag).await.map(ReadarrSerdeable::from), + ReadarrEvent::ClearBlocklist => self + .clear_readarr_blocklist() + .await + .map(ReadarrSerdeable::from), ReadarrEvent::DeleteAuthor(delete_author_params) => self .delete_author(delete_author_params) .await diff --git a/src/network/readarr_network/readarr_network_tests.rs b/src/network/readarr_network/readarr_network_tests.rs index 4278fe85..01f76e60 100644 --- a/src/network/readarr_network/readarr_network_tests.rs +++ b/src/network/readarr_network/readarr_network_tests.rs @@ -23,6 +23,7 @@ mod tests { #[case(ReadarrEvent::ToggleAuthorMonitoring(1), "/author")] #[case(ReadarrEvent::SearchNewAuthor(String::new()), "/author/lookup")] #[case(ReadarrEvent::DeleteBlocklistItem(1), "/blocklist")] + #[case(ReadarrEvent::ClearBlocklist, "/blocklist/bulk")] #[case(ReadarrEvent::GetBlocklist, "/blocklist?page=1&pageSize=10000")] #[case(ReadarrEvent::DeleteBook(DeleteParams::default()), "/book")] #[case(ReadarrEvent::GetBookDetails(1), "/book")]