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

feat: TUI support for deleting a Lidarr album from the artist details popup

Browse Source
This commit is contained in:
Alex Clarke
2026-01-09 17:21:10 -07:00
parent 09bee7473f
commit f31810e48a
21 changed files with 953 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/lidarr_ui/library/artist_details_ui.rs
+4 -2
View File
@@ -11,6 +11,7 @@ use crate::app::App;
use crate::models::Route;
use crate::models::lidarr_models::Album;
use crate::models::servarr_data::lidarr::lidarr_data::{ARTIST_DETAILS_BLOCKS, ActiveLidarrBlock};
use crate::ui::lidarr_ui::library::delete_album_ui::DeleteAlbumUi;
use crate::ui::styles::ManagarrStyle;
use crate::ui::utils::{
borderless_block, get_width_from_percentage, layout_block_top_border, title_block,
@@ -32,10 +33,10 @@ impl DrawUi for ArtistDetailsUi {
let Route::Lidarr(active_lidarr_block, _) = route else {
return false;
};
ARTIST_DETAILS_BLOCKS.contains(&active_lidarr_block)
DeleteAlbumUi::accepts(route) || ARTIST_DETAILS_BLOCKS.contains(&active_lidarr_block)
}
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, _area: Rect) {
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
let route = app.get_current_route();
if let Route::Lidarr(active_lidarr_block, _) = route {
let draw_artist_details_popup = |f: &mut Frame<'_>, app: &mut App<'_>, popup_area: Rect| {
@@ -65,6 +66,7 @@ impl DrawUi for ArtistDetailsUi {
draw_artist_details(f, app, content_area);
match active_lidarr_block {
_ if DeleteAlbumUi::accepts(route) => DeleteAlbumUi::draw(f, app, area),
ActiveLidarrBlock::AutomaticallySearchArtistPrompt => {
let prompt = format!(
"Do you want to trigger an automatic search of your indexers for all monitored album(s) for the artist: {}?",
src/ui/lidarr_ui/library/artist_details_ui_tests.rs
+21 -2
View File
@@ -3,7 +3,7 @@ mod tests {
use strum::IntoEnumIterator;
use crate::models::servarr_data::lidarr::lidarr_data::{
ARTIST_DETAILS_BLOCKS, ActiveLidarrBlock,
ARTIST_DETAILS_BLOCKS, ActiveLidarrBlock, DELETE_ALBUM_BLOCKS,
};
use crate::ui::DrawUi;
use crate::ui::lidarr_ui::library::artist_details_ui::ArtistDetailsUi;
@@ -11,6 +11,8 @@ mod tests {
#[test]
fn test_artist_details_ui_accepts() {
let mut blocks = ARTIST_DETAILS_BLOCKS.clone().to_vec();
blocks.extend(DELETE_ALBUM_BLOCKS);
ActiveLidarrBlock::iter().for_each(|active_lidarr_block| {
if blocks.contains(&active_lidarr_block) {
assert!(ArtistDetailsUi::accepts(active_lidarr_block.into()));
@@ -24,7 +26,10 @@ mod tests {
use rstest::rstest;
use crate::app::App;
use crate::models::servarr_data::lidarr::lidarr_data::ActiveLidarrBlock;
use crate::models::BlockSelectionState;
use crate::models::servarr_data::lidarr::lidarr_data::{
ActiveLidarrBlock, DELETE_ALBUM_SELECTION_BLOCKS,
};
use crate::models::stateful_table::StatefulTable;
use crate::ui::DrawUi;
use crate::ui::lidarr_ui::library::artist_details_ui::ArtistDetailsUi;
@@ -96,6 +101,20 @@ mod tests {
);
}
#[test]
fn test_artist_details_ui_renders_delete_album_prompt_over_artist_details() {
let mut app = App::test_default_fully_populated();
app.data.lidarr_data.selected_block = BlockSelectionState::new(DELETE_ALBUM_SELECTION_BLOCKS);
app.push_navigation_stack(ActiveLidarrBlock::ArtistDetails.into());
app.push_navigation_stack(ActiveLidarrBlock::DeleteAlbumPrompt.into());
let output = render_to_string_with_app(TerminalSize::Large, &mut app, |f, app| {
ArtistDetailsUi::draw(f, app, f.area());
});
insta::assert_snapshot!(output);
}
#[test]
fn test_artist_details_ui_renders_update_and_scan_prompt_over_artist_details() {
let mut app = App::test_default_fully_populated();
src/ui/lidarr_ui/library/delete_album_ui.rs
+57
View File
@@ -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_ALBUM_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_album_ui_tests.rs"]
mod delete_album_ui_tests;
pub(in crate::ui::lidarr_ui) struct DeleteAlbumUi;
impl DrawUi for DeleteAlbumUi {
fn accepts(route: Route) -> bool {
let Route::Lidarr(active_lidarr_block, _) = route else {
return false;
};
DELETE_ALBUM_BLOCKS.contains(&active_lidarr_block)
}
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, _area: Rect) {
if matches!(
app.get_current_route(),
Route::Lidarr(ActiveLidarrBlock::DeleteAlbumPrompt, _)
) {
let selected_block = app.data.lidarr_data.selected_block.get_active_block();
let prompt = format!(
"Do you really want to delete the album: \n{}?",
app.data.lidarr_data.albums.current_selection().title.text
);
let checkboxes = vec![
Checkbox::new("Delete Album Files")
.checked(app.data.lidarr_data.delete_files)
.highlighted(selected_block == ActiveLidarrBlock::DeleteAlbumToggleDeleteFile),
Checkbox::new("Add List Exclusion")
.checked(app.data.lidarr_data.add_import_list_exclusion)
.highlighted(selected_block == ActiveLidarrBlock::DeleteAlbumToggleAddListExclusion),
];
let confirmation_prompt = ConfirmationPrompt::new()
.title("Delete Album")
.prompt(&prompt)
.checkboxes(checkboxes)
.yes_no_highlighted(selected_block == ActiveLidarrBlock::DeleteAlbumConfirmPrompt)
.yes_no_value(app.data.lidarr_data.prompt_confirm);
f.render_widget(
Popup::new(confirmation_prompt).size(Size::MediumPrompt),
f.area(),
);
}
}
}
src/ui/lidarr_ui/library/delete_album_ui_tests.rs
+43
View File
@@ -0,0 +1,43 @@
#[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_ALBUM_BLOCKS, DELETE_ALBUM_SELECTION_BLOCKS,
};
use crate::ui::DrawUi;
use crate::ui::lidarr_ui::library::delete_album_ui::DeleteAlbumUi;
use crate::ui::ui_test_utils::test_utils::render_to_string_with_app;
#[test]
fn test_delete_album_ui_accepts() {
ActiveLidarrBlock::iter().for_each(|active_lidarr_block| {
if DELETE_ALBUM_BLOCKS.contains(&active_lidarr_block) {
assert!(DeleteAlbumUi::accepts(active_lidarr_block.into()));
} else {
assert!(!DeleteAlbumUi::accepts(active_lidarr_block.into()));
}
});
}
mod snapshot_tests {
use crate::ui::ui_test_utils::test_utils::TerminalSize;
use super::*;
#[test]
fn test_delete_album_ui_renders_delete_album() {
let mut app = App::test_default_fully_populated();
app.push_navigation_stack(ActiveLidarrBlock::DeleteAlbumPrompt.into());
app.data.lidarr_data.selected_block = BlockSelectionState::new(DELETE_ALBUM_SELECTION_BLOCKS);
let output = render_to_string_with_app(TerminalSize::Large, &mut app, |f, app| {
DeleteAlbumUi::draw(f, app, f.area());
});
insta::assert_snapshot!(output);
}
}
}
src/ui/lidarr_ui/library/delete_artist_ui.rs
+1 -1
View File
@@ -41,7 +41,7 @@ impl DrawUi for DeleteArtistUi {
);
let checkboxes = vec![
Checkbox::new("Delete Artist Files")
.checked(app.data.lidarr_data.delete_artist_files)
.checked(app.data.lidarr_data.delete_files)
.highlighted(selected_block == ActiveLidarrBlock::DeleteArtistToggleDeleteFile),
Checkbox::new("Add List Exclusion")
.checked(app.data.lidarr_data.add_import_list_exclusion)
src/ui/lidarr_ui/library/library_ui_tests.rs
+3 -2
View File
@@ -4,8 +4,8 @@ mod tests {
use crate::models::lidarr_models::{Artist, ArtistStatistics, ArtistStatus};
use crate::models::servarr_data::lidarr::lidarr_data::{
ADD_ARTIST_BLOCKS, ARTIST_DETAILS_BLOCKS, ActiveLidarrBlock, DELETE_ARTIST_BLOCKS,
EDIT_ARTIST_BLOCKS, LIBRARY_BLOCKS,
ADD_ARTIST_BLOCKS, ARTIST_DETAILS_BLOCKS, ActiveLidarrBlock, DELETE_ALBUM_BLOCKS,
DELETE_ARTIST_BLOCKS, EDIT_ARTIST_BLOCKS, LIBRARY_BLOCKS,
};
use crate::ui::DrawUi;
use crate::ui::lidarr_ui::library::{LibraryUi, decorate_artist_row_with_style};
@@ -18,6 +18,7 @@ mod tests {
let mut library_ui_blocks = Vec::new();
library_ui_blocks.extend(LIBRARY_BLOCKS);
library_ui_blocks.extend(DELETE_ARTIST_BLOCKS);
library_ui_blocks.extend(DELETE_ALBUM_BLOCKS);
library_ui_blocks.extend(EDIT_ARTIST_BLOCKS);
library_ui_blocks.extend(ADD_ARTIST_BLOCKS);
library_ui_blocks.extend(ARTIST_DETAILS_BLOCKS);
src/ui/lidarr_ui/library/mod.rs
+2 -1
View File
@@ -33,6 +33,7 @@ mod artist_details_ui;
mod delete_artist_ui;
mod edit_artist_ui;
mod delete_album_ui;
#[cfg(test)]
#[path = "library_ui_tests.rs"]
mod library_ui_tests;
@@ -59,8 +60,8 @@ impl DrawUi for LibraryUi {
match route {
_ if AddArtistUi::accepts(route) => AddArtistUi::draw(f, app, area),
_ if DeleteArtistUi::accepts(route) => DeleteArtistUi::draw(f, app, area),
_ if EditArtistUi::accepts(route) => EditArtistUi::draw(f, app, area),
_ if ArtistDetailsUi::accepts(route) => ArtistDetailsUi::draw(f, app, area),
_ if EditArtistUi::accepts(route) => EditArtistUi::draw(f, app, area),
Route::Lidarr(ActiveLidarrBlock::UpdateAllArtistsPrompt, _) => {
let confirmation_prompt = ConfirmationPrompt::new()
.title("Update All Artists")
src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__artist_details_ui__artist_details_ui_tests__tests__snapshot_tests__artist_details_ui_renders_delete_album_prompt_over_artist_details.snap
+52
View File
@@ -0,0 +1,52 @@
---
source: src/ui/lidarr_ui/library/artist_details_ui_tests.rs
expression: output
---
╭ Alex ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│Artist: Alex │
│Overview: some interesting description of the artist │
│Disambiguation: American pianist │
│Type: Person │
│Status: Continuing │
│Genres: soundtrack │
│Rating: 84% │
│Path: /nfs/music/test-artist │
│Quality Profile: Lossless │
│Metadata Profile: Standard │
│Monitored: Yes │
│Albums: 1 │
│Tracks: 15/15 ╭───────────────────── Delete Album ──────────────────────╮ │
│Size on Disk: 0.00 GB │ Do you really want to delete the album: │ │
│ │ Test Album? │ │
│ │ │ │
│╭ Artist Details ───────────────────────│ │───────────────────────────────────────────╮│
││ Albums │ ╭───╮ │ ││
││─────────────────────────────────────────│ Delete Album Files: │ ✔ │ │───────────────────────────────────────────││
││ Monitored Title │ ╰───╯ │ Release Date Size ││
││=> 🏷 Test Album │ ╭───╮ │ 2023-01-01 0.00 GB ││
││ │ Add List Exclusion: │ │ │ ││
││ │ ╰───╯ │ ││
││ │ │ ││
││ │ │ ││
││ │ │ ││
││ │╭────────────────────────────╮╭───────────────────────────╮│ ││
││ ││ Yes ││ No ││ ││
││ │╰────────────────────────────╯╰───────────────────────────╯│ ││
││ ╰───────────────────────────────────────────────────────────╯ ││
││ ││
││ ││
││ ││
││ ││
││ ││
││ ││
││ ││
││ ││
││ ││
││ ││
││ ││
││ ││
│╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯│
╰───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
src/ui/lidarr_ui/library/snapshots/managarr__ui__lidarr_ui__library__delete_album_ui__delete_album_ui_tests__tests__snapshot_tests__delete_album_ui_renders_delete_album.snap
+38
View File
@@ -0,0 +1,38 @@
---
source: src/ui/lidarr_ui/library/delete_album_ui_tests.rs
expression: output
---
╭───────────────────── Delete Album ──────────────────────╮
│ Do you really want to delete the album: │
│ Test Album? │
│ │
│ │
│ ╭───╮ │
│ Delete Album Files: │ ✔ │ │
│ ╰───╯ │
│ ╭───╮ │
│ Add List Exclusion: │ │ │
│ ╰───╯ │
│ │
│ │
│ │
│╭────────────────────────────╮╭───────────────────────────╮│
││ Yes ││ No ││
│╰────────────────────────────╯╰───────────────────────────╯│
╰───────────────────────────────────────────────────────────╯