Cleaned up active radarr block delegation to not have giant match arms and instead just check an array, and fixed a UI bug that shows an error message if a movie is already in a user's library.

src/ui/mod.rs

@@ -1,5 +1,6 @@
 use tui::backend::Backend;
 use tui::layout::{Alignment, Constraint, Rect};
+use tui::style::Modifier;
 use tui::text::{Span, Spans, Text};
 use tui::widgets::Paragraph;
 use tui::widgets::Row;
@@ -291,6 +292,30 @@ pub fn loading<B: Backend>(f: &mut Frame<'_, B>, block: Block<'_>, area: Rect, i
   }
 }
 
+pub fn draw_error_popup_over<B: Backend>(
+  f: &mut Frame<'_, B>,
+  app: &mut App,
+  area: Rect,
+  message: &str,
+  background_fn: fn(&mut Frame<'_, B>, &mut App, Rect),
+) {
+  background_fn(f, app, area);
+  draw_error_popup(f, message);
+}
+
+pub fn draw_error_popup<B: Backend>(f: &mut Frame<'_, B>, message: &str) {
+  let prompt_area = centered_rect(25, 8, f.size());
+  f.render_widget(Clear, prompt_area);
+
+  let error_message = Paragraph::new(Text::from(message))
+    .block(title_block_centered("Error").style(style_failure()))
+    .style(style_failure().add_modifier(Modifier::BOLD))
+    .wrap(Wrap { trim: false })
+    .alignment(Alignment::Center);
+
+  f.render_widget(error_message, prompt_area);
+}
+
 pub fn draw_prompt_box<B: Backend>(
   f: &mut Frame<'_, B>,
   prompt_area: Rect,

src/ui/radarr_ui/add_movie_ui.rs

@@ -8,13 +8,13 @@ use crate::app::radarr::ActiveRadarrBlock;
 use crate::models::radarr_models::AddMovieSearchResult;
 use crate::models::Route;
 use crate::ui::utils::{
-  borderless_block, centered_rect, get_width_with_margin, horizontal_chunks, layout_block,
-  layout_error_paragraph, layout_paragraph_borderless, show_cursor, style_default, style_help,
-  style_primary, title_block_centered, vertical_chunks_with_margin,
+  borderless_block, get_width_with_margin, horizontal_chunks, layout_block,
+  layout_paragraph_borderless, show_cursor, style_default, style_help, style_primary,
+  title_block_centered, vertical_chunks_with_margin,
 };
 use crate::ui::{
   draw_button, draw_drop_down_list, draw_drop_down_menu_button, draw_drop_down_popup,
-  draw_medium_popup_over, draw_table, TableProps,
+  draw_error_popup, draw_error_popup_over, draw_medium_popup_over, draw_table, TableProps,
 };
 use crate::utils::convert_runtime;
 use crate::App;
@@ -35,6 +35,13 @@ pub(super) fn draw_add_movie_search_popup<B: Backend>(
       | ActiveRadarrBlock::AddMovieSelectQualityProfile => {
         draw_medium_popup_over(f, app, area, draw_add_movie_search, draw_confirmation_popup);
       }
+      ActiveRadarrBlock::AddMovieAlreadyInLibrary => draw_error_popup_over(
+        f,
+        app,
+        area,
+        "This film is already in your library",
+        draw_add_movie_search,
+      ),
       _ => (),
     }
   }
@@ -83,7 +90,8 @@ fn draw_add_movie_search<B: Backend>(f: &mut Frame<'_, B>, app: &mut App, area:
       | ActiveRadarrBlock::AddMoviePrompt
       | ActiveRadarrBlock::AddMovieSelectMonitor
       | ActiveRadarrBlock::AddMovieSelectMinimumAvailability
-      | ActiveRadarrBlock::AddMovieSelectQualityProfile => {
+      | ActiveRadarrBlock::AddMovieSelectQualityProfile
+      | ActiveRadarrBlock::AddMovieAlreadyInLibrary => {
         let mut help_text = Text::from("<enter> details | <esc> edit search");
         help_text.patch_style(style_help());
         let help_paragraph = Paragraph::new(help_text)
@@ -96,10 +104,7 @@ fn draw_add_movie_search<B: Backend>(f: &mut Frame<'_, B>, app: &mut App, area:
           && !app.is_routing
         {
           f.render_widget(layout_block(), chunks[1]);
-          f.render_widget(
-            layout_error_paragraph("No movies found matching your query!"),
-            centered_rect(30, 10, chunks[1]),
-          );
+          draw_error_popup(f, "No movies found matching your query!");
         } else {
           draw_table(
             f,

src/ui/radarr_ui/mod.rs

@@ -9,7 +9,9 @@ use tui::text::Text;
 use tui::widgets::{Cell, Paragraph, Row};
 use tui::Frame;
 
-use crate::app::radarr::{ActiveRadarrBlock, RadarrData};
+use crate::app::radarr::{
+  ActiveRadarrBlock, RadarrData, ADD_MOVIE_BLOCKS, COLLECTION_DETAILS_BLOCKS, MOVIE_DETAILS_BLOCKS,
+};
 use crate::app::App;
 use crate::logos::RADARR_LOGO;
 use crate::models::radarr_models::{DiskSpace, DownloadRecord, Movie};
@@ -55,38 +57,23 @@ pub(super) fn draw_radarr_ui<B: Backend>(f: &mut Frame<'_, B>, app: &mut App, ar
       }
       ActiveRadarrBlock::Downloads => draw_downloads(f, app, content_rect),
       ActiveRadarrBlock::Collections => draw_collections(f, app, content_rect),
-      ActiveRadarrBlock::MovieDetails
-      | ActiveRadarrBlock::MovieHistory
-      | ActiveRadarrBlock::FileInfo
-      | ActiveRadarrBlock::Cast
-      | ActiveRadarrBlock::Crew
-      | ActiveRadarrBlock::AutomaticallySearchMoviePrompt
-      | ActiveRadarrBlock::RefreshAndScanPrompt
-      | ActiveRadarrBlock::ManualSearch
-      | ActiveRadarrBlock::ManualSearchConfirmPrompt => {
+      _ if MOVIE_DETAILS_BLOCKS.contains(&active_radarr_block) => {
         draw_large_popup_over(f, app, content_rect, draw_library, draw_movie_info_popup)
       }
-      ActiveRadarrBlock::AddMovieSearchInput
-      | ActiveRadarrBlock::AddMovieSearchResults
-      | ActiveRadarrBlock::AddMoviePrompt
-      | ActiveRadarrBlock::AddMovieSelectMonitor
-      | ActiveRadarrBlock::AddMovieSelectMinimumAvailability
-      | ActiveRadarrBlock::AddMovieSelectQualityProfile => draw_large_popup_over(
+      _ if ADD_MOVIE_BLOCKS.contains(&active_radarr_block) => draw_large_popup_over(
         f,
         app,
         content_rect,
         draw_library,
         draw_add_movie_search_popup,
       ),
-      ActiveRadarrBlock::CollectionDetails | ActiveRadarrBlock::ViewMovieOverview => {
-        draw_large_popup_over(
-          f,
-          app,
-          content_rect,
-          draw_collections,
-          draw_collection_details_popup,
-        )
-      }
+      _ if COLLECTION_DETAILS_BLOCKS.contains(&active_radarr_block) => draw_large_popup_over(
+        f,
+        app,
+        content_rect,
+        draw_collections,
+        draw_collection_details_popup,
+      ),
       ActiveRadarrBlock::DeleteMoviePrompt => {
         draw_prompt_popup_over(f, app, content_rect, draw_library, draw_delete_movie_prompt)
       }

src/ui/utils.rs

@@ -93,14 +93,6 @@ pub fn layout_paragraph_borderless(string: &str) -> Paragraph {
     .alignment(Alignment::Center)
 }
 
-pub fn layout_error_paragraph(string: &str) -> Paragraph {
-  Paragraph::new(Text::from(string))
-    .block(layout_block_with_title(title_style("Error")))
-    .style(style_failure().add_modifier(Modifier::BOLD))
-    .wrap(Wrap { trim: false })
-    .alignment(Alignment::Center)
-}
-
 pub fn borderless_block<'a>() -> Block<'a> {
   Block::default()
 }