feat(readarr): delete an item from the blocklist and expose the command on the CLI
This commit is contained in:
6 files changed
+161
No files matched your search
@@ -27,6 +27,15 @@ pub enum ReadarrDeleteCommand {
|
|||||||
#[arg(long, help = "Add a list exclusion for this author")]
|
#[arg(long, help = "Add a list exclusion for this author")]
|
||||||
add_list_exclusion: bool,
|
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")]
|
#[command(about = "Delete a book from your Readarr library")]
|
||||||
Book {
|
Book {
|
||||||
#[arg(long, help = "The ID of the book to delete", required = true)]
|
#[arg(long, help = "The ID of the book to delete", required = true)]
|
||||||
@@ -103,6 +112,13 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, ReadarrDeleteCommand>
|
|||||||
.await?;
|
.await?;
|
||||||
serde_json::to_string_pretty(&resp)?
|
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 {
|
ReadarrDeleteCommand::Book {
|
||||||
book_id,
|
book_id,
|
||||||
delete_files_from_disk,
|
delete_files_from_disk,
|
||||||
|
|||||||
@@ -104,6 +104,57 @@ mod tests {
|
|||||||
assert_eq!(delete_command, expected_args);
|
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]
|
#[test]
|
||||||
fn test_delete_book_requires_arguments() {
|
fn test_delete_book_requires_arguments() {
|
||||||
let result = Cli::command().try_get_matches_from(["managarr", "readarr", "delete", "book"]);
|
let result = Cli::command().try_get_matches_from(["managarr", "readarr", "delete", "book"]);
|
||||||
@@ -453,6 +504,36 @@ mod tests {
|
|||||||
assert_ok!(&result);
|
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::<NetworkEvent>(
|
||||||
|
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]
|
#[tokio::test]
|
||||||
async fn test_handle_delete_book_file_command() {
|
async fn test_handle_delete_book_file_command() {
|
||||||
let mut mock_network = MockNetworkTrait::new();
|
let mut mock_network = MockNetworkTrait::new();
|
||||||
|
|||||||
@@ -12,6 +12,28 @@ use crate::network::{Network, RequestMethod};
|
|||||||
mod readarr_blocklist_network_tests;
|
mod readarr_blocklist_network_tests;
|
||||||
|
|
||||||
impl Network<'_, '_> {
|
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(
|
pub(in crate::network::readarr_network) async fn get_readarr_blocklist(
|
||||||
&mut self,
|
&mut self,
|
||||||
) -> Result<BlocklistResponse> {
|
) -> Result<BlocklistResponse> {
|
||||||
|
|||||||
@@ -12,6 +12,41 @@ mod tests {
|
|||||||
use rstest::rstest;
|
use rstest::rstest;
|
||||||
use serde_json::{Number, Value, json};
|
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]
|
#[rstest]
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_handle_get_readarr_blocklist_event(
|
async fn test_handle_get_readarr_blocklist_event(
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ pub enum ReadarrEvent {
|
|||||||
AddRootFolder(AddReadarrRootFolderBody),
|
AddRootFolder(AddReadarrRootFolderBody),
|
||||||
AddTag(String),
|
AddTag(String),
|
||||||
DeleteAuthor(DeleteParams),
|
DeleteAuthor(DeleteParams),
|
||||||
|
DeleteBlocklistItem(i64),
|
||||||
DeleteBook(DeleteParams),
|
DeleteBook(DeleteParams),
|
||||||
DeleteBookFile(i64),
|
DeleteBookFile(i64),
|
||||||
DeleteDownload(i64),
|
DeleteDownload(i64),
|
||||||
@@ -86,6 +87,7 @@ impl NetworkResource for ReadarrEvent {
|
|||||||
| ReadarrEvent::ListAuthors
|
| ReadarrEvent::ListAuthors
|
||||||
| ReadarrEvent::ToggleAuthorMonitoring(_) => "/author",
|
| ReadarrEvent::ToggleAuthorMonitoring(_) => "/author",
|
||||||
ReadarrEvent::SearchNewAuthor(_) => "/author/lookup",
|
ReadarrEvent::SearchNewAuthor(_) => "/author/lookup",
|
||||||
|
ReadarrEvent::DeleteBlocklistItem(_) => "/blocklist",
|
||||||
ReadarrEvent::GetBlocklist => "/blocklist?page=1&pageSize=10000",
|
ReadarrEvent::GetBlocklist => "/blocklist?page=1&pageSize=10000",
|
||||||
ReadarrEvent::DeleteBook(_)
|
ReadarrEvent::DeleteBook(_)
|
||||||
| ReadarrEvent::GetBookDetails(_)
|
| ReadarrEvent::GetBookDetails(_)
|
||||||
@@ -146,6 +148,10 @@ impl Network<'_, '_> {
|
|||||||
.delete_author(delete_author_params)
|
.delete_author(delete_author_params)
|
||||||
.await
|
.await
|
||||||
.map(ReadarrSerdeable::from),
|
.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
|
ReadarrEvent::DeleteBook(delete_book_params) => self
|
||||||
.delete_book(delete_book_params)
|
.delete_book(delete_book_params)
|
||||||
.await
|
.await
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ mod tests {
|
|||||||
#[case(ReadarrEvent::ListAuthors, "/author")]
|
#[case(ReadarrEvent::ListAuthors, "/author")]
|
||||||
#[case(ReadarrEvent::ToggleAuthorMonitoring(1), "/author")]
|
#[case(ReadarrEvent::ToggleAuthorMonitoring(1), "/author")]
|
||||||
#[case(ReadarrEvent::SearchNewAuthor(String::new()), "/author/lookup")]
|
#[case(ReadarrEvent::SearchNewAuthor(String::new()), "/author/lookup")]
|
||||||
|
#[case(ReadarrEvent::DeleteBlocklistItem(1), "/blocklist")]
|
||||||
#[case(ReadarrEvent::GetBlocklist, "/blocklist?page=1&pageSize=10000")]
|
#[case(ReadarrEvent::GetBlocklist, "/blocklist?page=1&pageSize=10000")]
|
||||||
#[case(ReadarrEvent::DeleteBook(DeleteParams::default()), "/book")]
|
#[case(ReadarrEvent::DeleteBook(DeleteParams::default()), "/book")]
|
||||||
#[case(ReadarrEvent::GetBookDetails(1), "/book")]
|
#[case(ReadarrEvent::GetBookDetails(1), "/book")]
|
||||||
|
|||||||
Reference in new issue
Block a user