feat: Full support for deleting an artist via CLI and TUI

This commit is contained in:
2026-01-05 15:44:51 -07:00
parent bc3aeefa6e
commit 6771a0ab38
43 changed files with 1995 additions and 332 deletions
@@ -0,0 +1,57 @@
use ratatui::Frame;
use ratatui::layout::Rect;
use crate::app::App;
use crate::models::Route;
use crate::models::servarr_data::lidarr::lidarr_data::{ActiveLidarrBlock, DELETE_ARTIST_BLOCKS};
use crate::ui::DrawUi;
use crate::ui::widgets::checkbox::Checkbox;
use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt;
use crate::ui::widgets::popup::{Popup, Size};
#[cfg(test)]
#[path = "delete_artist_ui_tests.rs"]
mod delete_artist_ui_tests;
pub(in crate::ui::lidarr_ui) struct DeleteArtistUi;
impl DrawUi for DeleteArtistUi {
fn accepts(route: Route) -> bool {
let Route::Lidarr(active_lidarr_block, _) = route else {
return false;
};
DELETE_ARTIST_BLOCKS.contains(&active_lidarr_block)
}
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, _area: Rect) {
if matches!(
app.get_current_route(),
Route::Lidarr(ActiveLidarrBlock::DeleteArtistPrompt, _)
) {
let selected_block = app.data.lidarr_data.selected_block.get_active_block();
let prompt = format!(
"Do you really want to delete the artist: \n{}?",
app.data.lidarr_data.artists.current_selection().artist_name.text
);
let checkboxes = vec![
Checkbox::new("Delete Artist Files")
.checked(app.data.lidarr_data.delete_artist_files)
.highlighted(selected_block == ActiveLidarrBlock::DeleteArtistToggleDeleteFile),
Checkbox::new("Add List Exclusion")
.checked(app.data.lidarr_data.add_import_list_exclusion)
.highlighted(selected_block == ActiveLidarrBlock::DeleteArtistToggleAddListExclusion),
];
let confirmation_prompt = ConfirmationPrompt::new()
.title("Delete Artist")
.prompt(&prompt)
.checkboxes(checkboxes)
.yes_no_highlighted(selected_block == ActiveLidarrBlock::DeleteArtistConfirmPrompt)
.yes_no_value(app.data.lidarr_data.prompt_confirm);
f.render_widget(
Popup::new(confirmation_prompt).size(Size::MediumPrompt),
f.area(),
);
}
}
}
@@ -0,0 +1,44 @@
#[cfg(test)]
mod tests {
use strum::IntoEnumIterator;
use crate::app::App;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::lidarr::lidarr_data::{
ActiveLidarrBlock, DELETE_ARTIST_BLOCKS, DELETE_ARTIST_SELECTION_BLOCKS,
};
use crate::ui::DrawUi;
use crate::ui::lidarr_ui::library::delete_artist_ui::DeleteArtistUi;
use crate::ui::ui_test_utils::test_utils::render_to_string_with_app;
#[test]
fn test_delete_artist_ui_accepts() {
ActiveLidarrBlock::iter().for_each(|active_lidarr_block| {
if DELETE_ARTIST_BLOCKS.contains(&active_lidarr_block) {
assert!(DeleteArtistUi::accepts(active_lidarr_block.into()));
} else {
assert!(!DeleteArtistUi::accepts(active_lidarr_block.into()));
}
});
}
mod snapshot_tests {
use crate::ui::ui_test_utils::test_utils::TerminalSize;
use super::*;
#[test]
fn test_delete_artist_ui_renders_delete_artist() {
let mut app = App::test_default_fully_populated();
app.push_navigation_stack(ActiveLidarrBlock::DeleteArtistPrompt.into());
app.data.lidarr_data.selected_block =
BlockSelectionState::new(DELETE_ARTIST_SELECTION_BLOCKS);
let output = render_to_string_with_app(TerminalSize::Large, &mut app, |f, app| {
DeleteArtistUi::draw(f, app, f.area());
});
insta::assert_snapshot!(output);
}
}
}
+238 -7
View File
@@ -2,19 +2,250 @@
mod tests {
use strum::IntoEnumIterator;
use crate::models::servarr_data::lidarr::lidarr_data::{ActiveLidarrBlock, LIBRARY_BLOCKS};
use crate::models::Route;
use crate::models::lidarr_models::{Artist, ArtistStatistics, ArtistStatus};
use crate::models::servarr_data::lidarr::lidarr_data::{
ActiveLidarrBlock, DELETE_ARTIST_BLOCKS, LIBRARY_BLOCKS,
};
use crate::ui::lidarr_ui::library::{LibraryUi, decorate_artist_row_with_style};
use crate::ui::styles::ManagarrStyle;
use crate::ui::DrawUi;
use crate::ui::lidarr_ui::library::LibraryUi;
use pretty_assertions::assert_eq;
use ratatui::widgets::{Cell, Row};
#[test]
fn test_library_ui_accepts() {
for lidarr_block in ActiveLidarrBlock::iter() {
if LIBRARY_BLOCKS.contains(&lidarr_block) {
assert!(LibraryUi::accepts(Route::Lidarr(lidarr_block, None)));
let mut library_ui_blocks = Vec::new();
library_ui_blocks.extend(LIBRARY_BLOCKS);
library_ui_blocks.extend(DELETE_ARTIST_BLOCKS);
for active_lidarr_block in ActiveLidarrBlock::iter() {
if library_ui_blocks.contains(&active_lidarr_block) {
assert!(LibraryUi::accepts(active_lidarr_block.into()));
} else {
assert!(!LibraryUi::accepts(Route::Lidarr(lidarr_block, None)));
assert!(!LibraryUi::accepts(active_lidarr_block.into()));
}
}
}
#[test]
fn test_decorate_row_with_style_unmonitored() {
let artist = Artist::default();
let row = Row::new(vec![Cell::from("test".to_owned())]);
let style = decorate_artist_row_with_style(&artist, row.clone());
assert_eq!(style, row.unmonitored());
}
#[test]
fn test_decorate_row_with_style_downloaded_when_ended_and_all_tracks_present() {
let artist = Artist {
monitored: true,
status: ArtistStatus::Ended,
statistics: Some(ArtistStatistics {
track_file_count: 10,
total_track_count: 10,
..ArtistStatistics::default()
}),
..Artist::default()
};
let row = Row::new(vec![Cell::from("test".to_owned())]);
let style = decorate_artist_row_with_style(&artist, row.clone());
assert_eq!(style, row.downloaded());
}
#[test]
fn test_decorate_row_with_style_missing_when_ended_and_tracks_are_missing() {
let artist = Artist {
monitored: true,
status: ArtistStatus::Ended,
statistics: Some(ArtistStatistics {
track_file_count: 5,
total_track_count: 10,
..ArtistStatistics::default()
}),
..Artist::default()
};
let row = Row::new(vec![Cell::from("test".to_owned())]);
let style = decorate_artist_row_with_style(&artist, row.clone());
assert_eq!(style, row.missing());
}
#[test]
fn test_decorate_row_with_style_indeterminate_when_ended_and_no_statistics() {
let artist = Artist {
monitored: true,
status: ArtistStatus::Ended,
statistics: None,
..Artist::default()
};
let row = Row::new(vec![Cell::from("test".to_owned())]);
let style = decorate_artist_row_with_style(&artist, row.clone());
assert_eq!(style, row.indeterminate());
}
#[test]
fn test_decorate_row_with_style_indeterminate_when_ended_and_total_track_count_is_zero() {
let artist = Artist {
monitored: true,
status: ArtistStatus::Ended,
statistics: Some(ArtistStatistics {
track_file_count: 0,
total_track_count: 0,
..ArtistStatistics::default()
}),
..Artist::default()
};
let row = Row::new(vec![Cell::from("test".to_owned())]);
let style = decorate_artist_row_with_style(&artist, row.clone());
assert_eq!(style, row.missing());
}
#[test]
fn test_decorate_row_with_style_unreleased_when_continuing_and_all_tracks_present() {
let artist = Artist {
monitored: true,
status: ArtistStatus::Continuing,
statistics: Some(ArtistStatistics {
track_file_count: 10,
total_track_count: 10,
..ArtistStatistics::default()
}),
..Artist::default()
};
let row = Row::new(vec![Cell::from("test".to_owned())]);
let style = decorate_artist_row_with_style(&artist, row.clone());
assert_eq!(style, row.unreleased());
}
#[test]
fn test_decorate_row_with_style_missing_when_continuing_and_tracks_are_missing() {
let artist = Artist {
monitored: true,
status: ArtistStatus::Continuing,
statistics: Some(ArtistStatistics {
track_file_count: 5,
total_track_count: 10,
..ArtistStatistics::default()
}),
..Artist::default()
};
let row = Row::new(vec![Cell::from("test".to_owned())]);
let style = decorate_artist_row_with_style(&artist, row.clone());
assert_eq!(style, row.missing());
}
#[test]
fn test_decorate_row_with_style_indeterminate_when_continuing_and_no_statistics() {
let artist = Artist {
monitored: true,
status: ArtistStatus::Continuing,
statistics: None,
..Artist::default()
};
let row = Row::new(vec![Cell::from("test".to_owned())]);
let style = decorate_artist_row_with_style(&artist, row.clone());
assert_eq!(style, row.indeterminate());
}
#[test]
fn test_decorate_row_with_style_defaults_to_indeterminate_for_deleted_status() {
let artist = Artist {
monitored: true,
status: ArtistStatus::Deleted,
..Artist::default()
};
let row = Row::new(vec![Cell::from("test".to_owned())]);
let style = decorate_artist_row_with_style(&artist, row.clone());
assert_eq!(style, row.indeterminate());
}
mod snapshot_tests {
use crate::app::App;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::lidarr::lidarr_data::{
ActiveLidarrBlock, DELETE_ARTIST_SELECTION_BLOCKS,
};
use rstest::rstest;
use crate::ui::lidarr_ui::library::LibraryUi;
use crate::ui::ui_test_utils::test_utils::{TerminalSize, render_to_string_with_app};
use crate::ui::DrawUi;
#[rstest]
fn test_library_ui_renders(
#[values(
ActiveLidarrBlock::Artists,
ActiveLidarrBlock::ArtistsSortPrompt,
ActiveLidarrBlock::SearchArtists,
ActiveLidarrBlock::SearchArtistsError,
ActiveLidarrBlock::FilterArtists,
ActiveLidarrBlock::FilterArtistsError
)]
active_lidarr_block: ActiveLidarrBlock,
) {
let mut app = App::test_default_fully_populated();
app.push_navigation_stack(active_lidarr_block.into());
let output = render_to_string_with_app(TerminalSize::Large, &mut app, |f, app| {
LibraryUi::draw(f, app, f.area());
});
insta::assert_snapshot!(format!("lidarr_library_{active_lidarr_block}"), output);
}
#[test]
fn test_library_ui_renders_loading() {
let mut app = App::test_default_fully_populated();
app.is_loading = true;
app.push_navigation_stack(ActiveLidarrBlock::Artists.into());
let output = render_to_string_with_app(TerminalSize::Large, &mut app, |f, app| {
LibraryUi::draw(f, app, f.area());
});
insta::assert_snapshot!(output);
}
#[test]
fn test_library_ui_renders_empty() {
let mut app = App::test_default();
app.push_navigation_stack(ActiveLidarrBlock::Artists.into());
let output = render_to_string_with_app(TerminalSize::Large, &mut app, |f, app| {
LibraryUi::draw(f, app, f.area());
});
insta::assert_snapshot!(output);
}
#[test]
fn test_library_ui_renders_delete_artist_over_library() {
let mut app = App::test_default_fully_populated();
app.push_navigation_stack(ActiveLidarrBlock::DeleteArtistPrompt.into());
app.data.lidarr_data.selected_block =
BlockSelectionState::new(DELETE_ARTIST_SELECTION_BLOCKS);
let output = render_to_string_with_app(TerminalSize::Large, &mut app, |f, app| {
LibraryUi::draw(f, app, f.area());
});
insta::assert_snapshot!(output);
}
}
}
+9 -1
View File
@@ -1,3 +1,4 @@
use delete_artist_ui::DeleteArtistUi;
use ratatui::{
Frame,
layout::{Constraint, Rect},
@@ -20,6 +21,8 @@ use crate::{
},
};
mod delete_artist_ui;
#[cfg(test)]
#[path = "library_ui_tests.rs"]
mod library_ui_tests;
@@ -29,14 +32,19 @@ pub(super) struct LibraryUi;
impl DrawUi for LibraryUi {
fn accepts(route: Route) -> bool {
if let Route::Lidarr(active_lidarr_block, _) = route {
return LIBRARY_BLOCKS.contains(&active_lidarr_block);
return DeleteArtistUi::accepts(route) || LIBRARY_BLOCKS.contains(&active_lidarr_block);
}
false
}
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
let route = app.get_current_route();
draw_library(f, app, area);
if DeleteArtistUi::accepts(route) {
DeleteArtistUi::draw(f, app, area);
}
}
}
@@ -0,0 +1,38 @@
---
source: src/ui/lidarr_ui/library/delete_artist_ui_tests.rs
expression: output
---
╭───────────────────── Delete Artist ─────────────────────╮
│ Do you really want to delete the artist: │
│ ? │
│ │
│ │
│ ╭───╮ │
│ Delete Artist Files: │ │ │
│ ╰───╯ │
│ ╭───╮ │
│ Add List Exclusion: │ │ │
│ ╰───╯ │
│ │
│ │
│ │
│╭────────────────────────────╮╭───────────────────────────╮│
││ Yes ││ No ││
│╰────────────────────────────╯╰───────────────────────────╯│
╰───────────────────────────────────────────────────────────╯
@@ -0,0 +1,38 @@
---
source: src/ui/lidarr_ui/library/library_ui_tests.rs
expression: output
---
─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags
=> Continuing 0 0.00 GB
╭───────────────────── Delete Artist ─────────────────────╮
│ Do you really want to delete the artist: │
│ ? │
│ │
│ │
│ ╭───╮ │
│ Delete Artist Files: │ │ │
│ ╰───╯ │
│ ╭───╮ │
│ Add List Exclusion: │ │ │
│ ╰───╯ │
│ │
│ │
│ │
│╭────────────────────────────╮╭───────────────────────────╮│
││ Yes ││ No ││
│╰────────────────────────────╯╰───────────────────────────╯│
╰───────────────────────────────────────────────────────────╯
@@ -0,0 +1,5 @@
---
source: src/ui/lidarr_ui/library/library_ui_tests.rs
expression: output
---
─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
@@ -0,0 +1,8 @@
---
source: src/ui/lidarr_ui/library/library_ui_tests.rs
expression: output
---
─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
Loading ...
@@ -0,0 +1,7 @@
---
source: src/ui/lidarr_ui/library/library_ui_tests.rs
expression: output
---
─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags
=> Continuing 0 0.00 GB
@@ -0,0 +1,42 @@
---
source: src/ui/lidarr_ui/library/library_ui_tests.rs
expression: output
---
─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
Name Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags
=> Continuing 0 0.00 GB
╭───────────────────────────────╮
│Name │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
│ │
╰───────────────────────────────╯
@@ -0,0 +1,28 @@
---
source: src/ui/lidarr_ui/library/library_ui_tests.rs
expression: output
---
─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags
=> Continuing 0 0.00 GB
╭───────────────── Filter ──────────────────╮
│artist filter │
╰─────────────────────────────────────────────╯
@@ -0,0 +1,31 @@
---
source: src/ui/lidarr_ui/library/library_ui_tests.rs
expression: output
---
─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags
=> Continuing 0 0.00 GB
╭─────────────── Error ───────────────╮
│The given filter produced empty results│
│ │
╰───────────────────────────────────────╯
@@ -0,0 +1,28 @@
---
source: src/ui/lidarr_ui/library/library_ui_tests.rs
expression: output
---
─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags
=> Continuing 0 0.00 GB
╭───────────────── Search ──────────────────╮
│artist search │
╰─────────────────────────────────────────────╯
@@ -0,0 +1,31 @@
---
source: src/ui/lidarr_ui/library/library_ui_tests.rs
expression: output
---
─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
Name ▼ Type Status Quality Profile Metadata Profile Albums Tracks Size Monitored Tags
=> Continuing 0 0.00 GB
╭─────────────── Error ───────────────╮
│ No items found matching search │
│ │
╰───────────────────────────────────────╯