feat(readarr): delete a book file and expose the command on the CLI
This commit is contained in:
6 files changed
+148
-1
No files matched your search
@@ -36,6 +36,11 @@ pub enum ReadarrDeleteCommand {
|
|||||||
#[arg(long, help = "Add a list exclusion for this book")]
|
#[arg(long, help = "Add a list exclusion for this book")]
|
||||||
add_list_exclusion: bool,
|
add_list_exclusion: bool,
|
||||||
},
|
},
|
||||||
|
#[command(about = "Delete the specified book file from disk")]
|
||||||
|
BookFile {
|
||||||
|
#[arg(long, help = "The ID of the book file to delete", required = true)]
|
||||||
|
book_file_id: i64,
|
||||||
|
},
|
||||||
#[command(about = "Delete the root folder with the given ID")]
|
#[command(about = "Delete the root folder with the given ID")]
|
||||||
RootFolder {
|
RootFolder {
|
||||||
#[arg(long, help = "The ID of the root folder to delete", required = true)]
|
#[arg(long, help = "The ID of the root folder to delete", required = true)]
|
||||||
@@ -109,6 +114,13 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, ReadarrDeleteCommand>
|
|||||||
.await?;
|
.await?;
|
||||||
serde_json::to_string_pretty(&resp)?
|
serde_json::to_string_pretty(&resp)?
|
||||||
}
|
}
|
||||||
|
ReadarrDeleteCommand::BookFile { book_file_id } => {
|
||||||
|
let resp = self
|
||||||
|
.network
|
||||||
|
.handle_network_event(ReadarrEvent::DeleteBookFile(book_file_id).into())
|
||||||
|
.await?;
|
||||||
|
serde_json::to_string_pretty(&resp)?
|
||||||
|
}
|
||||||
ReadarrDeleteCommand::RootFolder { root_folder_id } => {
|
ReadarrDeleteCommand::RootFolder { root_folder_id } => {
|
||||||
let resp = self
|
let resp = self
|
||||||
.network
|
.network
|
||||||
|
|||||||
@@ -177,6 +177,55 @@ mod tests {
|
|||||||
assert_eq!(delete_command, expected_args);
|
assert_eq!(delete_command, expected_args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_delete_book_file_requires_arguments() {
|
||||||
|
let result =
|
||||||
|
Cli::command().try_get_matches_from(["managarr", "readarr", "delete", "book-file"]);
|
||||||
|
|
||||||
|
assert_err!(&result);
|
||||||
|
assert_eq!(
|
||||||
|
result.unwrap_err().kind(),
|
||||||
|
ErrorKind::MissingRequiredArgument
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_delete_book_file_book_file_id_requires_a_number() {
|
||||||
|
let result = Cli::command().try_get_matches_from([
|
||||||
|
"managarr",
|
||||||
|
"readarr",
|
||||||
|
"delete",
|
||||||
|
"book-file",
|
||||||
|
"--book-file-id",
|
||||||
|
"not_a_number",
|
||||||
|
]);
|
||||||
|
|
||||||
|
assert_err!(&result);
|
||||||
|
assert_eq!(result.unwrap_err().kind(), ErrorKind::ValueValidation);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_delete_book_file_success() {
|
||||||
|
let expected_args = ReadarrDeleteCommand::BookFile { book_file_id: 1 };
|
||||||
|
|
||||||
|
let result = Cli::try_parse_from([
|
||||||
|
"managarr",
|
||||||
|
"readarr",
|
||||||
|
"delete",
|
||||||
|
"book-file",
|
||||||
|
"--book-file-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]
|
#[test]
|
||||||
fn test_delete_root_folder_requires_arguments() {
|
fn test_delete_root_folder_requires_arguments() {
|
||||||
let result =
|
let result =
|
||||||
@@ -355,6 +404,29 @@ mod tests {
|
|||||||
assert_ok!(&result);
|
assert_ok!(&result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_handle_delete_book_file_command() {
|
||||||
|
let mut mock_network = MockNetworkTrait::new();
|
||||||
|
mock_network
|
||||||
|
.expect_handle_network_event()
|
||||||
|
.with(eq::<NetworkEvent>(ReadarrEvent::DeleteBookFile(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_book_file_command = ReadarrDeleteCommand::BookFile { book_file_id: 1 };
|
||||||
|
|
||||||
|
let result =
|
||||||
|
ReadarrDeleteCommandHandler::with(&app_arc, delete_book_file_command, &mut mock_network)
|
||||||
|
.handle()
|
||||||
|
.await;
|
||||||
|
|
||||||
|
assert_ok!(&result);
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_handle_delete_root_folder_command() {
|
async fn test_handle_delete_root_folder_command() {
|
||||||
let mut mock_network = MockNetworkTrait::new();
|
let mut mock_network = MockNetworkTrait::new();
|
||||||
|
|||||||
@@ -47,6 +47,28 @@ impl Network<'_, '_> {
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(in crate::network::readarr_network) async fn delete_readarr_book_file(
|
||||||
|
&mut self,
|
||||||
|
book_file_id: i64,
|
||||||
|
) -> Result<()> {
|
||||||
|
info!("Deleting Readarr book file with ID: {book_file_id}");
|
||||||
|
let event = ReadarrEvent::DeleteBookFile(book_file_id);
|
||||||
|
|
||||||
|
let request_props = self
|
||||||
|
.request_props_from(
|
||||||
|
event,
|
||||||
|
RequestMethod::Delete,
|
||||||
|
None::<()>,
|
||||||
|
Some(format!("/{book_file_id}")),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
self
|
||||||
|
.handle_request::<(), ()>(request_props, |_, _| ())
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
pub(in crate::network::readarr_network) async fn get_book_details(
|
pub(in crate::network::readarr_network) async fn get_book_details(
|
||||||
&mut self,
|
&mut self,
|
||||||
book_id: i64,
|
book_id: i64,
|
||||||
|
|||||||
@@ -72,6 +72,41 @@ mod tests {
|
|||||||
assert_err!(result);
|
assert_err!(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_handle_delete_readarr_book_file_event() {
|
||||||
|
let (mock, app, _server) = MockServarrApi::delete()
|
||||||
|
.path("/1")
|
||||||
|
.build_for(ReadarrEvent::DeleteBookFile(1))
|
||||||
|
.await;
|
||||||
|
app.lock().await.server_tabs.set_index(3);
|
||||||
|
let mut network = test_network(&app);
|
||||||
|
|
||||||
|
let result = network
|
||||||
|
.handle_readarr_event(ReadarrEvent::DeleteBookFile(1))
|
||||||
|
.await;
|
||||||
|
|
||||||
|
mock.assert_async().await;
|
||||||
|
assert_ok!(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_handle_delete_readarr_book_file_event_failure() {
|
||||||
|
let (mock, app, _server) = MockServarrApi::delete()
|
||||||
|
.path("/1")
|
||||||
|
.status(500)
|
||||||
|
.build_for(ReadarrEvent::DeleteBookFile(1))
|
||||||
|
.await;
|
||||||
|
app.lock().await.server_tabs.set_index(3);
|
||||||
|
let mut network = test_network(&app);
|
||||||
|
|
||||||
|
let result = network
|
||||||
|
.handle_readarr_event(ReadarrEvent::DeleteBookFile(1))
|
||||||
|
.await;
|
||||||
|
|
||||||
|
mock.assert_async().await;
|
||||||
|
assert_err!(result);
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_handle_get_book_details_event() {
|
async fn test_handle_get_book_details_event() {
|
||||||
let expected_book: Book = serde_json::from_str(BOOK_JSON).unwrap();
|
let expected_book: Book = serde_json::from_str(BOOK_JSON).unwrap();
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ pub enum ReadarrEvent {
|
|||||||
AddTag(String),
|
AddTag(String),
|
||||||
DeleteAuthor(DeleteParams),
|
DeleteAuthor(DeleteParams),
|
||||||
DeleteBook(DeleteParams),
|
DeleteBook(DeleteParams),
|
||||||
|
DeleteBookFile(i64),
|
||||||
DeleteRootFolder(i64),
|
DeleteRootFolder(i64),
|
||||||
DeleteTag(i64),
|
DeleteTag(i64),
|
||||||
EditAuthor(EditAuthorParams),
|
EditAuthor(EditAuthorParams),
|
||||||
@@ -77,7 +78,7 @@ impl NetworkResource for ReadarrEvent {
|
|||||||
| ReadarrEvent::GetBookDetails(_)
|
| ReadarrEvent::GetBookDetails(_)
|
||||||
| ReadarrEvent::GetBooks(_)
|
| ReadarrEvent::GetBooks(_)
|
||||||
| ReadarrEvent::ToggleBookMonitoring(_) => "/book",
|
| ReadarrEvent::ToggleBookMonitoring(_) => "/book",
|
||||||
ReadarrEvent::GetBookFiles(_) => "/bookfile",
|
ReadarrEvent::DeleteBookFile(_) | ReadarrEvent::GetBookFiles(_) => "/bookfile",
|
||||||
ReadarrEvent::GetQueuedEvents
|
ReadarrEvent::GetQueuedEvents
|
||||||
| ReadarrEvent::StartTask(_)
|
| ReadarrEvent::StartTask(_)
|
||||||
| ReadarrEvent::TriggerAutomaticAuthorSearch(_)
|
| ReadarrEvent::TriggerAutomaticAuthorSearch(_)
|
||||||
@@ -129,6 +130,10 @@ impl Network<'_, '_> {
|
|||||||
.delete_book(delete_book_params)
|
.delete_book(delete_book_params)
|
||||||
.await
|
.await
|
||||||
.map(ReadarrSerdeable::from),
|
.map(ReadarrSerdeable::from),
|
||||||
|
ReadarrEvent::DeleteBookFile(book_file_id) => self
|
||||||
|
.delete_readarr_book_file(book_file_id)
|
||||||
|
.await
|
||||||
|
.map(ReadarrSerdeable::from),
|
||||||
ReadarrEvent::DeleteRootFolder(root_folder_id) => self
|
ReadarrEvent::DeleteRootFolder(root_folder_id) => self
|
||||||
.delete_readarr_root_folder(root_folder_id)
|
.delete_readarr_root_folder(root_folder_id)
|
||||||
.await
|
.await
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ mod tests {
|
|||||||
#[case(ReadarrEvent::GetBookDetails(1), "/book")]
|
#[case(ReadarrEvent::GetBookDetails(1), "/book")]
|
||||||
#[case(ReadarrEvent::GetBooks(1), "/book")]
|
#[case(ReadarrEvent::GetBooks(1), "/book")]
|
||||||
#[case(ReadarrEvent::ToggleBookMonitoring(1), "/book")]
|
#[case(ReadarrEvent::ToggleBookMonitoring(1), "/book")]
|
||||||
|
#[case(ReadarrEvent::DeleteBookFile(1), "/bookfile")]
|
||||||
#[case(ReadarrEvent::GetBookFiles(1), "/bookfile")]
|
#[case(ReadarrEvent::GetBookFiles(1), "/bookfile")]
|
||||||
#[case(ReadarrEvent::GetQueuedEvents, "/command")]
|
#[case(ReadarrEvent::GetQueuedEvents, "/command")]
|
||||||
#[case(ReadarrEvent::StartTask(Default::default()), "/command")]
|
#[case(ReadarrEvent::StartTask(Default::default()), "/command")]
|
||||||
|
|||||||
Reference in new issue
Block a user