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

fix(sonarr): Pass the episode ID alongside all GetEpisodeDetails events when publishing to the networking channel

Browse Source
This commit is contained in:
Alex Clarke
2024-12-17 23:52:18 -07:00
parent 4fdf9b3df1
commit 30ba1f3317
6 changed files with 54 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/sonarr_network.rs
+6 -7
View File
@@ -59,7 +59,7 @@ pub enum SonarrEvent {
GetHistory(u64),
GetHostConfig,
GetIndexers,
GetEpisodeDetails(Option<i64>),
GetEpisodeDetails(i64),
GetEpisodes(Option<i64>),
GetEpisodeFiles(Option<i64>),
GetEpisodeHistory(Option<i64>),
@@ -1305,19 +1305,18 @@ impl<'a, 'b> Network<'a, 'b> {
.await
}
async fn get_episode_details(&mut self, episode_id: Option<i64>) -> Result<Episode> {
async fn get_episode_details(&mut self, episode_id: i64) -> Result<Episode> {
info!("Fetching Sonarr episode details");
let event = SonarrEvent::GetEpisodeDetails(None);
let id = self.extract_episode_id(episode_id).await;
let event = SonarrEvent::GetEpisodeDetails(episode_id);
info!("Fetching episode details for episode with ID: {id}");
info!("Fetching episode details for episode with ID: {episode_id}");
let request_props = self
.request_props_from(
event,
RequestMethod::Get,
None::<()>,
Some(format!("/{id}")),
Some(format!("/{episode_id}")),
None,
)
.await;
@@ -2227,7 +2226,7 @@ impl<'a, 'b> Network<'a, 'b> {
async fn toggle_sonarr_episode_monitoring(&mut self, episode_id: Option<i64>) -> Result<()> {
let event = SonarrEvent::ToggleEpisodeMonitoring(episode_id);
let detail_event = SonarrEvent::GetEpisodeDetails(None);
let detail_event = SonarrEvent::GetEpisodeDetails(0);
let (id, monitored) = if let Some(episode_id) = episode_id {
info!("Fetching episode details for episode id: {episode_id}");
src/network/sonarr_network_tests.rs
+10 -61
View File
@@ -149,8 +149,7 @@ mod test {
#[rstest]
fn test_resource_episode(
#[values(SonarrEvent::GetEpisodes(None), SonarrEvent::GetEpisodeDetails(None))]
event: SonarrEvent,
#[values(SonarrEvent::GetEpisodes(None), SonarrEvent::GetEpisodeDetails(0))] event: SonarrEvent,
) {
assert_str_eq!(event.resource(), "/episode");
}
@@ -2651,7 +2650,7 @@ mod test {
None,
Some(serde_json::from_str(EPISODE_JSON).unwrap()),
None,
SonarrEvent::GetEpisodeDetails(None),
SonarrEvent::GetEpisodeDetails(1),
Some("/1"),
None,
)
@@ -2669,7 +2668,7 @@ mod test {
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
if let SonarrSerdeable::Episode(episode) = network
.handle_sonarr_event(SonarrEvent::GetEpisodeDetails(None))
.handle_sonarr_event(SonarrEvent::GetEpisodeDetails(1))
.await
.unwrap()
{
@@ -2767,7 +2766,7 @@ mod test {
None,
Some(serde_json::from_str(EPISODE_JSON).unwrap()),
None,
SonarrEvent::GetEpisodeDetails(None),
SonarrEvent::GetEpisodeDetails(1),
Some("/1"),
None,
)
@@ -2782,7 +2781,7 @@ mod test {
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
if let SonarrSerdeable::Episode(episode) = network
.handle_sonarr_event(SonarrEvent::GetEpisodeDetails(None))
.handle_sonarr_event(SonarrEvent::GetEpisodeDetails(1))
.await
.unwrap()
{
@@ -2856,34 +2855,6 @@ mod test {
}
}
#[tokio::test]
async fn test_handle_get_episode_details_event_uses_provided_id() {
let response: Episode = serde_json::from_str(EPISODE_JSON).unwrap();
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Get,
None,
Some(serde_json::from_str(EPISODE_JSON).unwrap()),
None,
SonarrEvent::GetEpisodeDetails(None),
Some("/1"),
None,
)
.await;
let mut season_details_modal = SeasonDetailsModal::default();
season_details_modal.episodes.set_items(vec![episode()]);
app_arc.lock().await.data.sonarr_data.season_details_modal = Some(season_details_modal);
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
if let SonarrSerdeable::Episode(episode) = network
.handle_sonarr_event(SonarrEvent::GetEpisodeDetails(Some(1)))
.await
.unwrap()
{
async_server.assert_async().await;
assert_eq!(episode, response);
}
}
#[tokio::test]
async fn test_handle_get_sonarr_episode_history_event() {
let history_json = json!({"records": [{
@@ -3356,7 +3327,7 @@ mod test {
None,
Some(serde_json::from_str(EPISODE_JSON).unwrap()),
None,
SonarrEvent::GetEpisodeDetails(None),
SonarrEvent::GetEpisodeDetails(1),
Some("/1"),
None,
)
@@ -3365,7 +3336,7 @@ mod test {
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
if let SonarrSerdeable::Episode(episode) = network
.handle_sonarr_event(SonarrEvent::GetEpisodeDetails(Some(1)))
.handle_sonarr_event(SonarrEvent::GetEpisodeDetails(1))
.await
.unwrap()
{
@@ -3374,28 +3345,6 @@ mod test {
}
}
#[tokio::test]
#[should_panic(expected = "Season details have not been loaded")]
async fn test_handle_get_episode_details_event_requires_season_details_modal_to_be_some_when_no_parameter_is_passed(
) {
let (_async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Get,
None,
Some(serde_json::from_str(EPISODE_JSON).unwrap()),
None,
SonarrEvent::GetEpisodeDetails(None),
Some("/1"),
None,
)
.await;
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
network
.handle_sonarr_event(SonarrEvent::GetEpisodeDetails(None))
.await
.unwrap();
}
#[tokio::test]
#[should_panic(expected = "Season details modal is empty")]
async fn test_handle_get_episode_details_event_requires_season_details_modal_to_be_some_when_in_tui_mode(
@@ -3405,7 +3354,7 @@ mod test {
None,
Some(serde_json::from_str(EPISODE_JSON).unwrap()),
None,
SonarrEvent::GetEpisodeDetails(None),
SonarrEvent::GetEpisodeDetails(1),
Some("/1"),
None,
)
@@ -3413,7 +3362,7 @@ mod test {
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
network
.handle_sonarr_event(SonarrEvent::GetEpisodeDetails(Some(1)))
.handle_sonarr_event(SonarrEvent::GetEpisodeDetails(1))
.await
.unwrap();
}
@@ -6186,7 +6135,7 @@ mod test {
None,
Some(json!(body)),
None,
SonarrEvent::GetEpisodeDetails(None),
SonarrEvent::GetEpisodeDetails(2),
Some("/2"),
None,
)