fix(sonarr): pass the series ID alongside all TriggerAutomaticSeriesSearch events when publishing to the networking channel

This commit is contained in:
2024-12-18 01:38:05 -07:00
parent ed645dd0d5
commit 33249f509f
6 changed files with 40 additions and 48 deletions
+4 -5
View File
@@ -90,7 +90,7 @@ pub enum SonarrEvent {
ToggleEpisodeMonitoring(i64),
TriggerAutomaticEpisodeSearch(i64),
TriggerAutomaticSeasonSearch((i64, i64)),
TriggerAutomaticSeriesSearch(Option<i64>),
TriggerAutomaticSeriesSearch(i64),
UpdateAllSeries,
UpdateAndScanSeries(Option<i64>),
UpdateDownloads,
@@ -2178,14 +2178,13 @@ impl<'a, 'b> Network<'a, 'b> {
.await
}
async fn trigger_automatic_series_search(&mut self, series_id: Option<i64>) -> Result<Value> {
async fn trigger_automatic_series_search(&mut self, series_id: i64) -> Result<Value> {
let event = SonarrEvent::TriggerAutomaticSeriesSearch(series_id);
let (id, _) = self.extract_series_id(series_id).await;
info!("Searching indexers for series with ID: {id}");
info!("Searching indexers for series with ID: {series_id}");
let body = SonarrCommandBody {
name: "SeriesSearch".to_owned(),
series_id: Some(id),
series_id: Some(series_id),
..SonarrCommandBody::default()
};
+3 -35
View File
@@ -195,7 +195,7 @@ mod test {
SonarrEvent::StartTask(SonarrTaskName::default()),
SonarrEvent::TriggerAutomaticEpisodeSearch(0),
SonarrEvent::TriggerAutomaticSeasonSearch((0, 0)),
SonarrEvent::TriggerAutomaticSeriesSearch(None),
SonarrEvent::TriggerAutomaticSeriesSearch(0),
SonarrEvent::UpdateAllSeries,
SonarrEvent::UpdateAndScanSeries(None),
SonarrEvent::UpdateDownloads
@@ -5192,39 +5192,7 @@ mod test {
})),
Some(json!({})),
None,
SonarrEvent::TriggerAutomaticSeriesSearch(None),
None,
None,
)
.await;
app_arc
.lock()
.await
.data
.sonarr_data
.series
.set_items(vec![series()]);
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
assert!(network
.handle_sonarr_event(SonarrEvent::TriggerAutomaticSeriesSearch(None))
.await
.is_ok());
async_server.assert_async().await;
}
#[tokio::test]
async fn test_handle_trigger_automatic_series_search_event_uses_provided_id() {
let (async_server, app_arc, _server) = mock_servarr_api(
RequestMethod::Post,
Some(json!({
"name": "SeriesSearch",
"seriesId": 1
})),
Some(json!({})),
None,
SonarrEvent::TriggerAutomaticSeriesSearch(None),
SonarrEvent::TriggerAutomaticSeriesSearch(1),
None,
None,
)
@@ -5232,7 +5200,7 @@ mod test {
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
assert!(network
.handle_sonarr_event(SonarrEvent::TriggerAutomaticSeriesSearch(Some(1)))
.handle_sonarr_event(SonarrEvent::TriggerAutomaticSeriesSearch(1))
.await
.is_ok());