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

src/handlers/lidarr_handlers/library/artist_details_handler.rs

@@ -1,11 +1,13 @@
 use crate::app::App;
 use crate::event::Key;
+use crate::handlers::lidarr_handlers::library::delete_album_handler::DeleteAlbumHandler;
 use crate::handlers::table_handler::{TableHandlingConfig, handle_table};
 use crate::handlers::{KeyEventHandler, handle_prompt_toggle};
 use crate::matches_key;
 use crate::models::lidarr_models::Album;
 use crate::models::servarr_data::lidarr::lidarr_data::{
-  ARTIST_DETAILS_BLOCKS, ActiveLidarrBlock, EDIT_ARTIST_SELECTION_BLOCKS,
+  ARTIST_DETAILS_BLOCKS, ActiveLidarrBlock, DELETE_ALBUM_SELECTION_BLOCKS,
+  EDIT_ARTIST_SELECTION_BLOCKS,
 };
 use crate::models::{BlockSelectionState, Route};
 use crate::network::lidarr_network::LidarrEvent;
@@ -18,7 +20,7 @@ pub struct ArtistDetailsHandler<'a, 'b> {
   key: Key,
   app: &'a mut App<'b>,
   active_lidarr_block: ActiveLidarrBlock,
-  _context: Option<ActiveLidarrBlock>,
+  context: Option<ActiveLidarrBlock>,
 }
 
 impl ArtistDetailsHandler<'_, '_> {
@@ -44,12 +46,18 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveLidarrBlock> for ArtistDetailsHandler
       |app| &mut app.data.lidarr_data.albums,
       albums_table_handling_config,
     ) {
-      self.handle_key_event();
+      match self.active_lidarr_block {
+        _ if DeleteAlbumHandler::accepts(self.active_lidarr_block) => {
+          DeleteAlbumHandler::new(self.key, self.app, self.active_lidarr_block, self.context)
+            .handle();
+        }
+        _ => self.handle_key_event(),
+      };
     }
   }
 
   fn accepts(active_block: ActiveLidarrBlock) -> bool {
-    ARTIST_DETAILS_BLOCKS.contains(&active_block)
+    DeleteAlbumHandler::accepts(active_block) || ARTIST_DETAILS_BLOCKS.contains(&active_block)
   }
 
   fn ignore_special_keys(&self) -> bool {
@@ -60,13 +68,13 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveLidarrBlock> for ArtistDetailsHandler
     key: Key,
     app: &'a mut App<'b>,
     active_block: ActiveLidarrBlock,
-    _context: Option<ActiveLidarrBlock>,
+    context: Option<ActiveLidarrBlock>,
   ) -> ArtistDetailsHandler<'a, 'b> {
     ArtistDetailsHandler {
       key,
       app,
       active_lidarr_block: active_block,
-      _context,
+      context,
     }
   }
 
@@ -86,7 +94,15 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveLidarrBlock> for ArtistDetailsHandler
 
   fn handle_end(&mut self) {}
 
-  fn handle_delete(&mut self) {}
+  fn handle_delete(&mut self) {
+    if self.active_lidarr_block == ActiveLidarrBlock::ArtistDetails {
+      self
+        .app
+        .push_navigation_stack(ActiveLidarrBlock::DeleteAlbumPrompt.into());
+      self.app.data.lidarr_data.selected_block =
+        BlockSelectionState::new(DELETE_ALBUM_SELECTION_BLOCKS);
+    }
+  }
 
   fn handle_left_right_action(&mut self) {
     match self.active_lidarr_block {

src/handlers/lidarr_handlers/library/artist_details_handler_tests.rs

@@ -9,9 +9,42 @@ mod tests {
   use crate::handlers::KeyEventHandler;
   use crate::handlers::lidarr_handlers::library::artist_details_handler::ArtistDetailsHandler;
   use crate::models::servarr_data::lidarr::lidarr_data::{
-    ARTIST_DETAILS_BLOCKS, ActiveLidarrBlock,
+    ARTIST_DETAILS_BLOCKS, ActiveLidarrBlock, DELETE_ALBUM_BLOCKS,
   };
 
+  mod test_handle_delete {
+    use super::*;
+    use crate::assert_delete_prompt;
+    use crate::event::Key;
+    use crate::models::lidarr_models::Album;
+    use crate::models::servarr_data::lidarr::lidarr_data::DELETE_ALBUM_SELECTION_BLOCKS;
+    use pretty_assertions::assert_eq;
+
+    const DELETE_KEY: Key = DEFAULT_KEYBINDINGS.delete.key;
+
+    #[test]
+    fn test_album_delete() {
+      let mut app = App::test_default();
+      app
+        .data
+        .lidarr_data
+        .albums
+        .set_items(vec![Album::default()]);
+      app.push_navigation_stack(ActiveLidarrBlock::ArtistDetails.into());
+
+      assert_delete_prompt!(
+        ArtistDetailsHandler,
+        app,
+        ActiveLidarrBlock::ArtistDetails,
+        ActiveLidarrBlock::DeleteAlbumPrompt
+      );
+      assert_eq!(
+        app.data.lidarr_data.selected_block.blocks,
+        DELETE_ALBUM_SELECTION_BLOCKS
+      );
+    }
+  }
+
   mod test_handle_left_right_action {
     use rstest::rstest;
 
@@ -436,8 +469,11 @@ mod tests {
 
   #[test]
   fn test_artist_details_handler_accepts() {
+    let mut artist_details_blocks = ARTIST_DETAILS_BLOCKS.clone().to_vec();
+    artist_details_blocks.extend(DELETE_ALBUM_BLOCKS);
+
     ActiveLidarrBlock::iter().for_each(|active_lidarr_block| {
-      if ARTIST_DETAILS_BLOCKS.contains(&active_lidarr_block) {
+      if artist_details_blocks.contains(&active_lidarr_block) {
         assert!(ArtistDetailsHandler::accepts(active_lidarr_block));
       } else {
         assert!(!ArtistDetailsHandler::accepts(active_lidarr_block));

src/handlers/lidarr_handlers/library/delete_album_handler.rs

@@ -0,0 +1,150 @@
+use crate::models::Route;
+use crate::models::lidarr_models::DeleteParams;
+use crate::models::servarr_data::lidarr::lidarr_data::DELETE_ALBUM_BLOCKS;
+use crate::network::lidarr_network::LidarrEvent;
+use crate::{
+  app::App,
+  event::Key,
+  handlers::{KeyEventHandler, handle_prompt_toggle},
+  matches_key,
+  models::servarr_data::lidarr::lidarr_data::ActiveLidarrBlock,
+};
+
+#[cfg(test)]
+#[path = "delete_album_handler_tests.rs"]
+mod delete_album_handler_tests;
+
+pub(in crate::handlers::lidarr_handlers) struct DeleteAlbumHandler<'a, 'b> {
+  key: Key,
+  app: &'a mut App<'b>,
+  active_lidarr_block: ActiveLidarrBlock,
+  _context: Option<ActiveLidarrBlock>,
+}
+
+impl DeleteAlbumHandler<'_, '_> {
+  fn build_delete_album_params(&mut self) -> DeleteParams {
+    let id = self.app.data.lidarr_data.albums.current_selection().id;
+    let delete_files = self.app.data.lidarr_data.delete_files;
+    let add_import_list_exclusion = self.app.data.lidarr_data.add_import_list_exclusion;
+    self.app.data.lidarr_data.reset_delete_preferences();
+
+    DeleteParams {
+      id,
+      delete_files,
+      add_import_list_exclusion,
+    }
+  }
+}
+
+impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveLidarrBlock> for DeleteAlbumHandler<'a, 'b> {
+  fn accepts(active_block: ActiveLidarrBlock) -> bool {
+    DELETE_ALBUM_BLOCKS.contains(&active_block)
+  }
+
+  fn ignore_special_keys(&self) -> bool {
+    self.app.ignore_special_keys_for_textbox_input
+  }
+
+  fn new(
+    key: Key,
+    app: &'a mut App<'b>,
+    active_block: ActiveLidarrBlock,
+    _context: Option<ActiveLidarrBlock>,
+  ) -> Self {
+    DeleteAlbumHandler {
+      key,
+      app,
+      active_lidarr_block: active_block,
+      _context,
+    }
+  }
+
+  fn get_key(&self) -> Key {
+    self.key
+  }
+
+  fn is_ready(&self) -> bool {
+    !self.app.is_loading
+  }
+
+  fn handle_scroll_up(&mut self) {
+    if self.active_lidarr_block == ActiveLidarrBlock::DeleteAlbumPrompt {
+      self.app.data.lidarr_data.selected_block.up();
+    }
+  }
+
+  fn handle_scroll_down(&mut self) {
+    if self.active_lidarr_block == ActiveLidarrBlock::DeleteAlbumPrompt {
+      self.app.data.lidarr_data.selected_block.down();
+    }
+  }
+
+  fn handle_home(&mut self) {}
+
+  fn handle_end(&mut self) {}
+
+  fn handle_delete(&mut self) {}
+
+  fn handle_left_right_action(&mut self) {
+    if self.active_lidarr_block == ActiveLidarrBlock::DeleteAlbumPrompt {
+      handle_prompt_toggle(self.app, self.key);
+    }
+  }
+
+  fn handle_submit(&mut self) {
+    if self.active_lidarr_block == ActiveLidarrBlock::DeleteAlbumPrompt {
+      match self.app.data.lidarr_data.selected_block.get_active_block() {
+        ActiveLidarrBlock::DeleteAlbumConfirmPrompt => {
+          if self.app.data.lidarr_data.prompt_confirm {
+            self.app.data.lidarr_data.prompt_confirm_action =
+              Some(LidarrEvent::DeleteAlbum(self.build_delete_album_params()));
+            self.app.should_refresh = true;
+          } else {
+            self.app.data.lidarr_data.reset_delete_preferences();
+          }
+
+          self.app.pop_navigation_stack();
+        }
+        ActiveLidarrBlock::DeleteAlbumToggleDeleteFile => {
+          self.app.data.lidarr_data.delete_files = !self.app.data.lidarr_data.delete_files;
+        }
+        ActiveLidarrBlock::DeleteAlbumToggleAddListExclusion => {
+          self.app.data.lidarr_data.add_import_list_exclusion =
+            !self.app.data.lidarr_data.add_import_list_exclusion;
+        }
+        _ => (),
+      }
+    }
+  }
+
+  fn handle_esc(&mut self) {
+    if self.active_lidarr_block == ActiveLidarrBlock::DeleteAlbumPrompt {
+      self.app.pop_navigation_stack();
+      self.app.data.lidarr_data.reset_delete_preferences();
+      self.app.data.lidarr_data.prompt_confirm = false;
+    }
+  }
+
+  fn handle_char_key_event(&mut self) {
+    if self.active_lidarr_block == ActiveLidarrBlock::DeleteAlbumPrompt
+      && self.app.data.lidarr_data.selected_block.get_active_block()
+        == ActiveLidarrBlock::DeleteAlbumConfirmPrompt
+      && matches_key!(confirm, self.key)
+    {
+      self.app.data.lidarr_data.prompt_confirm = true;
+      self.app.data.lidarr_data.prompt_confirm_action =
+        Some(LidarrEvent::DeleteAlbum(self.build_delete_album_params()));
+      self.app.should_refresh = true;
+
+      self.app.pop_navigation_stack();
+    }
+  }
+
+  fn app_mut(&mut self) -> &mut App<'b> {
+    self.app
+  }
+
+  fn current_route(&self) -> Route {
+    self.app.get_current_route()
+  }
+}

src/handlers/lidarr_handlers/library/delete_album_handler_tests.rs

@@ -0,0 +1,404 @@
+#[cfg(test)]
+mod tests {
+  use pretty_assertions::assert_eq;
+  use rstest::rstest;
+  use strum::IntoEnumIterator;
+
+  use crate::app::App;
+  use crate::app::key_binding::DEFAULT_KEYBINDINGS;
+  use crate::event::Key;
+  use crate::handlers::KeyEventHandler;
+  use crate::handlers::lidarr_handlers::library::delete_album_handler::DeleteAlbumHandler;
+  use crate::models::lidarr_models::{Album, DeleteParams};
+  use crate::models::servarr_data::lidarr::lidarr_data::{ActiveLidarrBlock, DELETE_ALBUM_BLOCKS};
+
+  mod test_handle_scroll_up_and_down {
+    use pretty_assertions::assert_eq;
+    use rstest::rstest;
+
+    use crate::models::BlockSelectionState;
+    use crate::models::servarr_data::lidarr::lidarr_data::DELETE_ALBUM_SELECTION_BLOCKS;
+
+    use super::*;
+
+    #[rstest]
+    fn test_delete_album_prompt_scroll(#[values(Key::Up, Key::Down)] key: Key) {
+      let mut app = App::test_default();
+      app.data.lidarr_data.selected_block = BlockSelectionState::new(DELETE_ALBUM_SELECTION_BLOCKS);
+      app.data.lidarr_data.selected_block.down();
+
+      DeleteAlbumHandler::new(key, &mut app, ActiveLidarrBlock::DeleteAlbumPrompt, None).handle();
+
+      if key == Key::Up {
+        assert_eq!(
+          app.data.lidarr_data.selected_block.get_active_block(),
+          ActiveLidarrBlock::DeleteAlbumToggleDeleteFile
+        );
+      } else {
+        assert_eq!(
+          app.data.lidarr_data.selected_block.get_active_block(),
+          ActiveLidarrBlock::DeleteAlbumConfirmPrompt
+        );
+      }
+    }
+
+    #[rstest]
+    fn test_delete_album_prompt_scroll_no_op_when_not_ready(
+      #[values(Key::Up, Key::Down)] key: Key,
+    ) {
+      let mut app = App::test_default();
+      app.is_loading = true;
+      app.data.lidarr_data.selected_block = BlockSelectionState::new(DELETE_ALBUM_SELECTION_BLOCKS);
+      app.data.lidarr_data.selected_block.down();
+
+      DeleteAlbumHandler::new(key, &mut app, ActiveLidarrBlock::DeleteAlbumPrompt, None).handle();
+
+      assert_eq!(
+        app.data.lidarr_data.selected_block.get_active_block(),
+        ActiveLidarrBlock::DeleteAlbumToggleAddListExclusion
+      );
+    }
+  }
+
+  mod test_handle_left_right_action {
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    fn test_left_right_prompt_toggle(#[values(Key::Left, Key::Right)] key: Key) {
+      let mut app = App::test_default();
+      app.push_navigation_stack(ActiveLidarrBlock::DeleteAlbumPrompt.into());
+
+      DeleteAlbumHandler::new(key, &mut app, ActiveLidarrBlock::DeleteAlbumPrompt, None).handle();
+
+      assert!(app.data.lidarr_data.prompt_confirm);
+
+      DeleteAlbumHandler::new(key, &mut app, ActiveLidarrBlock::DeleteAlbumPrompt, None).handle();
+
+      assert!(!app.data.lidarr_data.prompt_confirm);
+    }
+  }
+
+  mod test_handle_submit {
+    use pretty_assertions::assert_eq;
+
+    use crate::models::BlockSelectionState;
+    use crate::models::servarr_data::lidarr::lidarr_data::DELETE_ALBUM_SELECTION_BLOCKS;
+    use crate::network::lidarr_network::LidarrEvent;
+
+    use super::*;
+    use crate::assert_navigation_popped;
+
+    const SUBMIT_KEY: Key = DEFAULT_KEYBINDINGS.submit.key;
+
+    #[test]
+    fn test_delete_album_prompt_prompt_decline_submit() {
+      let mut app = App::test_default();
+      app.push_navigation_stack(ActiveLidarrBlock::ArtistDetails.into());
+      app.push_navigation_stack(ActiveLidarrBlock::DeleteAlbumPrompt.into());
+      app.data.lidarr_data.selected_block = BlockSelectionState::new(DELETE_ALBUM_SELECTION_BLOCKS);
+      app
+        .data
+        .lidarr_data
+        .selected_block
+        .set_index(0, DELETE_ALBUM_SELECTION_BLOCKS.len() - 1);
+      app.data.lidarr_data.delete_files = true;
+      app.data.lidarr_data.add_import_list_exclusion = true;
+
+      DeleteAlbumHandler::new(
+        SUBMIT_KEY,
+        &mut app,
+        ActiveLidarrBlock::DeleteAlbumPrompt,
+        None,
+      )
+      .handle();
+
+      assert_navigation_popped!(app, ActiveLidarrBlock::ArtistDetails.into());
+      assert_none!(app.data.lidarr_data.prompt_confirm_action);
+      assert!(!app.data.lidarr_data.prompt_confirm);
+      assert!(!app.data.lidarr_data.delete_files);
+      assert!(!app.data.lidarr_data.add_import_list_exclusion);
+    }
+
+    #[test]
+    fn test_delete_album_confirm_prompt_prompt_confirmation_submit() {
+      let mut app = App::test_default();
+      app.push_navigation_stack(ActiveLidarrBlock::ArtistDetails.into());
+      app.push_navigation_stack(ActiveLidarrBlock::DeleteAlbumPrompt.into());
+      app.data.lidarr_data.prompt_confirm = true;
+      app.data.lidarr_data.delete_files = true;
+      app.data.lidarr_data.add_import_list_exclusion = true;
+      app
+        .data
+        .lidarr_data
+        .albums
+        .set_items(vec![Album::default()]);
+      let expected_delete_album_params = DeleteParams {
+        id: 0,
+        delete_files: true,
+        add_import_list_exclusion: true,
+      };
+      app.data.lidarr_data.selected_block = BlockSelectionState::new(DELETE_ALBUM_SELECTION_BLOCKS);
+      app
+        .data
+        .lidarr_data
+        .selected_block
+        .set_index(0, DELETE_ALBUM_SELECTION_BLOCKS.len() - 1);
+
+      DeleteAlbumHandler::new(
+        SUBMIT_KEY,
+        &mut app,
+        ActiveLidarrBlock::DeleteAlbumPrompt,
+        None,
+      )
+      .handle();
+
+      assert_navigation_popped!(app, ActiveLidarrBlock::ArtistDetails.into());
+      assert_eq!(
+        app.data.lidarr_data.prompt_confirm_action,
+        Some(LidarrEvent::DeleteAlbum(expected_delete_album_params))
+      );
+      assert!(app.should_refresh);
+      assert!(app.data.lidarr_data.prompt_confirm);
+      assert!(!app.data.lidarr_data.delete_files);
+      assert!(!app.data.lidarr_data.add_import_list_exclusion);
+    }
+
+    #[test]
+    fn test_delete_album_confirm_prompt_prompt_confirmation_submit_no_op_when_not_ready() {
+      let mut app = App::test_default();
+      app.is_loading = true;
+      app.push_navigation_stack(ActiveLidarrBlock::ArtistDetails.into());
+      app.push_navigation_stack(ActiveLidarrBlock::DeleteAlbumPrompt.into());
+      app.data.lidarr_data.prompt_confirm = true;
+      app.data.lidarr_data.delete_files = true;
+      app.data.lidarr_data.add_import_list_exclusion = true;
+
+      DeleteAlbumHandler::new(
+        SUBMIT_KEY,
+        &mut app,
+        ActiveLidarrBlock::DeleteAlbumPrompt,
+        None,
+      )
+      .handle();
+
+      assert_eq!(
+        app.get_current_route(),
+        ActiveLidarrBlock::DeleteAlbumPrompt.into()
+      );
+      assert_none!(app.data.lidarr_data.prompt_confirm_action);
+      assert!(!app.should_refresh);
+      assert!(app.data.lidarr_data.prompt_confirm);
+      assert!(app.data.lidarr_data.delete_files);
+      assert!(app.data.lidarr_data.add_import_list_exclusion);
+    }
+
+    #[test]
+    fn test_delete_album_toggle_delete_files_submit() {
+      let current_route = ActiveLidarrBlock::DeleteAlbumPrompt.into();
+      let mut app = App::test_default();
+      app.data.lidarr_data.selected_block = BlockSelectionState::new(DELETE_ALBUM_SELECTION_BLOCKS);
+      app.push_navigation_stack(ActiveLidarrBlock::DeleteAlbumPrompt.into());
+
+      DeleteAlbumHandler::new(
+        SUBMIT_KEY,
+        &mut app,
+        ActiveLidarrBlock::DeleteAlbumPrompt,
+        None,
+      )
+      .handle();
+
+      assert_eq!(app.get_current_route(), current_route);
+      assert_eq!(app.data.lidarr_data.delete_files, true);
+
+      DeleteAlbumHandler::new(
+        SUBMIT_KEY,
+        &mut app,
+        ActiveLidarrBlock::DeleteAlbumPrompt,
+        None,
+      )
+      .handle();
+
+      assert_eq!(app.get_current_route(), current_route);
+      assert_eq!(app.data.lidarr_data.delete_files, false);
+    }
+  }
+
+  mod test_handle_esc {
+    use super::*;
+    use crate::assert_navigation_popped;
+    use rstest::rstest;
+
+    const ESC_KEY: Key = DEFAULT_KEYBINDINGS.esc.key;
+
+    #[rstest]
+    fn test_delete_album_prompt_esc(#[values(true, false)] is_ready: bool) {
+      let mut app = App::test_default();
+      app.is_loading = is_ready;
+      app.push_navigation_stack(ActiveLidarrBlock::ArtistDetails.into());
+      app.push_navigation_stack(ActiveLidarrBlock::DeleteAlbumPrompt.into());
+      app.data.lidarr_data.prompt_confirm = true;
+      app.data.lidarr_data.delete_files = true;
+      app.data.lidarr_data.add_import_list_exclusion = true;
+
+      DeleteAlbumHandler::new(
+        ESC_KEY,
+        &mut app,
+        ActiveLidarrBlock::DeleteAlbumPrompt,
+        None,
+      )
+      .handle();
+
+      assert_navigation_popped!(app, ActiveLidarrBlock::ArtistDetails.into());
+      assert!(!app.data.lidarr_data.prompt_confirm);
+      assert!(!app.data.lidarr_data.delete_files);
+      assert!(!app.data.lidarr_data.add_import_list_exclusion);
+    }
+  }
+
+  mod test_handle_key_char {
+    use crate::{
+      assert_navigation_popped,
+      models::{
+        BlockSelectionState, servarr_data::lidarr::lidarr_data::DELETE_ALBUM_SELECTION_BLOCKS,
+      },
+      network::lidarr_network::LidarrEvent,
+    };
+    use pretty_assertions::assert_eq;
+
+    use super::*;
+
+    #[test]
+    fn test_delete_album_confirm_prompt_prompt_confirm() {
+      let mut app = App::test_default();
+      app.push_navigation_stack(ActiveLidarrBlock::ArtistDetails.into());
+      app.push_navigation_stack(ActiveLidarrBlock::DeleteAlbumPrompt.into());
+      app.data.lidarr_data.delete_files = true;
+      app.data.lidarr_data.add_import_list_exclusion = true;
+      app
+        .data
+        .lidarr_data
+        .albums
+        .set_items(vec![Album::default()]);
+      let expected_delete_album_params = DeleteParams {
+        id: 0,
+        delete_files: true,
+        add_import_list_exclusion: true,
+      };
+      app.data.lidarr_data.selected_block = BlockSelectionState::new(DELETE_ALBUM_SELECTION_BLOCKS);
+      app
+        .data
+        .lidarr_data
+        .selected_block
+        .set_index(0, DELETE_ALBUM_SELECTION_BLOCKS.len() - 1);
+
+      DeleteAlbumHandler::new(
+        DEFAULT_KEYBINDINGS.confirm.key,
+        &mut app,
+        ActiveLidarrBlock::DeleteAlbumPrompt,
+        None,
+      )
+      .handle();
+
+      assert_navigation_popped!(app, ActiveLidarrBlock::ArtistDetails.into());
+      assert_eq!(
+        app.data.lidarr_data.prompt_confirm_action,
+        Some(LidarrEvent::DeleteAlbum(expected_delete_album_params))
+      );
+      assert!(app.should_refresh);
+      assert!(app.data.lidarr_data.prompt_confirm);
+      assert!(!app.data.lidarr_data.delete_files);
+      assert!(!app.data.lidarr_data.add_import_list_exclusion);
+    }
+  }
+
+  #[test]
+  fn test_delete_album_handler_accepts() {
+    ActiveLidarrBlock::iter().for_each(|active_lidarr_block| {
+      if DELETE_ALBUM_BLOCKS.contains(&active_lidarr_block) {
+        assert!(DeleteAlbumHandler::accepts(active_lidarr_block));
+      } else {
+        assert!(!DeleteAlbumHandler::accepts(active_lidarr_block));
+      }
+    });
+  }
+
+  #[rstest]
+  fn test_delete_album_handler_ignore_special_keys(
+    #[values(true, false)] ignore_special_keys_for_textbox_input: bool,
+  ) {
+    let mut app = App::test_default();
+    app.ignore_special_keys_for_textbox_input = ignore_special_keys_for_textbox_input;
+    let handler = DeleteAlbumHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveLidarrBlock::default(),
+      None,
+    );
+
+    assert_eq!(
+      handler.ignore_special_keys(),
+      ignore_special_keys_for_textbox_input
+    );
+  }
+
+  #[test]
+  fn test_build_delete_album_params() {
+    let mut app = App::test_default();
+    app
+      .data
+      .lidarr_data
+      .albums
+      .set_items(vec![Album::default()]);
+    app.data.lidarr_data.delete_files = true;
+    app.data.lidarr_data.add_import_list_exclusion = true;
+    let expected_delete_album_params = DeleteParams {
+      id: 0,
+      delete_files: true,
+      add_import_list_exclusion: true,
+    };
+
+    let delete_album_params = DeleteAlbumHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveLidarrBlock::DeleteAlbumPrompt,
+      None,
+    )
+    .build_delete_album_params();
+
+    assert_eq!(delete_album_params, expected_delete_album_params);
+    assert!(!app.data.lidarr_data.delete_files);
+    assert!(!app.data.lidarr_data.add_import_list_exclusion);
+  }
+
+  #[test]
+  fn test_delete_album_handler_not_ready_when_loading() {
+    let mut app = App::test_default();
+    app.is_loading = true;
+
+    let handler = DeleteAlbumHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveLidarrBlock::DeleteAlbumPrompt,
+      None,
+    );
+
+    assert!(!handler.is_ready());
+  }
+
+  #[test]
+  fn test_delete_album_handler_ready_when_not_loading() {
+    let mut app = App::test_default();
+    app.is_loading = false;
+
+    let handler = DeleteAlbumHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveLidarrBlock::DeleteAlbumPrompt,
+      None,
+    );
+
+    assert!(handler.is_ready());
+  }
+}

src/handlers/lidarr_handlers/library/delete_artist_handler.rs

@@ -23,9 +23,9 @@ pub(in crate::handlers::lidarr_handlers) struct DeleteArtistHandler<'a, 'b> {
 impl DeleteArtistHandler<'_, '_> {
   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 delete_files = self.app.data.lidarr_data.delete_files;
     let add_import_list_exclusion = self.app.data.lidarr_data.add_import_list_exclusion;
-    self.app.data.lidarr_data.reset_delete_artist_preferences();
+    self.app.data.lidarr_data.reset_delete_preferences();
 
     DeleteParams {
       id,
@@ -99,14 +99,13 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveLidarrBlock> for DeleteArtistHandler<
               Some(LidarrEvent::DeleteArtist(self.build_delete_artist_params()));
             self.app.should_refresh = true;
           } else {
-            self.app.data.lidarr_data.reset_delete_artist_preferences();
+            self.app.data.lidarr_data.reset_delete_preferences();
           }
 
           self.app.pop_navigation_stack();
         }
         ActiveLidarrBlock::DeleteArtistToggleDeleteFile => {
-          self.app.data.lidarr_data.delete_artist_files =
-            !self.app.data.lidarr_data.delete_artist_files;
+          self.app.data.lidarr_data.delete_files = !self.app.data.lidarr_data.delete_files;
         }
         ActiveLidarrBlock::DeleteArtistToggleAddListExclusion => {
           self.app.data.lidarr_data.add_import_list_exclusion =
@@ -120,7 +119,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveLidarrBlock> for DeleteArtistHandler<
   fn handle_esc(&mut self) {
     if self.active_lidarr_block == ActiveLidarrBlock::DeleteArtistPrompt {
       self.app.pop_navigation_stack();
-      self.app.data.lidarr_data.reset_delete_artist_preferences();
+      self.app.data.lidarr_data.reset_delete_preferences();
       self.app.data.lidarr_data.prompt_confirm = false;
     }
   }

src/handlers/lidarr_handlers/library/delete_artist_handler_tests.rs

@@ -106,7 +106,7 @@ mod tests {
         .lidarr_data
         .selected_block
         .set_index(0, DELETE_ARTIST_SELECTION_BLOCKS.len() - 1);
-      app.data.lidarr_data.delete_artist_files = true;
+      app.data.lidarr_data.delete_files = true;
       app.data.lidarr_data.add_import_list_exclusion = true;
 
       DeleteArtistHandler::new(
@@ -120,7 +120,7 @@ mod tests {
       assert_navigation_popped!(app, ActiveLidarrBlock::Artists.into());
       assert_none!(app.data.lidarr_data.prompt_confirm_action);
       assert!(!app.data.lidarr_data.prompt_confirm);
-      assert!(!app.data.lidarr_data.delete_artist_files);
+      assert!(!app.data.lidarr_data.delete_files);
       assert!(!app.data.lidarr_data.add_import_list_exclusion);
     }
 
@@ -130,7 +130,7 @@ mod tests {
       app.push_navigation_stack(ActiveLidarrBlock::Artists.into());
       app.push_navigation_stack(ActiveLidarrBlock::DeleteArtistPrompt.into());
       app.data.lidarr_data.prompt_confirm = true;
-      app.data.lidarr_data.delete_artist_files = true;
+      app.data.lidarr_data.delete_files = true;
       app.data.lidarr_data.add_import_list_exclusion = true;
       app
         .data
@@ -165,7 +165,7 @@ mod tests {
       );
       assert!(app.should_refresh);
       assert!(app.data.lidarr_data.prompt_confirm);
-      assert!(!app.data.lidarr_data.delete_artist_files);
+      assert!(!app.data.lidarr_data.delete_files);
       assert!(!app.data.lidarr_data.add_import_list_exclusion);
     }
 
@@ -176,7 +176,7 @@ mod tests {
       app.push_navigation_stack(ActiveLidarrBlock::Artists.into());
       app.push_navigation_stack(ActiveLidarrBlock::DeleteArtistPrompt.into());
       app.data.lidarr_data.prompt_confirm = true;
-      app.data.lidarr_data.delete_artist_files = true;
+      app.data.lidarr_data.delete_files = true;
       app.data.lidarr_data.add_import_list_exclusion = true;
 
       DeleteArtistHandler::new(
@@ -194,7 +194,7 @@ mod tests {
       assert_none!(app.data.lidarr_data.prompt_confirm_action);
       assert!(!app.should_refresh);
       assert!(app.data.lidarr_data.prompt_confirm);
-      assert!(app.data.lidarr_data.delete_artist_files);
+      assert!(app.data.lidarr_data.delete_files);
       assert!(app.data.lidarr_data.add_import_list_exclusion);
     }
 
@@ -215,7 +215,7 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), current_route);
-      assert_eq!(app.data.lidarr_data.delete_artist_files, true);
+      assert_eq!(app.data.lidarr_data.delete_files, true);
 
       DeleteArtistHandler::new(
         SUBMIT_KEY,
@@ -226,7 +226,7 @@ mod tests {
       .handle();
 
       assert_eq!(app.get_current_route(), current_route);
-      assert_eq!(app.data.lidarr_data.delete_artist_files, false);
+      assert_eq!(app.data.lidarr_data.delete_files, false);
     }
   }
 
@@ -244,7 +244,7 @@ mod tests {
       app.push_navigation_stack(ActiveLidarrBlock::Artists.into());
       app.push_navigation_stack(ActiveLidarrBlock::DeleteArtistPrompt.into());
       app.data.lidarr_data.prompt_confirm = true;
-      app.data.lidarr_data.delete_artist_files = true;
+      app.data.lidarr_data.delete_files = true;
       app.data.lidarr_data.add_import_list_exclusion = true;
 
       DeleteArtistHandler::new(
@@ -257,7 +257,7 @@ mod tests {
 
       assert_navigation_popped!(app, ActiveLidarrBlock::Artists.into());
       assert!(!app.data.lidarr_data.prompt_confirm);
-      assert!(!app.data.lidarr_data.delete_artist_files);
+      assert!(!app.data.lidarr_data.delete_files);
       assert!(!app.data.lidarr_data.add_import_list_exclusion);
     }
   }
@@ -279,7 +279,7 @@ mod tests {
       let mut app = App::test_default();
       app.push_navigation_stack(ActiveLidarrBlock::Artists.into());
       app.push_navigation_stack(ActiveLidarrBlock::DeleteArtistPrompt.into());
-      app.data.lidarr_data.delete_artist_files = true;
+      app.data.lidarr_data.delete_files = true;
       app.data.lidarr_data.add_import_list_exclusion = true;
       app
         .data
@@ -314,7 +314,7 @@ mod tests {
       );
       assert!(app.should_refresh);
       assert!(app.data.lidarr_data.prompt_confirm);
-      assert!(!app.data.lidarr_data.delete_artist_files);
+      assert!(!app.data.lidarr_data.delete_files);
       assert!(!app.data.lidarr_data.add_import_list_exclusion);
     }
   }
@@ -357,7 +357,7 @@ mod tests {
       .lidarr_data
       .artists
       .set_items(vec![Artist::default()]);
-    app.data.lidarr_data.delete_artist_files = true;
+    app.data.lidarr_data.delete_files = true;
     app.data.lidarr_data.add_import_list_exclusion = true;
     let expected_delete_artist_params = DeleteParams {
       id: 0,
@@ -374,7 +374,7 @@ mod tests {
     .build_delete_artist_params();
 
     assert_eq!(delete_artist_params, expected_delete_artist_params);
-    assert!(!app.data.lidarr_data.delete_artist_files);
+    assert!(!app.data.lidarr_data.delete_files);
     assert!(!app.data.lidarr_data.add_import_list_exclusion);
   }
 

src/handlers/lidarr_handlers/library/library_handler_tests.rs

@@ -11,10 +11,10 @@ mod tests {
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
   use crate::handlers::KeyEventHandler;
   use crate::handlers::lidarr_handlers::library::{LibraryHandler, artists_sorting_options};
-  use crate::models::lidarr_models::{Artist, ArtistStatistics, ArtistStatus};
+  use crate::models::lidarr_models::{Album, Artist, ArtistStatistics, ArtistStatus};
   use crate::models::servarr_data::lidarr::lidarr_data::{
-    ADD_ARTIST_BLOCKS, ARTIST_DETAILS_BLOCKS, ActiveLidarrBlock, DELETE_ARTIST_BLOCKS,
-    EDIT_ARTIST_BLOCKS, EDIT_ARTIST_SELECTION_BLOCKS, LIBRARY_BLOCKS,
+    ADD_ARTIST_BLOCKS, ARTIST_DETAILS_BLOCKS, ActiveLidarrBlock, DELETE_ALBUM_BLOCKS,
+    DELETE_ARTIST_BLOCKS, EDIT_ARTIST_BLOCKS, EDIT_ARTIST_SELECTION_BLOCKS, LIBRARY_BLOCKS,
   };
   use crate::models::servarr_data::lidarr::modals::EditArtistModal;
   use crate::network::lidarr_network::LidarrEvent;
@@ -28,6 +28,7 @@ mod tests {
     library_handler_blocks.extend(LIBRARY_BLOCKS);
     library_handler_blocks.extend(ARTIST_DETAILS_BLOCKS);
     library_handler_blocks.extend(DELETE_ARTIST_BLOCKS);
+    library_handler_blocks.extend(DELETE_ALBUM_BLOCKS);
     library_handler_blocks.extend(EDIT_ARTIST_BLOCKS);
     library_handler_blocks.extend(ADD_ARTIST_BLOCKS);
 
@@ -533,6 +534,31 @@ mod tests {
     assert_eq!(app.get_current_route(), ActiveLidarrBlock::Artists.into());
   }
 
+  #[test]
+  fn test_delegates_delete_album_blocks_to_delete_album_handler() {
+    let mut app = App::test_default();
+    app
+      .data
+      .lidarr_data
+      .albums
+      .set_items(vec![Album::default()]);
+    app.push_navigation_stack(ActiveLidarrBlock::ArtistDetails.into());
+    app.push_navigation_stack(ActiveLidarrBlock::DeleteAlbumPrompt.into());
+
+    LibraryHandler::new(
+      DEFAULT_KEYBINDINGS.esc.key,
+      &mut app,
+      ActiveLidarrBlock::DeleteAlbumPrompt,
+      None,
+    )
+    .handle();
+
+    assert_eq!(
+      app.get_current_route(),
+      ActiveLidarrBlock::ArtistDetails.into()
+    );
+  }
+
   #[test]
   fn test_delegates_delete_artist_blocks_to_delete_artist_handler() {
     let mut app = App::test_default();

src/handlers/lidarr_handlers/library/mod.rs

@@ -20,6 +20,7 @@ use crate::handlers::table_handler::{TableHandlingConfig, handle_table};
 
 mod add_artist_handler;
 mod artist_details_handler;
+mod delete_album_handler;
 mod delete_artist_handler;
 mod edit_artist_handler;