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

feat: CLI support for deleting an album from Lidarr

Browse Source
This commit is contained in:
Alex Clarke
2026-01-09 16:33:32 -07:00
parent b2814371f0
commit 09bee7473f
14 changed files with 402 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/lidarr_handlers/library/artist_details_handler_tests.rs
+89 -93
View File
@@ -4,12 +4,12 @@ mod tests {
use rstest::rstest;
use strum::IntoEnumIterator;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::handlers::lidarr_handlers::library::artist_details_handler::ArtistDetailsHandler;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::handlers::KeyEventHandler;
use crate::handlers::lidarr_handlers::library::artist_details_handler::ArtistDetailsHandler;
use crate::models::servarr_data::lidarr::lidarr_data::{
ActiveLidarrBlock, ARTIST_DETAILS_BLOCKS,
ARTIST_DETAILS_BLOCKS, ActiveLidarrBlock,
};
mod test_handle_left_right_action {
@@ -17,64 +17,59 @@ mod tests {
use crate::app::App;
use crate::event::Key;
use crate::handlers::lidarr_handlers::library::artist_details_handler::ArtistDetailsHandler;
use crate::handlers::KeyEventHandler;
use crate::handlers::lidarr_handlers::library::artist_details_handler::ArtistDetailsHandler;
use crate::models::servarr_data::lidarr::lidarr_data::ActiveLidarrBlock;
#[rstest]
fn test_left_right_prompt_toggle(
#[values(
ActiveLidarrBlock::UpdateAndScanArtistPrompt,
ActiveLidarrBlock::AutomaticallySearchArtistPrompt,
)] active_lidarr_block: ActiveLidarrBlock,
ActiveLidarrBlock::UpdateAndScanArtistPrompt,
ActiveLidarrBlock::AutomaticallySearchArtistPrompt
)]
active_lidarr_block: ActiveLidarrBlock,
#[values(Key::Left, Key::Right)] key: Key,
) {
let mut app = App::test_default();
app.push_navigation_stack(ActiveLidarrBlock::ArtistDetails.into());
app.push_navigation_stack(active_lidarr_block.into());
ArtistDetailsHandler::new(
key,
&mut app,
active_lidarr_block,
None,
)
.handle();
ArtistDetailsHandler::new(key, &mut app, active_lidarr_block, None).handle();
assert!(app.data.lidarr_data.prompt_confirm);
ArtistDetailsHandler::new(
key,
&mut app,
active_lidarr_block,
None,
)
.handle();
ArtistDetailsHandler::new(key, &mut app, active_lidarr_block, None).handle();
assert!(!app.data.lidarr_data.prompt_confirm);
}
}
mod test_handle_submit {
use rstest::rstest;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_popped;
use crate::event::Key;
use crate::handlers::lidarr_handlers::library::artist_details_handler::ArtistDetailsHandler;
use crate::handlers::KeyEventHandler;
use crate::handlers::lidarr_handlers::library::artist_details_handler::ArtistDetailsHandler;
use crate::models::servarr_data::lidarr::lidarr_data::ActiveLidarrBlock;
use crate::network::lidarr_network::lidarr_network_test_utils::test_utils::artist;
use crate::network::lidarr_network::LidarrEvent;
use crate::network::lidarr_network::lidarr_network_test_utils::test_utils::artist;
use rstest::rstest;
const SUBMIT_KEY: Key = DEFAULT_KEYBINDINGS.submit.key;
#[rstest]
#[case(ActiveLidarrBlock::AutomaticallySearchArtistPrompt, LidarrEvent::TriggerAutomaticArtistSearch(1))]
#[case(ActiveLidarrBlock::UpdateAndScanArtistPrompt, LidarrEvent::UpdateAndScanArtist(1))]
#[case(
ActiveLidarrBlock::AutomaticallySearchArtistPrompt,
LidarrEvent::TriggerAutomaticArtistSearch(1)
)]
#[case(
ActiveLidarrBlock::UpdateAndScanArtistPrompt,
LidarrEvent::UpdateAndScanArtist(1)
)]
fn test_artist_details_prompt_confirm_submit(
#[case] prompt_block: ActiveLidarrBlock,
#[case] expected_action: LidarrEvent
#[case] expected_action: LidarrEvent,
) {
let mut app = App::test_default();
app.data.lidarr_data.prompt_confirm = true;
@@ -82,13 +77,7 @@ mod tests {
app.push_navigation_stack(ActiveLidarrBlock::ArtistDetails.into());
app.push_navigation_stack(prompt_block.into());
ArtistDetailsHandler::new(
SUBMIT_KEY,
&mut app,
prompt_block,
None,
)
.handle();
ArtistDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle();
assert!(app.data.lidarr_data.prompt_confirm);
assert_navigation_popped!(app, ActiveLidarrBlock::ArtistDetails.into());
@@ -101,21 +90,16 @@ mod tests {
#[rstest]
fn test_artist_details_prompt_decline_submit(
#[values(
ActiveLidarrBlock::AutomaticallySearchArtistPrompt,
ActiveLidarrBlock::UpdateAndScanArtistPrompt,
)] prompt_block: ActiveLidarrBlock
ActiveLidarrBlock::AutomaticallySearchArtistPrompt,
ActiveLidarrBlock::UpdateAndScanArtistPrompt
)]
prompt_block: ActiveLidarrBlock,
) {
let mut app = App::test_default();
app.push_navigation_stack(ActiveLidarrBlock::ArtistDetails.into());
app.push_navigation_stack(prompt_block.into());
ArtistDetailsHandler::new(
SUBMIT_KEY,
&mut app,
prompt_block,
None,
)
.handle();
ArtistDetailsHandler::new(SUBMIT_KEY, &mut app, prompt_block, None).handle();
assert!(!app.data.lidarr_data.prompt_confirm);
assert_navigation_popped!(app, ActiveLidarrBlock::ArtistDetails.into());
@@ -124,14 +108,14 @@ mod tests {
}
mod test_handle_esc {
use rstest::rstest;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_popped;
use crate::event::Key;
use crate::handlers::lidarr_handlers::library::artist_details_handler::ArtistDetailsHandler;
use crate::handlers::KeyEventHandler;
use crate::handlers::lidarr_handlers::library::artist_details_handler::ArtistDetailsHandler;
use crate::models::servarr_data::lidarr::lidarr_data::ActiveLidarrBlock;
use rstest::rstest;
const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
@@ -140,8 +124,9 @@ mod tests {
#[values(
ActiveLidarrBlock::AutomaticallySearchArtistPrompt,
ActiveLidarrBlock::UpdateAndScanArtistPrompt
)] prompt_block: ActiveLidarrBlock,
#[values(true, false)] is_ready: bool
)]
prompt_block: ActiveLidarrBlock,
#[values(true, false)] is_ready: bool,
) {
let mut app = App::test_default();
app.is_loading = is_ready;
@@ -157,21 +142,23 @@ mod tests {
}
mod test_handle_char_key_event {
use crate::app::App;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::assert_navigation_pushed;
use crate::handlers::KeyEventHandler;
use crate::handlers::lidarr_handlers::library::artist_details_handler::ArtistDetailsHandler;
use crate::models::lidarr_models::Artist;
use crate::models::servarr_data::lidarr::lidarr_data::{
ActiveLidarrBlock, EDIT_ARTIST_SELECTION_BLOCKS,
};
use crate::network::lidarr_network::LidarrEvent;
use crate::{assert_modal_absent, assert_modal_present, assert_navigation_popped};
use pretty_assertions::assert_eq;
use rstest::rstest;
use crate::app::key_binding::DEFAULT_KEYBINDINGS;
use crate::app::App;
use crate::{assert_modal_absent, assert_modal_present, assert_navigation_popped};
use crate::assert_navigation_pushed;
use crate::handlers::lidarr_handlers::library::artist_details_handler::ArtistDetailsHandler;
use crate::handlers::KeyEventHandler;
use crate::models::lidarr_models::{Artist};
use crate::models::servarr_data::lidarr::lidarr_data::{ActiveLidarrBlock, EDIT_ARTIST_SELECTION_BLOCKS};
use crate::network::lidarr_network::LidarrEvent;
#[rstest]
fn test_artist_details_edit_key(
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock,
) {
let mut app = App::test_default_fully_populated();
app.push_navigation_stack(ActiveLidarrBlock::ArtistDetails.into());
@@ -183,7 +170,7 @@ mod tests {
active_lidarr_block,
None,
)
.handle();
.handle();
assert_navigation_pushed!(
app,
@@ -203,7 +190,7 @@ mod tests {
#[rstest]
fn test_artist_details_edit_key_no_op_when_not_ready(
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock,
) {
let mut app = App::test_default();
app.is_loading = true;
@@ -216,7 +203,7 @@ mod tests {
active_lidarr_block,
None,
)
.handle();
.handle();
assert_eq!(app.get_current_route(), active_lidarr_block.into());
assert_modal_absent!(app.data.lidarr_data.edit_artist_modal);
@@ -235,9 +222,12 @@ mod tests {
ActiveLidarrBlock::ArtistDetails,
None,
)
.handle();
.handle();
assert_eq!(app.get_current_route(), ActiveLidarrBlock::ArtistDetails.into());
assert_eq!(
app.get_current_route(),
ActiveLidarrBlock::ArtistDetails.into()
);
assert!(app.data.lidarr_data.prompt_confirm);
assert!(app.is_routing);
assert_eq!(
@@ -259,9 +249,12 @@ mod tests {
ActiveLidarrBlock::ArtistDetails,
None,
)
.handle();
.handle();
assert_eq!(app.get_current_route(), ActiveLidarrBlock::ArtistDetails.into());
assert_eq!(
app.get_current_route(),
ActiveLidarrBlock::ArtistDetails.into()
);
assert!(!app.data.lidarr_data.prompt_confirm);
assert_none!(app.data.lidarr_data.prompt_confirm_action);
}
@@ -281,7 +274,7 @@ mod tests {
ActiveLidarrBlock::ArtistDetails,
None,
)
.handle();
.handle();
assert!(!app.data.lidarr_data.prompt_confirm);
assert!(app.data.lidarr_data.prompt_confirm_action.is_none());
@@ -289,7 +282,7 @@ mod tests {
#[rstest]
fn test_artist_details_auto_search_key(
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock,
) {
let mut app = App::test_default_fully_populated();
app.push_navigation_stack(active_lidarr_block.into());
@@ -300,7 +293,7 @@ mod tests {
active_lidarr_block,
None,
)
.handle();
.handle();
assert_navigation_pushed!(
app,
@@ -310,7 +303,7 @@ mod tests {
#[rstest]
fn test_artist_details_auto_search_key_no_op_when_not_ready(
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock,
) {
let mut app = App::test_default_fully_populated();
app.is_loading = true;
@@ -322,14 +315,14 @@ mod tests {
active_lidarr_block,
None,
)
.handle();
.handle();
assert_eq!(app.get_current_route(), active_lidarr_block.into());
}
#[rstest]
fn test_artist_details_update_key(
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock,
) {
let mut app = App::test_default_fully_populated();
app.push_navigation_stack(active_lidarr_block.into());
@@ -340,14 +333,14 @@ mod tests {
active_lidarr_block,
None,
)
.handle();
.handle();
assert_navigation_pushed!(app, ActiveLidarrBlock::UpdateAndScanArtistPrompt.into());
}
#[rstest]
fn test_artist_details_update_key_no_op_when_not_ready(
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock,
) {
let mut app = App::test_default_fully_populated();
app.is_loading = true;
@@ -359,14 +352,14 @@ mod tests {
active_lidarr_block,
None,
)
.handle();
.handle();
assert_eq!(app.get_current_route(), active_lidarr_block.into());
}
#[rstest]
fn test_artist_details_refresh_key(
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock,
) {
let mut app = App::test_default_fully_populated();
app.is_routing = false;
@@ -381,16 +374,13 @@ mod tests {
)
.handle();
assert_navigation_pushed!(
app,
active_lidarr_block.into()
);
assert_navigation_pushed!(app, active_lidarr_block.into());
assert!(app.is_routing);
}
#[rstest]
fn test_artist_details_refresh_key_no_op_when_not_ready(
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock,
) {
let mut app = App::test_default();
app.is_loading = true;
@@ -403,12 +393,9 @@ mod tests {
active_lidarr_block,
None,
)
.handle();
.handle();
assert_eq!(
app.get_current_route(),
active_lidarr_block.into()
);
assert_eq!(app.get_current_route(), active_lidarr_block.into());
assert!(!app.is_routing);
}
@@ -424,8 +411,7 @@ mod tests {
fn test_artist_details_prompt_confirm_key(
#[case] prompt_block: ActiveLidarrBlock,
#[case] expected_action: LidarrEvent,
#[values(ActiveLidarrBlock::ArtistDetails)]
active_lidarr_block: ActiveLidarrBlock,
#[values(ActiveLidarrBlock::ArtistDetails)] active_lidarr_block: ActiveLidarrBlock,
) {
let mut app = App::test_default_fully_populated();
app.push_navigation_stack(active_lidarr_block.into());
@@ -463,8 +449,13 @@ mod tests {
fn test_extract_artist_id() {
let mut app = App::test_default_fully_populated();
let artist_id = ArtistDetailsHandler::new(DEFAULT_KEYBINDINGS.esc.key,
&mut app, ActiveLidarrBlock::ArtistDetails, None).extract_artist_id();
let artist_id = ArtistDetailsHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveLidarrBlock::ArtistDetails,
None,
)
.extract_artist_id();
assert_eq!(artist_id, 1);
}
@@ -473,8 +464,13 @@ mod tests {
fn test_extract_album_id() {
let mut app = App::test_default_fully_populated();
let album_id = ArtistDetailsHandler::new(DEFAULT_KEYBINDINGS.esc.key,
&mut app, ActiveLidarrBlock::ArtistDetails, None).extract_album_id();
let album_id = ArtistDetailsHandler::new(
DEFAULT_KEYBINDINGS.esc.key,
&mut app,
ActiveLidarrBlock::ArtistDetails,
None,
)
.extract_album_id();
assert_eq!(album_id, 1);
}
src/handlers/lidarr_handlers/library/delete_artist_handler.rs
+3 -3
View File
@@ -1,5 +1,5 @@
use crate::models::Route;
use crate::models::lidarr_models::DeleteArtistParams;
use crate::models::lidarr_models::DeleteParams;
use crate::network::lidarr_network::LidarrEvent;
use crate::{
app::App,
@@ -21,13 +21,13 @@ pub(in crate::handlers::lidarr_handlers) struct DeleteArtistHandler<'a, 'b> {
}
impl DeleteArtistHandler<'_, '_> {
fn build_delete_artist_params(&mut self) -> DeleteArtistParams {
fn build_delete_artist_params(&mut self) -> DeleteParams {
let id = self.app.data.lidarr_data.artists.current_selection().id;
let delete_files = self.app.data.lidarr_data.delete_artist_files;
let add_import_list_exclusion = self.app.data.lidarr_data.add_import_list_exclusion;
self.app.data.lidarr_data.reset_delete_artist_preferences();
DeleteArtistParams {
DeleteParams {
id,
delete_files,
add_import_list_exclusion,
src/handlers/lidarr_handlers/library/delete_artist_handler_tests.rs
+4 -4
View File
@@ -9,7 +9,7 @@ mod tests {
use crate::event::Key;
use crate::handlers::KeyEventHandler;
use crate::handlers::lidarr_handlers::library::delete_artist_handler::DeleteArtistHandler;
use crate::models::lidarr_models::{Artist, DeleteArtistParams};
use crate::models::lidarr_models::{Artist, DeleteParams};
use crate::models::servarr_data::lidarr::lidarr_data::{ActiveLidarrBlock, DELETE_ARTIST_BLOCKS};
mod test_handle_scroll_up_and_down {
@@ -137,7 +137,7 @@ mod tests {
.lidarr_data
.artists
.set_items(vec![Artist::default()]);
let expected_delete_artist_params = DeleteArtistParams {
let expected_delete_artist_params = DeleteParams {
id: 0,
delete_files: true,
add_import_list_exclusion: true,
@@ -286,7 +286,7 @@ mod tests {
.lidarr_data
.artists
.set_items(vec![Artist::default()]);
let expected_delete_artist_params = DeleteArtistParams {
let expected_delete_artist_params = DeleteParams {
id: 0,
delete_files: true,
add_import_list_exclusion: true,
@@ -359,7 +359,7 @@ mod tests {
.set_items(vec![Artist::default()]);
app.data.lidarr_data.delete_artist_files = true;
app.data.lidarr_data.add_import_list_exclusion = true;
let expected_delete_artist_params = DeleteArtistParams {
let expected_delete_artist_params = DeleteParams {
id: 0,
delete_files: true,
add_import_list_exclusion: true,