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

fix(radarr): Pass in the movie ID alongside the GetMovieHistory event when publishing to the networking channel

Browse Source
This commit is contained in:
Alex Clarke
2024-12-17 20:50:00 -07:00
parent 4c396c3442
commit 92d9222b05
6 changed files with 14 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/radarr_network.rs
+4 -5
View File
@@ -57,7 +57,7 @@ pub enum RadarrEvent {
GetLogs(u64),
GetMovieCredits(i64),
GetMovieDetails(i64),
GetMovieHistory(Option<i64>),
GetMovieHistory(i64),
GetMovies,
GetDiskSpace,
GetQualityProfiles,
@@ -1319,18 +1319,17 @@ impl<'a, 'b> Network<'a, 'b> {
.await
}
async fn get_movie_history(&mut self, movie_id: Option<i64>) -> Result<Vec<MovieHistoryItem>> {
async fn get_movie_history(&mut self, movie_id: i64) -> Result<Vec<MovieHistoryItem>> {
info!("Fetching Radarr movie history");
let event = RadarrEvent::GetMovieHistory(None);
let event = RadarrEvent::GetMovieHistory(movie_id);
let (_, movie_id_param) = self.extract_movie_id(movie_id).await;
let request_props = self
.request_props_from(
event,
RequestMethod::Get,
None::<()>,
None,
Some(movie_id_param),
Some(format!("movieId={movie_id}")),
)
.await;
src/network/radarr_network_tests.rs
+5 -52
View File
@@ -222,7 +222,7 @@ mod test {
#[case(RadarrEvent::GetLogs(500), "/log")]
#[case(RadarrEvent::SearchNewMovie(None), "/movie/lookup")]
#[case(RadarrEvent::GetMovieCredits(0), "/credit")]
#[case(RadarrEvent::GetMovieHistory(None), "/history/movie")]
#[case(RadarrEvent::GetMovieHistory(0), "/history/movie")]
#[case(RadarrEvent::GetDiskSpace, "/diskspace")]
#[case(RadarrEvent::GetQualityProfiles, "/qualityprofile")]
#[case(RadarrEvent::GetStatus, "/system/status")]
@@ -1532,23 +1532,16 @@ mod test {
None,
Some(movie_history_item_json),
None,
RadarrEvent::GetMovieHistory(None),
RadarrEvent::GetMovieHistory(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::MovieHistoryItems(history) = network
.handle_radarr_event(RadarrEvent::GetMovieHistory(None))
.handle_radarr_event(RadarrEvent::GetMovieHistory(1))
.await
.unwrap()
{
@@ -1570,39 +1563,6 @@ mod test {
}
}
#[tokio::test]
async fn test_handle_get_movie_history_event_uses_provided_id() {
let movie_history_item_json = json!([{
"sourceTitle": "Test",
"quality": { "quality": { "name": "HD - 1080p" }},
"languages": [ { "id": 1, "name": "English" } ],
"date": "2022-12-30T07:37:56Z",
"eventType": "grabbed"
}]);
let response: Vec<MovieHistoryItem> =
serde_json::from_value(movie_history_item_json.clone()).unwrap();
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Get,
None,
Some(movie_history_item_json),
None,
RadarrEvent::GetMovieHistory(None),
None,
Some("movieId=1"),
)
.await;
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
if let RadarrSerdeable::MovieHistoryItems(history) = network
.handle_radarr_event(RadarrEvent::GetMovieHistory(Some(1)))
.await
.unwrap()
{
async_server.assert_async().await;
assert_eq!(history, response);
}
}
#[tokio::test]
async fn test_handle_get_movie_history_event_empty_movie_details_modal() {
let movie_history_item_json = json!([{
@@ -1617,22 +1577,15 @@ mod test {
None,
Some(movie_history_item_json),
None,
RadarrEvent::GetMovieHistory(None),
RadarrEvent::GetMovieHistory(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::GetMovieHistory(None))
.handle_radarr_event(RadarrEvent::GetMovieHistory(1))
.await
.is_ok());