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

fix(sonarr): Pass series ID alognside all GetEpisodes events when publishing to the networking channel

Browse Source
This commit is contained in:
Alex Clarke
2024-12-17 23:57:13 -07:00
parent 30ba1f3317
commit 2ecc591966
6 changed files with 36 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/sonarr_network.rs
+4 -5
View File
@@ -60,7 +60,7 @@ pub enum SonarrEvent {
GetHostConfig,
GetIndexers,
GetEpisodeDetails(i64),
GetEpisodes(Option<i64>),
GetEpisodes(i64),
GetEpisodeFiles(Option<i64>),
GetEpisodeHistory(Option<i64>),
GetLanguageProfiles,
@@ -1144,10 +1144,9 @@ impl<'a, 'b> Network<'a, 'b> {
.await
}
async fn get_episodes(&mut self, series_id: Option<i64>) -> Result<Vec<Episode>> {
async fn get_episodes(&mut self, series_id: i64) -> Result<Vec<Episode>> {
let event = SonarrEvent::GetEpisodes(series_id);
let (id, series_id_param) = self.extract_series_id(series_id).await;
info!("Fetching episodes for Sonarr series with ID: {id}");
info!("Fetching episodes for Sonarr series with ID: {series_id}");
let request_props = self
.request_props_from(
@@ -1155,7 +1154,7 @@ impl<'a, 'b> Network<'a, 'b> {
RequestMethod::Get,
None::<()>,
None,
Some(series_id_param),
Some(format!("seriesId={series_id}")),
)
.await;
src/network/sonarr_network_tests.rs
+9 -76
View File
@@ -149,7 +149,7 @@ mod test {
#[rstest]
fn test_resource_episode(
#[values(SonarrEvent::GetEpisodes(None), SonarrEvent::GetEpisodeDetails(0))] event: SonarrEvent,
#[values(SonarrEvent::GetEpisodes(0), SonarrEvent::GetEpisodeDetails(0))] event: SonarrEvent,
) {
assert_str_eq!(event.resource(), "/episode");
}
@@ -1834,7 +1834,7 @@ mod test {
None,
Some(json!([episode_1, episode_2, episode_3])),
None,
SonarrEvent::GetEpisodes(None),
SonarrEvent::GetEpisodes(1),
None,
Some("seriesId=1"),
)
@@ -1876,7 +1876,7 @@ mod test {
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
if let SonarrSerdeable::Episodes(episodes) = network
.handle_sonarr_event(SonarrEvent::GetEpisodes(None))
.handle_sonarr_event(SonarrEvent::GetEpisodes(1))
.await
.unwrap()
{
@@ -1941,7 +1941,7 @@ mod test {
None,
Some(json!([episode_1, episode_2, episode_3])),
None,
SonarrEvent::GetEpisodes(None),
SonarrEvent::GetEpisodes(1),
None,
Some("seriesId=1"),
)
@@ -1962,7 +1962,7 @@ mod test {
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
if let SonarrSerdeable::Episodes(episodes) = network
.handle_sonarr_event(SonarrEvent::GetEpisodes(None))
.handle_sonarr_event(SonarrEvent::GetEpisodes(1))
.await
.unwrap()
{
@@ -2003,7 +2003,7 @@ mod test {
None,
Some(json!([episode()])),
None,
SonarrEvent::GetEpisodes(None),
SonarrEvent::GetEpisodes(1),
None,
Some("seriesId=1"),
)
@@ -2021,7 +2021,7 @@ mod test {
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
if let SonarrSerdeable::Episodes(episodes) = network
.handle_sonarr_event(SonarrEvent::GetEpisodes(None))
.handle_sonarr_event(SonarrEvent::GetEpisodes(1))
.await
.unwrap()
{
@@ -2091,7 +2091,7 @@ mod test {
None,
Some(episodes_json),
None,
SonarrEvent::GetEpisodes(None),
SonarrEvent::GetEpisodes(1),
None,
Some("seriesId=1"),
)
@@ -2125,7 +2125,7 @@ mod test {
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
if let SonarrSerdeable::Episodes(episodes) = network
.handle_sonarr_event(SonarrEvent::GetEpisodes(None))
.handle_sonarr_event(SonarrEvent::GetEpisodes(1))
.await
.unwrap()
{
@@ -2575,73 +2575,6 @@ mod test {
}
}
#[tokio::test]
async fn test_handle_get_episodes_event_uses_provided_series_id() {
let episodes_json = json!([
{
"id": 2,
"seriesId": 2,
"tvdbId": 1234,
"episodeFileId": 2,
"seasonNumber": 2,
"episodeNumber": 2,
"title": "Something cool",
"airDateUtc": "2024-02-10T07:28:45Z",
"overview": "Okay so this one time at band camp...",
"hasFile": true,
"monitored": true
},
{
"id": 1,
"seriesId": 2,
"tvdbId": 1234,
"episodeFileId": 1,
"seasonNumber": 1,
"episodeNumber": 1,
"title": "Something cool",
"airDateUtc": "2024-02-10T07:28:45Z",
"overview": "Okay so this one time at band camp...",
"hasFile": true,
"monitored": true
}
]);
let episode_1 = Episode {
series_id: 2,
episode_file: None,
..episode()
};
let episode_2 = Episode {
id: 2,
episode_file_id: 2,
season_number: 2,
episode_number: 2,
series_id: 2,
episode_file: None,
..episode()
};
let expected_episodes = vec![episode_2.clone(), episode_1.clone()];
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Get,
None,
Some(episodes_json),
None,
SonarrEvent::GetEpisodes(None),
None,
Some("seriesId=2"),
)
.await;
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
if let SonarrSerdeable::Episodes(episodes) = network
.handle_sonarr_event(SonarrEvent::GetEpisodes(Some(2)))
.await
.unwrap()
{
async_server.assert_async().await;
assert_eq!(episodes, expected_episodes);
}
}
#[tokio::test]
async fn test_handle_get_episode_details_event() {
let response: Episode = serde_json::from_str(EPISODE_JSON).unwrap();