Refactored table filtering and searching so that they are now relative to the table being filtered/searched on. Also created two new widgets for error messages and popups to make life easier moving forward. Going to refactor table sorting into StatefulTable's as well so all tables can be searched, filtered, and sorted moving forwards.

2024-02-11 19:02:18 -07:00
parent 5973f4d685
commit adda82f7f3
38 changed files with 1561 additions and 1165 deletions
@@ -17,11 +17,12 @@ use crate::ui::utils::{
  title_block_centered,
 };
 use crate::ui::widgets::button::Button;
+use crate::ui::widgets::error_message::ErrorMessage;
 use crate::ui::widgets::input_box::InputBox;
 use crate::ui::widgets::managarr_table::ManagarrTable;
+use crate::ui::widgets::popup::Popup;
 use crate::ui::{
-  draw_drop_down_popup, draw_error_popup, draw_error_popup_over, draw_large_popup_over,
-  draw_medium_popup_over, draw_selectable_list, DrawUi,
+  draw_drop_down_popup, draw_large_popup_over, draw_medium_popup_over, draw_selectable_list, DrawUi,
 };
 use crate::utils::convert_runtime;
 use crate::{render_selectable_input_box, App};
@@ -68,13 +69,17 @@ impl DrawUi for AddMovieUi {
              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,
-          ),
+          ActiveRadarrBlock::AddMovieAlreadyInLibrary => {
+            draw_add_movie_search(f, app, area);
+            f.render_widget(
+              Popup::new(
+                ErrorMessage::new("This film is already in your library"),
+                25,
+                8,
+              ),
+              f.size(),
+            );
+          }
          _ => (),
        };

@@ -108,11 +113,11 @@ fn draw_add_movie_search(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
  ])
  .margin(1)
  .areas(area);
-  let block_content = &app.data.radarr_data.search.as_ref().unwrap().text;
+  let block_content = &app.data.radarr_data.add_movie_search.as_ref().unwrap().text;
  let offset = *app
    .data
    .radarr_data
-    .search
+    .add_movie_search
    .as_ref()
    .unwrap()
    .offset
@@ -197,9 +202,11 @@ fn draw_add_movie_search(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
        let help_paragraph = Paragraph::new(help_text)
          .block(borderless_block())
          .alignment(Alignment::Center);
+        let error_message = ErrorMessage::new("No movies found matching your query!");
+        let error_message_popup = Popup::new(error_message, 25, 8);

        f.render_widget(layout_block(), results_area);
-        draw_error_popup(f, "No movies found matching your query!");
+        f.render_widget(error_message_popup, f.size());
        f.render_widget(help_paragraph, help_area);
      }
      ActiveRadarrBlock::AddMovieSearchResults
@@ -19,8 +19,8 @@ use crate::ui::widgets::button::Button;
 use crate::ui::widgets::checkbox::Checkbox;
 use crate::ui::widgets::input_box::InputBox;
 use crate::ui::{
-  draw_drop_down_popup, draw_large_popup_over_background_fn_with_ui,
-  draw_medium_popup_over, draw_popup, draw_selectable_list, DrawUi,
+  draw_drop_down_popup, draw_large_popup_over_background_fn_with_ui, draw_medium_popup_over,
+  draw_popup, draw_selectable_list, DrawUi,
 };

 #[cfg(test)]
@@ -91,31 +91,21 @@ impl DrawUi for EditMovieUi {
 }

 fn draw_edit_movie_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
-  let (movie_title, movie_overview) =
-    if let Some(filtered_movies) = app.data.radarr_data.filtered_movies.as_ref() {
-      (
-        filtered_movies.current_selection().title.text.clone(),
-        filtered_movies.current_selection().overview.clone(),
-      )
-    } else {
-      (
-        app
-          .data
-          .radarr_data
-          .movies
-          .current_selection()
-          .title
-          .text
-          .clone(),
-        app
-          .data
-          .radarr_data
-          .movies
-          .current_selection()
-          .overview
-          .clone(),
-      )
-    };
+  let movie_title = app
+    .data
+    .radarr_data
+    .movies
+    .current_selection()
+    .title
+    .text
+    .clone();
+  let movie_overview = app
+    .data
+    .radarr_data
+    .movies
+    .current_selection()
+    .overview
+    .clone();
  let title = format!("Edit - {movie_title}");
  let yes_no_value = app.data.radarr_data.prompt_confirm;
  let selected_block = app.data.radarr_data.selected_block.get_active_block();
@@ -12,10 +12,10 @@ use crate::ui::radarr_ui::library::delete_movie_ui::DeleteMovieUi;
 use crate::ui::radarr_ui::library::edit_movie_ui::EditMovieUi;
 use crate::ui::radarr_ui::library::movie_details_ui::MovieDetailsUi;
 use crate::ui::utils::{get_width_from_percentage, layout_block_top_border};
+use crate::ui::widgets::error_message::ErrorMessage;
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::{
-  draw_error_message_popup, draw_input_box_popup, draw_popup_over, draw_prompt_box,
-  draw_prompt_popup_over, DrawUi,
+  draw_input_box_popup, draw_popup_over, draw_prompt_box, draw_prompt_popup_over, DrawUi,
 };
 use crate::utils::{convert_runtime, convert_to_gb};

@@ -92,21 +92,15 @@ impl DrawUi for LibraryUi {
 }

 pub(super) fn draw_library(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
-  let current_selection =
-    if let Some(filtered_movies) = app.data.radarr_data.filtered_movies.as_ref() {
-      filtered_movies.current_selection().clone()
-    } else if !app.data.radarr_data.movies.items.is_empty() {
-      app.data.radarr_data.movies.current_selection().clone()
-    } else {
-      Movie::default()
-    };
+  let current_selection = if !app.data.radarr_data.movies.items.is_empty() {
+    app.data.radarr_data.movies.current_selection().clone()
+  } else {
+    Movie::default()
+  };
  let quality_profile_map = &app.data.radarr_data.quality_profile_map;
  let tags_map = &app.data.radarr_data.tags_map;
  let downloads_vec = &app.data.radarr_data.downloads.items;
-  let content = match app.data.radarr_data.filtered_movies.as_mut() {
-    Some(filtered_movies) if !app.data.radarr_data.is_filtering => Some(filtered_movies),
-    _ => Some(&mut app.data.radarr_data.movies),
-  };
+  let content = Some(&mut app.data.radarr_data.movies);
  let help_footer = app
    .data
    .radarr_data
@@ -203,7 +197,7 @@ fn draw_movie_search_box(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
    f,
    area,
    "Search",
-    app.data.radarr_data.search.as_ref().unwrap(),
+    app.data.radarr_data.movies.search.as_ref().unwrap(),
  );
 }

@@ -212,14 +206,17 @@ fn draw_filter_movies_box(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
    f,
    area,
    "Filter",
-    app.data.radarr_data.filter.as_ref().unwrap(),
+    app.data.radarr_data.movies.filter.as_ref().unwrap(),
  )
 }

 fn draw_search_movie_error_box(f: &mut Frame<'_>, _: &mut App<'_>, area: Rect) {
-  draw_error_message_popup(f, area, "Movie not found!");
+  f.render_widget(ErrorMessage::new("Movie not found!"), area);
 }

 fn draw_filter_movies_error_box(f: &mut Frame<'_>, _: &mut App<'_>, area: Rect) {
-  draw_error_message_popup(f, area, "No movies found matching the given filter!");
+  f.render_widget(
+    ErrorMessage::new("No movies found matching the given filter!"),
+    area,
+  );
 }