Dark-Alex-17/managarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(radarr): Provide the movie id alongside the GetMovieCredits event when publishing to the networking channel

Browse Source
This commit is contained in:
Alex Clarke
2024-12-17 20:42:52 -07:00
parent 1ad35652f8
commit e1d5139e36
7 changed files with 46 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/radarr/mod.rs
+11 -1
View File
@@ -123,7 +123,7 @@ impl<'a> App<'a> {
|| movie_details_modal.movie_crew.items.is_empty() =>
{
self
.dispatch_network_event(RadarrEvent::GetMovieCredits(None).into())
.dispatch_network_event(RadarrEvent::GetMovieCredits(self.extract_movie_id().await).into())
.await;
}
_ => (),
@@ -219,4 +219,14 @@ impl<'a> App<'a> {
.collection_movies
.set_items(collection_movies);
}
async fn extract_movie_id(&self) -> i64 {
self
.data
.radarr_data
.movies
.current_selection()
.clone()
.id
}
}
src/app/radarr/radarr_tests.rs
+23 -16
View File
@@ -1,20 +1,17 @@
#[cfg(test)]
mod tests {
mod radarr_tests {
use pretty_assertions::assert_eq;
use tokio::sync::mpsc;
use pretty_assertions::assert_eq;
use tokio::sync::mpsc;
use crate::app::radarr::ActiveRadarrBlock;
use crate::app::App;
use crate::models::radarr_models::{
AddMovieBody, AddMovieOptions, Collection, CollectionMovie, Credit, RadarrRelease,
};
use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
use crate::app::radarr::ActiveRadarrBlock;
use crate::app::App;
use crate::models::radarr_models::{AddMovieBody, AddMovieOptions, Collection, CollectionMovie, Credit, Movie, RadarrRelease};
use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
use crate::network::radarr_network::RadarrEvent;
use crate::network::NetworkEvent;
use crate::network::radarr_network::RadarrEvent;
use crate::network::NetworkEvent;
#[tokio::test]
#[tokio::test]
async fn test_dispatch_by_blocklist_block() {
let (mut app, mut sync_network_rx) = construct_app_unit();
@@ -376,6 +373,7 @@ mod tests {
#[tokio::test]
async fn test_dispatch_by_cast_crew_blocks() {
let (mut app, mut sync_network_rx) = construct_app_unit();
app.data.radarr_data.movies.set_items(vec![Movie { id: 1, ..Movie::default() }]);
for active_radarr_block in &[ActiveRadarrBlock::Cast, ActiveRadarrBlock::Crew] {
app.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
@@ -384,7 +382,7 @@ mod tests {
assert!(app.is_loading);
assert_eq!(
sync_network_rx.recv().await.unwrap(),
RadarrEvent::GetMovieCredits(None).into()
RadarrEvent::GetMovieCredits(1).into()
);
assert!(!app.data.radarr_data.prompt_confirm);
assert_eq!(app.tick_count, 0);
@@ -394,6 +392,7 @@ mod tests {
#[tokio::test]
async fn test_dispatch_by_cast_crew_blocks_movie_cast_non_empty() {
let (mut app, mut sync_network_rx) = construct_app_unit();
app.data.radarr_data.movies.set_items(vec![Movie { id: 1, ..Movie::default() }]);
for active_radarr_block in &[ActiveRadarrBlock::Cast, ActiveRadarrBlock::Crew] {
let mut movie_details_modal = MovieDetailsModal::default();
@@ -407,7 +406,7 @@ mod tests {
assert!(app.is_loading);
assert_eq!(
sync_network_rx.recv().await.unwrap(),
RadarrEvent::GetMovieCredits(None).into()
RadarrEvent::GetMovieCredits(1).into()
);
assert!(!app.data.radarr_data.prompt_confirm);
assert_eq!(app.tick_count, 0);
@@ -417,6 +416,7 @@ mod tests {
#[tokio::test]
async fn test_dispatch_by_cast_crew_blocks_movie_crew_non_empty() {
let (mut app, mut sync_network_rx) = construct_app_unit();
app.data.radarr_data.movies.set_items(vec![Movie { id: 1, ..Movie::default() }]);
for active_radarr_block in &[ActiveRadarrBlock::Cast, ActiveRadarrBlock::Crew] {
let mut movie_details_modal = MovieDetailsModal::default();
@@ -430,7 +430,7 @@ mod tests {
assert!(app.is_loading);
assert_eq!(
sync_network_rx.recv().await.unwrap(),
RadarrEvent::GetMovieCredits(None).into()
RadarrEvent::GetMovieCredits(1).into()
);
assert!(!app.data.radarr_data.prompt_confirm);
assert_eq!(app.tick_count, 0);
@@ -725,6 +725,14 @@ mod tests {
assert!(!app.data.radarr_data.collection_movies.items.is_empty());
}
#[tokio::test]
async fn test_extract_movie_id() {
let mut app = App::default();
app.data.radarr_data.movies.set_items(vec![Movie { id: 1, ..Movie::default() }]);
assert_eq!(app.extract_movie_id().await, 1);
}
fn construct_app_unit<'a>() -> (App<'a>, mpsc::Receiver<NetworkEvent>) {
let (sync_network_tx, sync_network_rx) = mpsc::channel::<NetworkEvent>(500);
let mut app = App {
@@ -737,5 +745,4 @@ mod tests {
(app, sync_network_rx)
}
}
}
src/cli/radarr/list_command_handler.rs
+1 -1
View File
@@ -152,7 +152,7 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, RadarrListCommand> for RadarrListCommandH
RadarrListCommand::MovieCredits { movie_id } => {
let resp = self
.network
.handle_network_event(RadarrEvent::GetMovieCredits(Some(movie_id)).into())
.handle_network_event(RadarrEvent::GetMovieCredits(movie_id).into())
.await?;
serde_json::to_string_pretty(&resp)?
}
src/cli/radarr/list_command_handler_tests.rs
+1 -1
View File
@@ -163,7 +163,7 @@ mod tests {
mock_network
.expect_handle_network_event()
.with(eq::<NetworkEvent>(
RadarrEvent::GetMovieCredits(Some(expected_movie_id)).into(),
RadarrEvent::GetMovieCredits(expected_movie_id).into(),
))
.times(1)
.returning(|_| {
src/cli/radarr/radarr_command_tests.rs
+1 -1
View File
@@ -654,7 +654,7 @@ mod tests {
mock_network
.expect_handle_network_event()
.with(eq::<NetworkEvent>(
RadarrEvent::GetMovieCredits(Some(expected_movie_id)).into(),
RadarrEvent::GetMovieCredits(expected_movie_id).into(),
))
.times(1)
.returning(|_| {
src/network/radarr_network.rs
+4 -5
View File
@@ -55,7 +55,7 @@ pub enum RadarrEvent {
GetIndexers,
GetAllIndexerSettings,
GetLogs(u64),
GetMovieCredits(Option<i64>),
GetMovieCredits(i64),
GetMovieDetails(Option<i64>),
GetMovieHistory(Option<i64>),
GetMovies,
@@ -972,10 +972,9 @@ impl<'a, 'b> Network<'a, 'b> {
.await
}
async fn get_credits(&mut self, movie_id: Option<i64>) -> Result<Vec<Credit>> {
async fn get_credits(&mut self, movie_id: i64) -> Result<Vec<Credit>> {
info!("Fetching Radarr movie credits");
let event = RadarrEvent::GetMovieCredits(None);
let (_, movie_id_param) = self.extract_movie_id(movie_id).await;
let event = RadarrEvent::GetMovieCredits(movie_id);
let request_props = self
.request_props_from(
@@ -983,7 +982,7 @@ impl<'a, 'b> Network<'a, 'b> {
RequestMethod::Get,
None::<()>,
None,
Some(movie_id_param),
Some(format!("movieId={movie_id}")),
)
.await;
src/network/radarr_network_tests.rs
+5 -57
View File
@@ -221,7 +221,7 @@ mod test {
#[case(RadarrEvent::GetBlocklist, "/blocklist?page=1&pageSize=10000")]
#[case(RadarrEvent::GetLogs(500), "/log")]
#[case(RadarrEvent::SearchNewMovie(None), "/movie/lookup")]
#[case(RadarrEvent::GetMovieCredits(None), "/credit")]
#[case(RadarrEvent::GetMovieCredits(0), "/credit")]
#[case(RadarrEvent::GetMovieHistory(None), "/history/movie")]
#[case(RadarrEvent::GetDiskSpace, "/diskspace")]
#[case(RadarrEvent::GetQualityProfiles, "/qualityprofile")]
@@ -2905,23 +2905,16 @@ mod test {
None,
Some(credits_json),
None,
RadarrEvent::GetMovieCredits(None),
RadarrEvent::GetMovieCredits(1),
None,
Some("movieId=1"),
)
.await;
app_arc
.lock()
.await
.data
.radarr_data
.movies
.set_items(vec![movie()]);
app_arc.lock().await.data.radarr_data.movie_details_modal = Some(MovieDetailsModal::default());
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
if let RadarrSerdeable::Credits(credits) = network
.handle_radarr_event(RadarrEvent::GetMovieCredits(None))
.handle_radarr_event(RadarrEvent::GetMovieCredits(1))
.await
.unwrap()
{
@@ -2935,44 +2928,6 @@ mod test {
}
}
#[tokio::test]
async fn test_handle_get_movie_credits_event_uses_provided_id() {
let credits_json = json!([
{
"personName": "Madison Clarke",
"character": "Johnny Blaze",
"type": "cast",
},
{
"personName": "Alex Clarke",
"department": "Music",
"job": "Composition",
"type": "crew",
}
]);
let response: Vec<Credit> = serde_json::from_value(credits_json.clone()).unwrap();
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Get,
None,
Some(credits_json),
None,
RadarrEvent::GetMovieCredits(None),
None,
Some("movieId=1"),
)
.await;
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
if let RadarrSerdeable::Credits(credits) = network
.handle_radarr_event(RadarrEvent::GetMovieCredits(Some(1)))
.await
.unwrap()
{
async_server.assert_async().await;
assert_eq!(credits, response);
}
}
#[tokio::test]
async fn test_handle_get_movie_credits_event_empty_movie_details_modal() {
let credits_json = json!([
@@ -2993,22 +2948,15 @@ mod test {
None,
Some(credits_json),
None,
RadarrEvent::GetMovieCredits(None),
RadarrEvent::GetMovieCredits(1),
None,
Some("movieId=1"),
)
.await;
app_arc
.lock()
.await
.data
.radarr_data
.movies
.set_items(vec![movie()]);
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
assert!(network
.handle_radarr_event(RadarrEvent::GetMovieCredits(None))
.handle_radarr_event(RadarrEvent::GetMovieCredits(1))
.await
.is_ok());