From 634d1fc1b192524fa4276008e08dff5619ed19d7 Mon Sep 17 00:00:00 2001 From: Alex Clarke Date: Thu, 27 Aug 2026 15:22:50 -0600 Subject: [PATCH] feat(readarr): fetch Readarr book files and expose them on the CLI --- src/cli/readarr/list_command_handler.rs | 16 +++ src/cli/readarr/list_command_handler_tests.rs | 60 ++++++++ .../readarr_network/library/books/mod.rs | 32 ++++- .../books/readarr_books_network_tests.rs | 132 +++++++++++++++++- src/network/readarr_network/mod.rs | 6 + .../readarr_network_test_utils.rs | 32 ++++- .../readarr_network/readarr_network_tests.rs | 1 + 7 files changed, 274 insertions(+), 5 deletions(-) diff --git a/src/cli/readarr/list_command_handler.rs b/src/cli/readarr/list_command_handler.rs index fce642af..a488346d 100644 --- a/src/cli/readarr/list_command_handler.rs +++ b/src/cli/readarr/list_command_handler.rs @@ -37,6 +37,15 @@ pub enum ReadarrListCommand { )] book_id: i64, }, + #[command(about = "List all book files for the book with the given ID")] + BookFiles { + #[arg( + long, + help = "The Readarr ID of the book whose book files you want to list", + required = true + )] + book_id: i64, + }, #[command(about = "List all books for the author with the given ID")] Books { #[arg( @@ -122,6 +131,13 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, ReadarrListCommand> for ReadarrListComman .await?; serde_json::to_string_pretty(&resp)? } + ReadarrListCommand::BookFiles { book_id } => { + let resp = self + .network + .handle_network_event(ReadarrEvent::GetBookFiles(book_id).into()) + .await?; + serde_json::to_string_pretty(&resp)? + } ReadarrListCommand::Books { author_id } => { let resp = self .network diff --git a/src/cli/readarr/list_command_handler_tests.rs b/src/cli/readarr/list_command_handler_tests.rs index ce74d970..40920bb8 100644 --- a/src/cli/readarr/list_command_handler_tests.rs +++ b/src/cli/readarr/list_command_handler_tests.rs @@ -130,6 +130,40 @@ mod tests { assert_eq!(book_editions_command, expected_args); } + #[test] + fn test_list_book_files_requires_book_id() { + let result = + Cli::command().try_get_matches_from(["managarr", "readarr", "list", "book-files"]); + + assert_err!(&result); + assert_eq!( + result.unwrap_err().kind(), + ErrorKind::MissingRequiredArgument + ); + } + + #[test] + fn test_list_book_files_success() { + let expected_args = ReadarrListCommand::BookFiles { book_id: 1 }; + let result = Cli::try_parse_from([ + "managarr", + "readarr", + "list", + "book-files", + "--book-id", + "1", + ]); + + assert_ok!(&result); + + let Some(Command::Readarr(ReadarrCommand::List(book_files_command))) = + result.unwrap().command + else { + panic!("Unexpected command type"); + }; + assert_eq!(book_files_command, expected_args); + } + #[test] fn test_list_books_success() { let expected_args = ReadarrListCommand::Books { author_id: 1 }; @@ -281,6 +315,32 @@ mod tests { assert_ok!(&result); } + #[tokio::test] + async fn test_handle_list_book_files_command() { + let expected_book_id = 1; + let mut mock_network = MockNetworkTrait::new(); + mock_network + .expect_handle_network_event() + .with(eq::( + ReadarrEvent::GetBookFiles(expected_book_id).into(), + )) + .times(1) + .returning(|_| { + Ok(Serdeable::Readarr(ReadarrSerdeable::Value( + json!({"testResponse": "response"}), + ))) + }); + let app_arc = Arc::new(Mutex::new(App::test_default())); + let list_book_files_command = ReadarrListCommand::BookFiles { book_id: 1 }; + + let result = + ReadarrListCommandHandler::with(&app_arc, list_book_files_command, &mut mock_network) + .handle() + .await; + + assert_ok!(&result); + } + #[tokio::test] async fn test_handle_list_disk_space_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 df9b060d..6eda5412 100644 --- a/src/network/readarr_network/library/books/mod.rs +++ b/src/network/readarr_network/library/books/mod.rs @@ -1,7 +1,7 @@ use anyhow::Result; use log::info; -use crate::models::readarr_models::{Book, Edition}; +use crate::models::readarr_models::{Book, BookFile, Edition}; use crate::network::readarr_network::ReadarrEvent; use crate::network::{Network, RequestMethod}; @@ -63,6 +63,36 @@ impl Network<'_, '_> { .await } + pub(in crate::network::readarr_network) async fn get_book_files( + &mut self, + book_id: i64, + ) -> Result> { + info!("Fetching book files for Readarr book with ID: {book_id}"); + let event = ReadarrEvent::GetBookFiles(book_id); + + let request_props = self + .request_props_from( + event, + RequestMethod::Get, + None::<()>, + None, + Some(format!("bookId={book_id}")), + ) + .await; + + self + .handle_request::<(), Vec>(request_props, |book_files_vec, mut app| { + let book_details_modal = app + .data + .readarr_data + .book_details_modal + .get_or_insert_default(); + + book_details_modal.book_files.set_items(book_files_vec); + }) + .await + } + pub(in crate::network::readarr_network) async fn get_books( &mut self, author_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 ac347709..8bbc9740 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,11 +1,11 @@ #[cfg(test)] mod tests { - use crate::models::readarr_models::{Book, Edition, ReadarrSerdeable}; + use crate::models::readarr_models::{Book, BookFile, Edition, ReadarrSerdeable}; use crate::models::servarr_data::readarr::modals::BookDetailsModal; use crate::network::network_tests::test_utils::{MockServarrApi, test_network}; use crate::network::readarr_network::ReadarrEvent; use crate::network::readarr_network::readarr_network_test_utils::test_utils::{ - BOOK_JSON, EDITION_JSON, stale_book, stale_edition, + BOOK_FILE_JSON, BOOK_JSON, EDITION_JSON, stale_book, stale_book_file, stale_edition, }; use pretty_assertions::assert_eq; use serde_json::{Value, json}; @@ -241,6 +241,134 @@ mod tests { ); } + #[tokio::test] + async fn test_handle_get_book_files_event() { + let expected_book_files: Vec = vec![serde_json::from_str(BOOK_FILE_JSON).unwrap()]; + let (mock, app, _server) = MockServarrApi::get() + .returns(json!([ + serde_json::from_str::(BOOK_FILE_JSON).unwrap() + ])) + .query("bookId=1") + .build_for(ReadarrEvent::GetBookFiles(1)) + .await; + { + let mut app = app.lock().await; + app.server_tabs.set_index(3); + app.data.readarr_data.book_details_modal = Some(BookDetailsModal::default()); + } + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::GetBookFiles(1)) + .await; + + mock.assert_async().await; + + let ReadarrSerdeable::BookFiles(book_files) = result.unwrap() else { + panic!("Expected BookFiles") + }; + + assert_eq!(book_files, expected_book_files); + assert_eq!( + app + .lock() + .await + .data + .readarr_data + .book_details_modal + .as_ref() + .unwrap() + .book_files + .items, + expected_book_files + ); + } + + #[tokio::test] + async fn test_handle_get_book_files_event_empty_book_details_modal() { + let expected_book_files: Vec = vec![serde_json::from_str(BOOK_FILE_JSON).unwrap()]; + let (mock, app, _server) = MockServarrApi::get() + .returns(json!([ + serde_json::from_str::(BOOK_FILE_JSON).unwrap() + ])) + .query("bookId=1") + .build_for(ReadarrEvent::GetBookFiles(1)) + .await; + app.lock().await.server_tabs.set_index(3); + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::GetBookFiles(1)) + .await; + + mock.assert_async().await; + + let ReadarrSerdeable::BookFiles(book_files) = result.unwrap() else { + panic!("Expected BookFiles") + }; + + assert_eq!(book_files, expected_book_files); + + let app = app.lock().await; + + assert_some!(&app.data.readarr_data.book_details_modal); + assert_eq!( + app + .data + .readarr_data + .book_details_modal + .as_ref() + .unwrap() + .book_files + .items, + expected_book_files + ); + } + + #[tokio::test] + async fn test_handle_get_book_files_event_failure() { + let stale_book_files = vec![stale_book_file()]; + let (mock, app, _server) = MockServarrApi::get() + .returns(json!([ + serde_json::from_str::(BOOK_FILE_JSON).unwrap() + ])) + .status(500) + .query("bookId=1") + .build_for(ReadarrEvent::GetBookFiles(1)) + .await; + { + let mut app = app.lock().await; + app.server_tabs.set_index(3); + let mut book_details_modal = BookDetailsModal::default(); + book_details_modal + .book_files + .set_items(stale_book_files.clone()); + app.data.readarr_data.book_details_modal = Some(book_details_modal); + } + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::GetBookFiles(1)) + .await; + + mock.assert_async().await; + + assert_err!(result); + assert_eq!( + app + .lock() + .await + .data + .readarr_data + .book_details_modal + .as_ref() + .unwrap() + .book_files + .items, + stale_book_files + ); + } + #[tokio::test] async fn test_handle_get_books_event() { let books_json = json!([ diff --git a/src/network/readarr_network/mod.rs b/src/network/readarr_network/mod.rs index e881bbc6..aefba954 100644 --- a/src/network/readarr_network/mod.rs +++ b/src/network/readarr_network/mod.rs @@ -35,6 +35,7 @@ pub enum ReadarrEvent { GetAuthorHistory(i64), GetBookDetails(i64), GetBookEditions(i64), + GetBookFiles(i64), GetBooks(i64), GetDiskSpace, GetHostConfig, @@ -69,6 +70,7 @@ impl NetworkResource for ReadarrEvent { | ReadarrEvent::ToggleAuthorMonitoring(_) => "/author", ReadarrEvent::SearchNewAuthor(_) => "/author/lookup", ReadarrEvent::GetBookDetails(_) | ReadarrEvent::GetBooks(_) => "/book", + ReadarrEvent::GetBookFiles(_) => "/bookfile", ReadarrEvent::GetQueuedEvents | ReadarrEvent::StartTask(_) | ReadarrEvent::TriggerAutomaticAuthorSearch(_) @@ -143,6 +145,10 @@ impl Network<'_, '_> { .get_book_editions(book_id) .await .map(ReadarrSerdeable::from), + ReadarrEvent::GetBookFiles(book_id) => self + .get_book_files(book_id) + .await + .map(ReadarrSerdeable::from), ReadarrEvent::GetBooks(author_id) => { self.get_books(author_id).await.map(ReadarrSerdeable::from) } diff --git a/src/network/readarr_network/readarr_network_test_utils.rs b/src/network/readarr_network/readarr_network_test_utils.rs index ebbc299c..3b4a2335 100644 --- a/src/network/readarr_network/readarr_network_test_utils.rs +++ b/src/network/readarr_network/readarr_network_test_utils.rs @@ -2,8 +2,8 @@ #[allow(dead_code)] pub mod test_utils { use crate::models::readarr_models::{ - AddAuthorBody, AddAuthorOptions, AddAuthorSearchResult, Author, AuthorStatus, Book, Edition, - MonitorType, NewItemMonitorType, ReadarrHistoryData, ReadarrHistoryEventType, + AddAuthorBody, AddAuthorOptions, AddAuthorSearchResult, Author, AuthorStatus, Book, BookFile, + Edition, MonitorType, NewItemMonitorType, ReadarrHistoryData, ReadarrHistoryEventType, ReadarrHistoryItem, }; use crate::models::servarr_models::{Quality, QualityWrapper, RootFolder}; @@ -67,6 +67,24 @@ pub mod test_utils { "grabbed": false }"#; + pub const BOOK_FILE_JSON: &str = r#"{ + "id": 1, + "authorId": 1, + "bookId": 1, + "path": "/nfs/books/Test Author/Test Book/Test Author - Test Book.azw3", + "size": 1074732, + "dateAdded": "2023-01-01T00:00:00Z", + "quality": { "quality": { "name": "AZW3" } }, + "mediaInfo": { + "audioBitRate": "128 kbps", + "audioChannels": 2, + "audioCodec": "MP3", + "audioBits": "16", + "audioSampleRate": "44.1 kHz" + }, + "qualityCutoffNotMet": false + }"#; + pub const EDITION_JSON: &str = r#"{ "id": 1, "bookId": 1, @@ -114,6 +132,16 @@ pub mod test_utils { } } + pub fn stale_book_file() -> BookFile { + BookFile { + id: 99, + author_id: 99, + book_id: 99, + path: "/nfs/books/Stale Author/Stale Book.azw3".to_owned(), + ..BookFile::default() + } + } + pub fn stale_edition() -> Edition { Edition { id: 99, diff --git a/src/network/readarr_network/readarr_network_tests.rs b/src/network/readarr_network/readarr_network_tests.rs index ea69ec3e..a1a33001 100644 --- a/src/network/readarr_network/readarr_network_tests.rs +++ b/src/network/readarr_network/readarr_network_tests.rs @@ -24,6 +24,7 @@ mod tests { #[case(ReadarrEvent::SearchNewAuthor(String::new()), "/author/lookup")] #[case(ReadarrEvent::GetBookDetails(1), "/book")] #[case(ReadarrEvent::GetBooks(1), "/book")] + #[case(ReadarrEvent::GetBookFiles(1), "/bookfile")] #[case(ReadarrEvent::GetQueuedEvents, "/command")] #[case(ReadarrEvent::StartTask(Default::default()), "/command")] #[case(ReadarrEvent::TriggerAutomaticAuthorSearch(1), "/command")]