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

This commit is contained in:
2024-12-18 01:29:30 -07:00
parent c16ecfb188
commit b12c635c27
8 changed files with 96 additions and 70 deletions
+4 -5
View File
@@ -88,7 +88,7 @@ pub enum SonarrEvent {
TestAllIndexers,
ToggleSeasonMonitoring((i64, i64)),
ToggleEpisodeMonitoring(i64),
TriggerAutomaticEpisodeSearch(Option<i64>),
TriggerAutomaticEpisodeSearch(i64),
TriggerAutomaticSeasonSearch(Option<(i64, i64)>),
TriggerAutomaticSeriesSearch(Option<i64>),
UpdateAllSeries,
@@ -2230,14 +2230,13 @@ impl<'a, 'b> Network<'a, 'b> {
.await
}
async fn trigger_automatic_episode_search(&mut self, episode_id: Option<i64>) -> Result<Value> {
async fn trigger_automatic_episode_search(&mut self, episode_id: i64) -> Result<Value> {
let event = SonarrEvent::TriggerAutomaticEpisodeSearch(episode_id);
let id = self.extract_episode_id(episode_id).await;
info!("Searching indexers for episode with ID: {id}");
info!("Searching indexers for episode with ID: {episode_id}");
let body = SonarrCommandBody {
name: "EpisodeSearch".to_owned(),
episode_ids: Some(vec![id]),
episode_ids: Some(vec![episode_id]),
..SonarrCommandBody::default()
};
+3 -55
View File
@@ -193,7 +193,7 @@ mod test {
#[values(
SonarrEvent::GetQueuedEvents,
SonarrEvent::StartTask(SonarrTaskName::default()),
SonarrEvent::TriggerAutomaticEpisodeSearch(None),
SonarrEvent::TriggerAutomaticEpisodeSearch(0),
SonarrEvent::TriggerAutomaticSeasonSearch(None),
SonarrEvent::TriggerAutomaticSeriesSearch(None),
SonarrEvent::UpdateAllSeries,
@@ -5141,35 +5141,7 @@ mod test {
})),
Some(json!({})),
None,
SonarrEvent::TriggerAutomaticEpisodeSearch(None),
None,
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());
assert!(network
.handle_sonarr_event(SonarrEvent::TriggerAutomaticEpisodeSearch(None))
.await
.is_ok());
async_server.assert_async().await;
}
#[tokio::test]
async fn test_handle_trigger_automatic_episode_search_event_uses_provided_id() {
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Post,
Some(json!({
"name": "EpisodeSearch",
"episodeIds": [ 1 ]
})),
Some(json!({})),
None,
SonarrEvent::TriggerAutomaticEpisodeSearch(Some(1)),
SonarrEvent::TriggerAutomaticEpisodeSearch(1),
None,
None,
)
@@ -5177,37 +5149,13 @@ mod test {
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
assert!(network
.handle_sonarr_event(SonarrEvent::TriggerAutomaticEpisodeSearch(Some(1)))
.handle_sonarr_event(SonarrEvent::TriggerAutomaticEpisodeSearch(1))
.await
.is_ok());
async_server.assert_async().await;
}
#[tokio::test]
#[should_panic(expected = "Season details have not been loaded")]
async fn test_handle_trigger_automatic_episode_search_event_empty_season_details_modal_panics() {
let (_async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Post,
Some(json!({
"name": "EpisodeSearch",
"episodeIds": [ 1 ]
})),
Some(json!({})),
None,
SonarrEvent::TriggerAutomaticEpisodeSearch(None),
None,
None,
)
.await;
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
network
.handle_sonarr_event(SonarrEvent::TriggerAutomaticEpisodeSearch(None))
.await
.unwrap();
}
#[tokio::test]
async fn test_handle_trigger_automatic_season_search_event() {
let (async_server, app_arc, _server) = mock_servarr_api(