feat(readarr): fetch releases for an author and expose them on the CLI
This commit is contained in:
6 files changed
+203
-4
No files matched your search
@@ -26,6 +26,15 @@ pub enum ReadarrListCommand {
|
|||||||
)]
|
)]
|
||||||
author_id: i64,
|
author_id: i64,
|
||||||
},
|
},
|
||||||
|
#[command(about = "Trigger a manual search for releases of the author with the given ID")]
|
||||||
|
AuthorReleases {
|
||||||
|
#[arg(
|
||||||
|
long,
|
||||||
|
help = "The Readarr ID of the author whose releases you wish to search for",
|
||||||
|
required = true
|
||||||
|
)]
|
||||||
|
author_id: i64,
|
||||||
|
},
|
||||||
#[command(about = "List all authors in your Readarr library")]
|
#[command(about = "List all authors in your Readarr library")]
|
||||||
Authors,
|
Authors,
|
||||||
#[command(about = "List all editions for the book with the given ID")]
|
#[command(about = "List all editions for the book with the given ID")]
|
||||||
@@ -151,6 +160,14 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, ReadarrListCommand> for ReadarrListComman
|
|||||||
.await?;
|
.await?;
|
||||||
serde_json::to_string_pretty(&resp)?
|
serde_json::to_string_pretty(&resp)?
|
||||||
}
|
}
|
||||||
|
ReadarrListCommand::AuthorReleases { author_id } => {
|
||||||
|
println!("Searching for author releases. This may take a minute...");
|
||||||
|
let resp = self
|
||||||
|
.network
|
||||||
|
.handle_network_event(ReadarrEvent::GetAuthorReleases(author_id).into())
|
||||||
|
.await?;
|
||||||
|
serde_json::to_string_pretty(&resp)?
|
||||||
|
}
|
||||||
ReadarrListCommand::Authors => {
|
ReadarrListCommand::Authors => {
|
||||||
let resp = self
|
let resp = self
|
||||||
.network
|
.network
|
||||||
|
|||||||
@@ -252,6 +252,40 @@ mod tests {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_list_author_releases_requires_author_id() {
|
||||||
|
let result =
|
||||||
|
Cli::command().try_get_matches_from(["managarr", "readarr", "list", "author-releases"]);
|
||||||
|
|
||||||
|
assert_err!(&result);
|
||||||
|
assert_eq!(
|
||||||
|
result.unwrap_err().kind(),
|
||||||
|
ErrorKind::MissingRequiredArgument
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_list_author_releases_success() {
|
||||||
|
let expected_args = ReadarrListCommand::AuthorReleases { author_id: 3 };
|
||||||
|
let result = Cli::try_parse_from([
|
||||||
|
"managarr",
|
||||||
|
"readarr",
|
||||||
|
"list",
|
||||||
|
"author-releases",
|
||||||
|
"--author-id",
|
||||||
|
"3",
|
||||||
|
]);
|
||||||
|
|
||||||
|
assert_ok!(&result);
|
||||||
|
|
||||||
|
let Some(Command::Readarr(ReadarrCommand::List(author_releases_command))) =
|
||||||
|
result.unwrap().command
|
||||||
|
else {
|
||||||
|
panic!("Unexpected command type");
|
||||||
|
};
|
||||||
|
assert_eq!(author_releases_command, expected_args);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_list_releases_success() {
|
fn test_list_releases_success() {
|
||||||
let expected_args = ReadarrListCommand::Releases { book_id: 7 };
|
let expected_args = ReadarrListCommand::Releases { book_id: 7 };
|
||||||
@@ -757,6 +791,32 @@ mod tests {
|
|||||||
assert_ok!(&result);
|
assert_ok!(&result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_handle_list_author_releases_command() {
|
||||||
|
let expected_author_id = 3;
|
||||||
|
let mut mock_network = MockNetworkTrait::new();
|
||||||
|
mock_network
|
||||||
|
.expect_handle_network_event()
|
||||||
|
.with(eq::<NetworkEvent>(
|
||||||
|
ReadarrEvent::GetAuthorReleases(expected_author_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_author_releases_command = ReadarrListCommand::AuthorReleases { author_id: 3 };
|
||||||
|
|
||||||
|
let result =
|
||||||
|
ReadarrListCommandHandler::with(&app_arc, list_author_releases_command, &mut mock_network)
|
||||||
|
.handle()
|
||||||
|
.await;
|
||||||
|
|
||||||
|
assert_ok!(&result);
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_handle_list_root_folders_command() {
|
async fn test_handle_list_root_folders_command() {
|
||||||
let mut mock_network = MockNetworkTrait::new();
|
let mut mock_network = MockNetworkTrait::new();
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ use serde_json::{Value, json};
|
|||||||
use crate::models::Route;
|
use crate::models::Route;
|
||||||
use crate::models::readarr_models::{
|
use crate::models::readarr_models::{
|
||||||
AddAuthorBody, AddAuthorSearchResult, Author, DeleteParams, EditAuthorParams, ReadarrCommandBody,
|
AddAuthorBody, AddAuthorSearchResult, Author, DeleteParams, EditAuthorParams, ReadarrCommandBody,
|
||||||
ReadarrHistoryItem,
|
ReadarrHistoryItem, ReadarrRelease,
|
||||||
};
|
};
|
||||||
use crate::models::servarr_data::readarr::readarr_data::ActiveReadarrBlock;
|
use crate::models::servarr_data::readarr::readarr_data::ActiveReadarrBlock;
|
||||||
use crate::models::stateful_table::StatefulTable;
|
use crate::models::stateful_table::StatefulTable;
|
||||||
@@ -217,6 +217,30 @@ impl Network<'_, '_> {
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(in crate::network::readarr_network) async fn get_author_releases(
|
||||||
|
&mut self,
|
||||||
|
author_id: i64,
|
||||||
|
) -> Result<Vec<ReadarrRelease>> {
|
||||||
|
info!("Fetching releases for Readarr author with ID: {author_id}");
|
||||||
|
let event = ReadarrEvent::GetAuthorReleases(author_id);
|
||||||
|
|
||||||
|
let request_props = self
|
||||||
|
.request_props_from(
|
||||||
|
event,
|
||||||
|
RequestMethod::Get,
|
||||||
|
None::<()>,
|
||||||
|
None,
|
||||||
|
Some(format!("authorId={author_id}")),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
self
|
||||||
|
.handle_request::<(), Vec<ReadarrRelease>>(request_props, |release_vec, mut app| {
|
||||||
|
app.data.readarr_data.author_releases.set_items(release_vec);
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
pub(in crate::network::readarr_network) async fn get_readarr_author_history(
|
pub(in crate::network::readarr_network) async fn get_readarr_author_history(
|
||||||
&mut self,
|
&mut self,
|
||||||
author_id: i64,
|
author_id: i64,
|
||||||
|
|||||||
@@ -10,8 +10,9 @@ mod tests {
|
|||||||
use crate::network::network_tests::test_utils::{MockServarrApi, test_network};
|
use crate::network::network_tests::test_utils::{MockServarrApi, test_network};
|
||||||
use crate::network::readarr_network::ReadarrEvent;
|
use crate::network::readarr_network::ReadarrEvent;
|
||||||
use crate::network::readarr_network::readarr_network_test_utils::test_utils::{
|
use crate::network::readarr_network::readarr_network_test_utils::test_utils::{
|
||||||
ADD_AUTHOR_SEARCH_RESULT_JSON, AUTHOR_JSON, add_author_body, readarr_history_item,
|
ADD_AUTHOR_SEARCH_RESULT_JSON, AUTHOR_JSON, RELEASE_JSON, add_author_body,
|
||||||
stale_add_author_search_result, stale_author, stale_readarr_history_item,
|
readarr_history_item, stale_add_author_search_result, stale_author, stale_readarr_history_item,
|
||||||
|
stale_release, torrent_release, usenet_release,
|
||||||
};
|
};
|
||||||
use bimap::BiMap;
|
use bimap::BiMap;
|
||||||
use mockito::Matcher;
|
use mockito::Matcher;
|
||||||
@@ -76,6 +77,97 @@ mod tests {
|
|||||||
assert_err!(result);
|
assert_err!(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_handle_get_author_releases_event() {
|
||||||
|
let expected_releases = vec![torrent_release(), usenet_release()];
|
||||||
|
let releases_json = json!([
|
||||||
|
serde_json::from_str::<Value>(RELEASE_JSON).unwrap(),
|
||||||
|
{
|
||||||
|
"guid": "test-usenet-release-guid",
|
||||||
|
"protocol": "usenet",
|
||||||
|
"age": 4492,
|
||||||
|
"title": "Test Author - Test Book [AZW3]",
|
||||||
|
"authorName": "Test Author",
|
||||||
|
"bookTitle": "Test Book",
|
||||||
|
"indexer": "DrunkenSlug",
|
||||||
|
"indexerId": 4,
|
||||||
|
"size": 313924185,
|
||||||
|
"rejected": true,
|
||||||
|
"rejections": ["Unknown quality profile", "Release is already mapped"],
|
||||||
|
"quality": {
|
||||||
|
"quality": { "id": 12, "name": "AZW3" },
|
||||||
|
"revision": { "version": 1, "real": 0, "isRepack": false }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]);
|
||||||
|
let (mock, app, _server) = MockServarrApi::get()
|
||||||
|
.returns(releases_json)
|
||||||
|
.query("authorId=3")
|
||||||
|
.build_for(ReadarrEvent::GetAuthorReleases(3))
|
||||||
|
.await;
|
||||||
|
{
|
||||||
|
let mut app = app.lock().await;
|
||||||
|
app.server_tabs.set_index(3);
|
||||||
|
app
|
||||||
|
.data
|
||||||
|
.readarr_data
|
||||||
|
.author_releases
|
||||||
|
.set_items(vec![stale_release()]);
|
||||||
|
}
|
||||||
|
let mut network = test_network(&app);
|
||||||
|
|
||||||
|
let result = network
|
||||||
|
.handle_readarr_event(ReadarrEvent::GetAuthorReleases(3))
|
||||||
|
.await;
|
||||||
|
|
||||||
|
mock.assert_async().await;
|
||||||
|
|
||||||
|
let ReadarrSerdeable::Releases(releases) = result.unwrap() else {
|
||||||
|
panic!("Expected Releases")
|
||||||
|
};
|
||||||
|
|
||||||
|
assert_eq!(releases, expected_releases);
|
||||||
|
assert_eq!(
|
||||||
|
app.lock().await.data.readarr_data.author_releases.items,
|
||||||
|
expected_releases
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_handle_get_author_releases_event_failure() {
|
||||||
|
let stale_releases = vec![stale_release()];
|
||||||
|
let (mock, app, _server) = MockServarrApi::get()
|
||||||
|
.returns(json!(
|
||||||
|
[serde_json::from_str::<Value>(RELEASE_JSON).unwrap()]
|
||||||
|
))
|
||||||
|
.status(500)
|
||||||
|
.query("authorId=3")
|
||||||
|
.build_for(ReadarrEvent::GetAuthorReleases(3))
|
||||||
|
.await;
|
||||||
|
{
|
||||||
|
let mut app = app.lock().await;
|
||||||
|
app.server_tabs.set_index(3);
|
||||||
|
app
|
||||||
|
.data
|
||||||
|
.readarr_data
|
||||||
|
.author_releases
|
||||||
|
.set_items(stale_releases.clone());
|
||||||
|
}
|
||||||
|
let mut network = test_network(&app);
|
||||||
|
|
||||||
|
let result = network
|
||||||
|
.handle_readarr_event(ReadarrEvent::GetAuthorReleases(3))
|
||||||
|
.await;
|
||||||
|
|
||||||
|
mock.assert_async().await;
|
||||||
|
|
||||||
|
assert_err!(result);
|
||||||
|
assert_eq!(
|
||||||
|
app.lock().await.data.readarr_data.author_releases.items,
|
||||||
|
stale_releases
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[rstest]
|
#[rstest]
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_handle_get_readarr_author_history_event(
|
async fn test_handle_get_readarr_author_history_event(
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ pub enum ReadarrEvent {
|
|||||||
EditAuthor(EditAuthorParams),
|
EditAuthor(EditAuthorParams),
|
||||||
GetAuthorDetails(i64),
|
GetAuthorDetails(i64),
|
||||||
GetAuthorHistory(i64),
|
GetAuthorHistory(i64),
|
||||||
|
GetAuthorReleases(i64),
|
||||||
GetBookDetails(i64),
|
GetBookDetails(i64),
|
||||||
GetBookEditions(i64),
|
GetBookEditions(i64),
|
||||||
GetBookFiles(i64),
|
GetBookFiles(i64),
|
||||||
@@ -105,7 +106,7 @@ impl NetworkResource for ReadarrEvent {
|
|||||||
ReadarrEvent::GetMetadataProfiles => "/metadataprofile",
|
ReadarrEvent::GetMetadataProfiles => "/metadataprofile",
|
||||||
ReadarrEvent::GetQualityProfiles => "/qualityprofile",
|
ReadarrEvent::GetQualityProfiles => "/qualityprofile",
|
||||||
ReadarrEvent::DeleteDownload(_) | ReadarrEvent::GetDownloads(_) => "/queue",
|
ReadarrEvent::DeleteDownload(_) | ReadarrEvent::GetDownloads(_) => "/queue",
|
||||||
ReadarrEvent::GetBookReleases(_) => "/release",
|
ReadarrEvent::GetAuthorReleases(_) | ReadarrEvent::GetBookReleases(_) => "/release",
|
||||||
ReadarrEvent::AddRootFolder(_)
|
ReadarrEvent::AddRootFolder(_)
|
||||||
| ReadarrEvent::DeleteRootFolder(_)
|
| ReadarrEvent::DeleteRootFolder(_)
|
||||||
| ReadarrEvent::GetRootFolders => "/rootfolder",
|
| ReadarrEvent::GetRootFolders => "/rootfolder",
|
||||||
@@ -171,6 +172,10 @@ impl Network<'_, '_> {
|
|||||||
.get_readarr_author_history(author_id)
|
.get_readarr_author_history(author_id)
|
||||||
.await
|
.await
|
||||||
.map(ReadarrSerdeable::from),
|
.map(ReadarrSerdeable::from),
|
||||||
|
ReadarrEvent::GetAuthorReleases(author_id) => self
|
||||||
|
.get_author_releases(author_id)
|
||||||
|
.await
|
||||||
|
.map(ReadarrSerdeable::from),
|
||||||
ReadarrEvent::GetBookDetails(book_id) => self
|
ReadarrEvent::GetBookDetails(book_id) => self
|
||||||
.get_book_details(book_id)
|
.get_book_details(book_id)
|
||||||
.await
|
.await
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ mod tests {
|
|||||||
#[case(ReadarrEvent::GetQualityProfiles, "/qualityprofile")]
|
#[case(ReadarrEvent::GetQualityProfiles, "/qualityprofile")]
|
||||||
#[case(ReadarrEvent::DeleteDownload(1), "/queue")]
|
#[case(ReadarrEvent::DeleteDownload(1), "/queue")]
|
||||||
#[case(ReadarrEvent::GetDownloads(500), "/queue")]
|
#[case(ReadarrEvent::GetDownloads(500), "/queue")]
|
||||||
|
#[case(ReadarrEvent::GetAuthorReleases(1), "/release")]
|
||||||
#[case(ReadarrEvent::GetBookReleases(1), "/release")]
|
#[case(ReadarrEvent::GetBookReleases(1), "/release")]
|
||||||
#[case(
|
#[case(
|
||||||
ReadarrEvent::AddRootFolder(AddReadarrRootFolderBody::default()),
|
ReadarrEvent::AddRootFolder(AddReadarrRootFolderBody::default()),
|
||||||
|
|||||||
Reference in new issue
Block a user