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

fix(sonarr): Pass the series ID and season number alongside all toggle season monitoring events when publishing to the networking channel

Browse Source
This commit is contained in:
Alex Clarke
2024-12-18 01:12:32 -07:00
parent 1d404d4d2c
commit 18a8b81631
6 changed files with 103 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/sonarr/mod.rs
+1 -1
View File
@@ -285,7 +285,7 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, SonarrCommand> for SonarrCliHandler<'a, '
let resp = self let resp = self
.network .network
.handle_network_event( .handle_network_event(
SonarrEvent::ToggleSeasonMonitoring(Some((series_id, season_number))).into(), SonarrEvent::ToggleSeasonMonitoring((series_id, season_number)).into(),
) )
.await?; .await?;
serde_json::to_string_pretty(&resp)? serde_json::to_string_pretty(&resp)?
src/cli/sonarr/sonarr_command_tests.rs
+1 -2
View File
@@ -729,8 +729,7 @@ mod tests {
mock_network mock_network
.expect_handle_network_event() .expect_handle_network_event()
.with(eq::<NetworkEvent>( .with(eq::<NetworkEvent>(
SonarrEvent::ToggleSeasonMonitoring(Some((expected_series_id, expected_season_number))) SonarrEvent::ToggleSeasonMonitoring((expected_series_id, expected_season_number)).into(),
.into(),
)) ))
.times(1) .times(1)
.returning(|_| { .returning(|_| {
src/handlers/sonarr_handlers/library/series_details_handler.rs
+15 -2
View File
@@ -37,6 +37,18 @@ impl<'a, 'b> SeriesDetailsHandler<'a, 'b> {
.expect("Series history is undefined"), .expect("Series history is undefined"),
SonarrHistoryItem SonarrHistoryItem
); );
fn extract_series_id_season_number_tuple(&self) -> (i64, i64) {
let series_id = self.app.data.sonarr_data.series.current_selection().id;
let season_number = self
.app
.data
.sonarr_data
.seasons
.current_selection()
.season_number;
(series_id, season_number)
}
} }
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler<'a, 'b> { impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler<'a, 'b> {
@@ -259,8 +271,9 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeriesDetailsHandler
} }
_ if key == DEFAULT_KEYBINDINGS.toggle_monitoring.key => { _ if key == DEFAULT_KEYBINDINGS.toggle_monitoring.key => {
self.app.data.sonarr_data.prompt_confirm = true; self.app.data.sonarr_data.prompt_confirm = true;
self.app.data.sonarr_data.prompt_confirm_action = self.app.data.sonarr_data.prompt_confirm_action = Some(
Some(SonarrEvent::ToggleSeasonMonitoring(None)); SonarrEvent::ToggleSeasonMonitoring(self.extract_series_id_season_number_tuple()),
);
self self
.app .app
src/handlers/sonarr_handlers/library/series_details_handler_tests.rs
+20 -1
View File
@@ -4,6 +4,7 @@ mod tests {
use crate::app::App; use crate::app::App;
use crate::event::Key; use crate::event::Key;
use crate::handlers::sonarr_handlers::library::series_details_handler::SeriesDetailsHandler; use crate::handlers::sonarr_handlers::library::series_details_handler::SeriesDetailsHandler;
use crate::handlers::sonarr_handlers::sonarr_handler_test_utils::utils::{season, series};
use crate::handlers::KeyEventHandler; use crate::handlers::KeyEventHandler;
use crate::models::servarr_data::sonarr::sonarr_data::{ use crate::models::servarr_data::sonarr::sonarr_data::{
ActiveSonarrBlock, SERIES_DETAILS_BLOCKS, ActiveSonarrBlock, SERIES_DETAILS_BLOCKS,
@@ -11,6 +12,7 @@ mod tests {
use crate::models::sonarr_models::Season; use crate::models::sonarr_models::Season;
use crate::models::sonarr_models::SonarrHistoryItem; use crate::models::sonarr_models::SonarrHistoryItem;
use crate::models::stateful_table::StatefulTable; use crate::models::stateful_table::StatefulTable;
use pretty_assertions::assert_eq;
use rstest::rstest; use rstest::rstest;
use strum::IntoEnumIterator; use strum::IntoEnumIterator;
@@ -398,7 +400,7 @@ mod tests {
assert!(app.is_routing); assert!(app.is_routing);
assert_eq!( assert_eq!(
app.data.sonarr_data.prompt_confirm_action, app.data.sonarr_data.prompt_confirm_action,
Some(SonarrEvent::ToggleSeasonMonitoring(None)) Some(SonarrEvent::ToggleSeasonMonitoring((0, 0)))
); );
} }
@@ -610,6 +612,23 @@ mod tests {
}); });
} }
#[test]
fn test_extract_series_id_season_number_tuple() {
let mut app = App::default();
app.data.sonarr_data.series.set_items(vec![series()]);
app.data.sonarr_data.seasons.set_items(vec![season()]);
let series_id_season_number_tuple = SeriesDetailsHandler::with(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveSonarrBlock::SeriesDetails,
None,
)
.extract_series_id_season_number_tuple();
assert_eq!(series_id_season_number_tuple, (1, 1));
}
#[test] #[test]
fn test_series_details_handler_is_not_ready_when_loading() { fn test_series_details_handler_is_not_ready_when_loading() {
let mut app = App::default(); let mut app = App::default();
src/network/sonarr_network.rs
+63 -68
View File
@@ -86,7 +86,7 @@ pub enum SonarrEvent {
StartTask(SonarrTaskName), StartTask(SonarrTaskName),
TestIndexer(i64), TestIndexer(i64),
TestAllIndexers, TestAllIndexers,
ToggleSeasonMonitoring(Option<(i64, i64)>), ToggleSeasonMonitoring((i64, i64)),
ToggleEpisodeMonitoring(Option<i64>), ToggleEpisodeMonitoring(Option<i64>),
TriggerAutomaticEpisodeSearch(Option<i64>), TriggerAutomaticEpisodeSearch(Option<i64>),
TriggerAutomaticSeasonSearch(Option<(i64, i64)>), TriggerAutomaticSeasonSearch(Option<(i64, i64)>),
@@ -967,86 +967,81 @@ impl<'a, 'b> Network<'a, 'b> {
async fn toggle_sonarr_season_monitoring( async fn toggle_sonarr_season_monitoring(
&mut self, &mut self,
series_id_season_number_tuple: Option<(i64, i64)>, series_id_season_number_tuple: (i64, i64),
) -> Result<()> { ) -> Result<()> {
let event = SonarrEvent::ToggleSeasonMonitoring(series_id_season_number_tuple); let event = SonarrEvent::ToggleSeasonMonitoring(series_id_season_number_tuple);
let (series_id, season_number) = let (series_id, season_number) = series_id_season_number_tuple;
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 detail_event = SonarrEvent::GetSeriesDetails(series_id); let detail_event = SonarrEvent::GetSeriesDetails(series_id);
if let Ok((season_number, _)) = self.extract_season_number(season_number).await { info!("Toggling season monitoring for season {season_number} in series with ID: {series_id}");
info!("Toggling season monitoring for season {season_number} in series with ID: {series_id}"); info!("Fetching series details for series with ID: {series_id}");
info!("Fetching series details for series with ID: {series_id}");
let request_props = self let request_props = self
.request_props_from( .request_props_from(
detail_event, detail_event,
RequestMethod::Get, RequestMethod::Get,
None::<()>, None::<()>,
Some(format!("/{series_id}")), Some(format!("/{series_id}")),
None, None,
) )
.await; .await;
let mut response = String::new(); let mut response = String::new();
self self
.handle_request::<(), Value>(request_props, |detailed_series_body, _| { .handle_request::<(), Value>(request_props, |detailed_series_body, _| {
response = detailed_series_body.to_string() response = detailed_series_body.to_string()
}) })
.await?; .await?;
info!("Constructing toggle season monitoring body"); info!("Constructing toggle season monitoring body");
let mut detailed_series_body: Value = match serde_json::from_str::<Value>(&response) {
serde_json::from_str(&response).expect("Request for detailed series body was interrupted"); Ok(mut detailed_series_body) => {
let monitored = detailed_series_body let monitored = detailed_series_body
.get("seasons") .get("seasons")
.unwrap() .unwrap()
.as_array() .as_array()
.unwrap() .unwrap()
.iter() .iter()
.find(|season| season["seasonNumber"] == season_number) .find(|season| season["seasonNumber"] == season_number)
.unwrap() .unwrap()
.get("monitored") .get("monitored")
.unwrap() .unwrap()
.as_bool() .as_bool()
.unwrap(); .unwrap();
*detailed_series_body *detailed_series_body
.get_mut("seasons") .get_mut("seasons")
.unwrap() .unwrap()
.as_array_mut() .as_array_mut()
.unwrap() .unwrap()
.iter_mut() .iter_mut()
.find(|season| season["seasonNumber"] == season_number) .find(|season| season["seasonNumber"] == season_number)
.unwrap() .unwrap()
.get_mut("monitored") .get_mut("monitored")
.unwrap() = json!(!monitored); .unwrap() = json!(!monitored);
debug!("Toggle season monitoring body: {detailed_series_body:?}"); debug!("Toggle season monitoring body: {detailed_series_body:?}");
let request_props = self let request_props = self
.request_props_from( .request_props_from(
event, event,
RequestMethod::Put, RequestMethod::Put,
Some(detailed_series_body), Some(detailed_series_body),
Some(format!("/{series_id}")), Some(format!("/{series_id}")),
None, None,
) )
.await; .await;
self self
.handle_request::<Value, ()>(request_props, |_, _| ()) .handle_request::<Value, ()>(request_props, |_, _| ())
.await .await
} else { }
warn!("Season number was not provided. Aborting..."); Err(_) => {
Ok(()) warn!("Request for detailed series body was interrupted");
Ok(())
}
} }
} }
src/network/sonarr_network_tests.rs
+3 -68
View File
@@ -162,7 +162,7 @@ mod test {
SonarrEvent::GetSeriesDetails(0), SonarrEvent::GetSeriesDetails(0),
SonarrEvent::DeleteSeries(DeleteSeriesParams::default()), SonarrEvent::DeleteSeries(DeleteSeriesParams::default()),
SonarrEvent::EditSeries(EditSeriesParams::default()), SonarrEvent::EditSeries(EditSeriesParams::default()),
SonarrEvent::ToggleSeasonMonitoring(None) SonarrEvent::ToggleSeasonMonitoring((0, 0))
)] )]
event: SonarrEvent, event: SonarrEvent,
) { ) {
@@ -5145,7 +5145,7 @@ mod test {
"PUT", "PUT",
format!( format!(
"/api/v3{}/1", "/api/v3{}/1",
SonarrEvent::ToggleSeasonMonitoring(None).resource() SonarrEvent::ToggleSeasonMonitoring((1, 1)).resource()
) )
.as_str(), .as_str(),
) )
@@ -5162,72 +5162,7 @@ mod test {
let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new()); let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new());
assert!(network assert!(network
.handle_sonarr_event(SonarrEvent::ToggleSeasonMonitoring(None)) .handle_sonarr_event(SonarrEvent::ToggleSeasonMonitoring((1, 1)))
.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(2),
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 .await
.is_ok()); .is_ok());