feat(network): Support for toggling monitoring/unmonitoring a season
This commit is contained in:
@@ -87,6 +87,7 @@ pub enum SonarrEvent {
|
|||||||
StartTask(Option<SonarrTaskName>),
|
StartTask(Option<SonarrTaskName>),
|
||||||
TestIndexer(Option<i64>),
|
TestIndexer(Option<i64>),
|
||||||
TestAllIndexers,
|
TestAllIndexers,
|
||||||
|
ToggleSeasonMonitoring(Option<(i64, i64)>),
|
||||||
TriggerAutomaticEpisodeSearch(Option<i64>),
|
TriggerAutomaticEpisodeSearch(Option<i64>),
|
||||||
TriggerAutomaticSeasonSearch(Option<(i64, i64)>),
|
TriggerAutomaticSeasonSearch(Option<(i64, i64)>),
|
||||||
TriggerAutomaticSeriesSearch(Option<i64>),
|
TriggerAutomaticSeriesSearch(Option<i64>),
|
||||||
@@ -139,7 +140,8 @@ impl NetworkResource for SonarrEvent {
|
|||||||
| SonarrEvent::ListSeries
|
| SonarrEvent::ListSeries
|
||||||
| SonarrEvent::GetSeriesDetails(_)
|
| SonarrEvent::GetSeriesDetails(_)
|
||||||
| SonarrEvent::DeleteSeries(_)
|
| SonarrEvent::DeleteSeries(_)
|
||||||
| SonarrEvent::EditSeries(_) => "/series",
|
| SonarrEvent::EditSeries(_)
|
||||||
|
| SonarrEvent::ToggleSeasonMonitoring(_) => "/series",
|
||||||
SonarrEvent::SearchNewSeries(_) => "/series/lookup",
|
SonarrEvent::SearchNewSeries(_) => "/series/lookup",
|
||||||
SonarrEvent::MarkHistoryItemAsFailed(_) => "/history/failed",
|
SonarrEvent::MarkHistoryItemAsFailed(_) => "/history/failed",
|
||||||
SonarrEvent::TestIndexer(_) => "/indexer/test",
|
SonarrEvent::TestIndexer(_) => "/indexer/test",
|
||||||
@@ -321,6 +323,10 @@ impl<'a, 'b> Network<'a, 'b> {
|
|||||||
.test_all_sonarr_indexers()
|
.test_all_sonarr_indexers()
|
||||||
.await
|
.await
|
||||||
.map(SonarrSerdeable::from),
|
.map(SonarrSerdeable::from),
|
||||||
|
SonarrEvent::ToggleSeasonMonitoring(params) => self
|
||||||
|
.toggle_sonarr_season_monitoring(params)
|
||||||
|
.await
|
||||||
|
.map(SonarrSerdeable::from),
|
||||||
SonarrEvent::TriggerAutomaticSeasonSearch(params) => self
|
SonarrEvent::TriggerAutomaticSeasonSearch(params) => self
|
||||||
.trigger_automatic_season_search(params)
|
.trigger_automatic_season_search(params)
|
||||||
.await
|
.await
|
||||||
@@ -1268,6 +1274,86 @@ impl<'a, 'b> Network<'a, 'b> {
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn toggle_sonarr_season_monitoring(
|
||||||
|
&mut self,
|
||||||
|
series_id_season_number_tuple: Option<(i64, i64)>,
|
||||||
|
) -> Result<()> {
|
||||||
|
let detail_event = SonarrEvent::GetSeriesDetails(None);
|
||||||
|
let event = SonarrEvent::ToggleSeasonMonitoring(series_id_season_number_tuple);
|
||||||
|
let (series_id, season_number) =
|
||||||
|
if let Some((series_id, season_number)) = series_id_season_number_tuple {
|
||||||
|
(Some(series_id), Some(season_number))
|
||||||
|
} else {
|
||||||
|
(None, None)
|
||||||
|
};
|
||||||
|
|
||||||
|
let (series_id, _) = self.extract_series_id(series_id).await;
|
||||||
|
let (season_number, _) = self.extract_season_number(season_number).await;
|
||||||
|
info!("Toggling season monitoring for season {season_number} in series with ID: {series_id}");
|
||||||
|
info!("Fetching series details for series with ID: {series_id}");
|
||||||
|
|
||||||
|
let request_props = self
|
||||||
|
.request_props_from(
|
||||||
|
detail_event,
|
||||||
|
RequestMethod::Get,
|
||||||
|
None::<()>,
|
||||||
|
Some(format!("/{series_id}")),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
let mut response = String::new();
|
||||||
|
|
||||||
|
self
|
||||||
|
.handle_request::<(), Value>(request_props, |detailed_series_body, _| {
|
||||||
|
response = detailed_series_body.to_string()
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
info!("Constructing toggle season monitoring body");
|
||||||
|
|
||||||
|
let mut detailed_series_body: Value = serde_json::from_str(&response).unwrap();
|
||||||
|
let monitored = detailed_series_body
|
||||||
|
.get("seasons")
|
||||||
|
.unwrap()
|
||||||
|
.as_array()
|
||||||
|
.unwrap()
|
||||||
|
.iter()
|
||||||
|
.find(|season| season["seasonNumber"] == season_number)
|
||||||
|
.unwrap()
|
||||||
|
.get("monitored")
|
||||||
|
.unwrap()
|
||||||
|
.as_bool()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
*detailed_series_body
|
||||||
|
.get_mut("seasons")
|
||||||
|
.unwrap()
|
||||||
|
.as_array_mut()
|
||||||
|
.unwrap()
|
||||||
|
.iter_mut()
|
||||||
|
.find(|season| season["seasonNumber"] == season_number)
|
||||||
|
.unwrap()
|
||||||
|
.get_mut("monitored")
|
||||||
|
.unwrap() = json!(!monitored);
|
||||||
|
|
||||||
|
debug!("Toggle season monitoring body: {detailed_series_body:?}");
|
||||||
|
|
||||||
|
let request_props = self
|
||||||
|
.request_props_from(
|
||||||
|
event,
|
||||||
|
RequestMethod::Put,
|
||||||
|
Some(detailed_series_body),
|
||||||
|
Some(format!("/{series_id}")),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
self
|
||||||
|
.handle_request::<Value, ()>(request_props, |_, _| ())
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
async fn get_all_sonarr_indexer_settings(&mut self) -> Result<IndexerSettings> {
|
async fn get_all_sonarr_indexer_settings(&mut self) -> Result<IndexerSettings> {
|
||||||
info!("Fetching Sonarr indexer settings");
|
info!("Fetching Sonarr indexer settings");
|
||||||
let event = SonarrEvent::GetAllIndexerSettings;
|
let event = SonarrEvent::GetAllIndexerSettings;
|
||||||
@@ -1581,7 +1667,15 @@ impl<'a, 'b> Network<'a, 'b> {
|
|||||||
} else {
|
} else {
|
||||||
String::new()
|
String::new()
|
||||||
};
|
};
|
||||||
let episode_details_modal = app.data.sonarr_data.season_details_modal.as_mut().unwrap().episode_details_modal.as_mut().unwrap();
|
let episode_details_modal = app
|
||||||
|
.data
|
||||||
|
.sonarr_data
|
||||||
|
.season_details_modal
|
||||||
|
.as_mut()
|
||||||
|
.unwrap()
|
||||||
|
.episode_details_modal
|
||||||
|
.as_mut()
|
||||||
|
.unwrap();
|
||||||
episode_details_modal.episode_details = ScrollableText::with_string(formatdoc!(
|
episode_details_modal.episode_details = ScrollableText::with_string(formatdoc!(
|
||||||
"
|
"
|
||||||
Title: {}
|
Title: {}
|
||||||
|
|||||||
@@ -162,7 +162,8 @@ mod test {
|
|||||||
SonarrEvent::ListSeries,
|
SonarrEvent::ListSeries,
|
||||||
SonarrEvent::GetSeriesDetails(None),
|
SonarrEvent::GetSeriesDetails(None),
|
||||||
SonarrEvent::DeleteSeries(None),
|
SonarrEvent::DeleteSeries(None),
|
||||||
SonarrEvent::EditSeries(None)
|
SonarrEvent::EditSeries(None),
|
||||||
|
SonarrEvent::ToggleSeasonMonitoring(None)
|
||||||
)]
|
)]
|
||||||
event: SonarrEvent,
|
event: SonarrEvent,
|
||||||
) {
|
) {
|
||||||
@@ -6640,6 +6641,125 @@ mod test {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_handle_toggle_season_monitoring_event() {
|
||||||
|
let mut expected_body: Value = serde_json::from_str(SERIES_JSON).unwrap();
|
||||||
|
*expected_body
|
||||||
|
.get_mut("seasons")
|
||||||
|
.unwrap()
|
||||||
|
.as_array_mut()
|
||||||
|
.unwrap()
|
||||||
|
.iter_mut()
|
||||||
|
.find(|season| season["seasonNumber"] == 1)
|
||||||
|
.unwrap()
|
||||||
|
.get_mut("monitored")
|
||||||
|
.unwrap() = json!(false);
|
||||||
|
|
||||||
|
let (async_details_server, app_arc, mut server) = mock_servarr_api(
|
||||||
|
RequestMethod::Get,
|
||||||
|
None,
|
||||||
|
Some(serde_json::from_str(SERIES_JSON).unwrap()),
|
||||||
|
None,
|
||||||
|
SonarrEvent::GetSeriesDetails(None),
|
||||||
|
Some("/1"),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let async_toggle_server = server
|
||||||
|
.mock(
|
||||||
|
"PUT",
|
||||||
|
format!(
|
||||||
|
"/api/v3{}/1",
|
||||||
|
SonarrEvent::ToggleSeasonMonitoring(None).resource()
|
||||||
|
)
|
||||||
|
.as_str(),
|
||||||
|
)
|
||||||
|
.with_status(202)
|
||||||
|
.match_header("X-Api-Key", "test1234")
|
||||||
|
.match_body(Matcher::Json(expected_body))
|
||||||
|
.create_async()
|
||||||
|
.await;
|
||||||
|
{
|
||||||
|
let mut app = app_arc.lock().await;
|
||||||
|
app.data.sonarr_data.series.set_items(vec![series()]);
|
||||||
|
app.data.sonarr_data.seasons.set_items(vec![season()]);
|
||||||
|
}
|
||||||
|
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
|
||||||
|
|
||||||
|
assert!(network
|
||||||
|
.handle_sonarr_event(SonarrEvent::ToggleSeasonMonitoring(None))
|
||||||
|
.await
|
||||||
|
.is_ok());
|
||||||
|
|
||||||
|
async_details_server.assert_async().await;
|
||||||
|
async_toggle_server.assert_async().await;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_handle_toggle_season_monitoring_event_uses_provided_series_id_and_season_number() {
|
||||||
|
let mut detailed_response: Value = serde_json::from_str(SERIES_JSON).unwrap();
|
||||||
|
*detailed_response
|
||||||
|
.get_mut("seasons")
|
||||||
|
.unwrap()
|
||||||
|
.as_array_mut()
|
||||||
|
.unwrap()
|
||||||
|
.iter_mut()
|
||||||
|
.find(|season| season["seasonNumber"] == 1)
|
||||||
|
.unwrap()
|
||||||
|
.get_mut("seasonNumber")
|
||||||
|
.unwrap() = json!(2);
|
||||||
|
let mut expected_body: Value = detailed_response.clone();
|
||||||
|
*expected_body
|
||||||
|
.get_mut("seasons")
|
||||||
|
.unwrap()
|
||||||
|
.as_array_mut()
|
||||||
|
.unwrap()
|
||||||
|
.iter_mut()
|
||||||
|
.find(|season| season["seasonNumber"] == 2)
|
||||||
|
.unwrap()
|
||||||
|
.get_mut("monitored")
|
||||||
|
.unwrap() = json!(false);
|
||||||
|
|
||||||
|
let (async_details_server, app_arc, mut server) = mock_servarr_api(
|
||||||
|
RequestMethod::Get,
|
||||||
|
None,
|
||||||
|
Some(detailed_response),
|
||||||
|
None,
|
||||||
|
SonarrEvent::GetSeriesDetails(None),
|
||||||
|
Some("/2"),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let async_toggle_server = server
|
||||||
|
.mock(
|
||||||
|
"PUT",
|
||||||
|
format!(
|
||||||
|
"/api/v3{}/2",
|
||||||
|
SonarrEvent::ToggleSeasonMonitoring(Some((2, 2))).resource()
|
||||||
|
)
|
||||||
|
.as_str(),
|
||||||
|
)
|
||||||
|
.with_status(202)
|
||||||
|
.match_header("X-Api-Key", "test1234")
|
||||||
|
.match_body(Matcher::Json(expected_body))
|
||||||
|
.create_async()
|
||||||
|
.await;
|
||||||
|
{
|
||||||
|
let mut app = app_arc.lock().await;
|
||||||
|
app.data.sonarr_data.series.set_items(vec![series()]);
|
||||||
|
app.data.sonarr_data.seasons.set_items(vec![season()]);
|
||||||
|
}
|
||||||
|
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
|
||||||
|
|
||||||
|
assert!(network
|
||||||
|
.handle_sonarr_event(SonarrEvent::ToggleSeasonMonitoring(Some((2, 2))))
|
||||||
|
.await
|
||||||
|
.is_ok());
|
||||||
|
|
||||||
|
async_details_server.assert_async().await;
|
||||||
|
async_toggle_server.assert_async().await;
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_handle_trigger_automatic_episode_search_event() {
|
async fn test_handle_trigger_automatic_episode_search_event() {
|
||||||
let (async_server, app_arc, _server) = mock_servarr_api(
|
let (async_server, app_arc, _server) = mock_servarr_api(
|
||||||
|
|||||||
Reference in New Issue
Block a user