fix(sonarr): Pass the episode file ID alongside all DeleteEpisodeFile events when publishing to the networking channel
This commit is contained in:
@@ -65,6 +65,19 @@ impl<'a, 'b> SeasonDetailsHandler<'a, 'b> {
|
||||
.season_releases,
|
||||
SonarrRelease
|
||||
);
|
||||
|
||||
fn extract_episode_file_id(&self) -> i64 {
|
||||
self
|
||||
.app
|
||||
.data
|
||||
.sonarr_data
|
||||
.season_details_modal
|
||||
.as_ref()
|
||||
.expect("Season details have not been loaded")
|
||||
.episodes
|
||||
.current_selection()
|
||||
.episode_file_id
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeasonDetailsHandler<'a, 'b> {
|
||||
@@ -234,7 +247,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeasonDetailsHandler
|
||||
ActiveSonarrBlock::DeleteEpisodeFilePrompt => {
|
||||
if self.app.data.sonarr_data.prompt_confirm {
|
||||
self.app.data.sonarr_data.prompt_confirm_action =
|
||||
Some(SonarrEvent::DeleteEpisodeFile(None));
|
||||
Some(SonarrEvent::DeleteEpisodeFile(self.extract_episode_file_id()));
|
||||
}
|
||||
|
||||
self.app.pop_navigation_stack();
|
||||
@@ -374,7 +387,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveSonarrBlock> for SeasonDetailsHandler
|
||||
ActiveSonarrBlock::DeleteEpisodeFilePrompt if key == DEFAULT_KEYBINDINGS.confirm.key => {
|
||||
self.app.data.sonarr_data.prompt_confirm = true;
|
||||
self.app.data.sonarr_data.prompt_confirm_action =
|
||||
Some(SonarrEvent::DeleteEpisodeFile(None));
|
||||
Some(SonarrEvent::DeleteEpisodeFile(self.extract_episode_file_id()));
|
||||
|
||||
self.app.pop_navigation_stack();
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ mod tests {
|
||||
use crate::models::servarr_models::{Language, Quality, QualityWrapper};
|
||||
use crate::models::sonarr_models::{SonarrRelease, SonarrReleaseDownloadBody};
|
||||
use crate::models::HorizontallyScrollableText;
|
||||
use pretty_assertions::assert_str_eq;
|
||||
use pretty_assertions::{assert_str_eq, assert_eq};
|
||||
use rstest::rstest;
|
||||
use serde_json::Number;
|
||||
use std::cmp::Ordering;
|
||||
@@ -279,7 +279,7 @@ mod tests {
|
||||
)]
|
||||
#[case(
|
||||
ActiveSonarrBlock::DeleteEpisodeFilePrompt,
|
||||
SonarrEvent::DeleteEpisodeFile(None)
|
||||
SonarrEvent::DeleteEpisodeFile(0)
|
||||
)]
|
||||
fn test_season_details_prompt_confirm_submit(
|
||||
#[case] prompt_block: ActiveSonarrBlock,
|
||||
@@ -708,7 +708,7 @@ mod tests {
|
||||
)]
|
||||
#[case(
|
||||
ActiveSonarrBlock::DeleteEpisodeFilePrompt,
|
||||
SonarrEvent::DeleteEpisodeFile(None)
|
||||
SonarrEvent::DeleteEpisodeFile(0)
|
||||
)]
|
||||
fn test_season_details_prompt_confirm_confirm_key(
|
||||
#[case] prompt_block: ActiveSonarrBlock,
|
||||
@@ -782,6 +782,34 @@ mod tests {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_extract_episode_file_id() {
|
||||
let mut app = App::default();
|
||||
app.data.sonarr_data = create_test_sonarr_data();
|
||||
|
||||
let episode_file_id = SeasonDetailsHandler::with(
|
||||
DEFAULT_KEYBINDINGS.esc.key,
|
||||
&mut app,
|
||||
ActiveSonarrBlock::SeasonDetails,
|
||||
None,
|
||||
).extract_episode_file_id();
|
||||
|
||||
assert_eq!(episode_file_id, 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[should_panic(expected = "Season details have not been loaded")]
|
||||
fn test_extract_episode_file_id_empty_season_details_modal_panics() {
|
||||
let mut app = App::default();
|
||||
|
||||
let episode_file_id = SeasonDetailsHandler::with(
|
||||
DEFAULT_KEYBINDINGS.esc.key,
|
||||
&mut app,
|
||||
ActiveSonarrBlock::SeasonDetails,
|
||||
None,
|
||||
).extract_episode_file_id();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_season_details_handler_is_not_ready_when_loading() {
|
||||
|
||||
Reference in New Issue
Block a user