Refactored unnecessary data fields into Options to make the code cleaner, and to reduce the memory usage of the application

src/ui/radarr_ui/library/add_movie_ui.rs

@@ -104,16 +104,13 @@ impl DrawUi for AddMovieUi {
 }
 
 fn draw_add_movie_search<B: Backend>(f: &mut Frame<'_, B>, app: &mut App<'_>, area: Rect) {
-  let current_selection = if app.data.radarr_data.add_searched_movies.items.is_empty() {
-    AddMovieSearchResult::default()
-  } else {
-    app
-      .data
-      .radarr_data
-      .add_searched_movies
-      .current_selection()
-      .clone()
-  };
+  let is_loading = app.is_loading || app.data.radarr_data.add_searched_movies.is_none();
+  let current_selection =
+    if let Some(add_searched_movies) = app.data.radarr_data.add_searched_movies.as_ref() {
+      add_searched_movies.current_selection().clone()
+    } else {
+      AddMovieSearchResult::default()
+    };
 
   let chunks = vertical_chunks_with_margin(
     vec![
@@ -181,7 +178,8 @@ fn draw_add_movie_search<B: Backend>(f: &mut Frame<'_, B>, app: &mut App<'_>, ar
           chunks[1],
           layout_block(),
           TableProps {
-            content: &mut app.data.radarr_data.add_searched_movies,
+            content: None,
+            wrapped_content: Some(app.data.radarr_data.add_searched_movies.as_mut()),
             table_headers: vec![
               "✔",
               "Title",
@@ -260,7 +258,7 @@ fn draw_add_movie_search<B: Backend>(f: &mut Frame<'_, B>, app: &mut App<'_>, ar
             ])
             .style(style_primary())
           },
-          app.is_loading,
+          is_loading,
           true,
         );
       }
@@ -354,6 +352,8 @@ fn draw_confirmation_prompt<B: Backend>(
         .data
         .radarr_data
         .add_searched_movies
+        .as_ref()
+        .unwrap()
         .current_selection()
         .title
         .text,
@@ -361,6 +361,8 @@ fn draw_confirmation_prompt<B: Backend>(
         .data
         .radarr_data
         .add_searched_movies
+        .as_ref()
+        .unwrap()
         .current_selection()
         .overview
         .clone(),

src/ui/radarr_ui/library/edit_movie_ui.rs

@@ -93,43 +93,31 @@ fn draw_edit_movie_confirmation_prompt<B: Backend>(
   app: &mut App<'_>,
   prompt_area: Rect,
 ) {
-  let (movie_title, movie_overview) = if app.data.radarr_data.filtered_movies.items.is_empty() {
-    (
-      app
-        .data
-        .radarr_data
-        .movies
-        .current_selection()
-        .title
-        .text
-        .clone(),
-      app
-        .data
-        .radarr_data
-        .movies
-        .current_selection()
-        .overview
-        .clone(),
-    )
-  } else {
-    (
-      app
-        .data
-        .radarr_data
-        .filtered_movies
-        .current_selection()
-        .title
-        .text
-        .clone(),
-      app
-        .data
-        .radarr_data
-        .filtered_movies
-        .current_selection()
-        .overview
-        .clone(),
-    )
-  };
+  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 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();

src/ui/radarr_ui/library/mod.rs

@@ -108,27 +108,20 @@ impl DrawUi for LibraryUi {
 }
 
 pub(super) fn draw_library<B: Backend>(f: &mut Frame<'_, B>, app: &mut App<'_>, area: Rect) {
-  let current_selection = if !app.data.radarr_data.filtered_movies.items.is_empty() {
-    app
-      .data
-      .radarr_data
-      .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 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 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 = if !app.data.radarr_data.filtered_movies.items.is_empty()
-    && !app.data.radarr_data.is_filtering
-  {
-    &mut app.data.radarr_data.filtered_movies
-  } else {
-    &mut app.data.radarr_data.movies
+  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),
   };
 
   draw_table(
@@ -137,6 +130,7 @@ pub(super) fn draw_library<B: Backend>(f: &mut Frame<'_, B>, app: &mut App<'_>,
     layout_block_top_border(),
     TableProps {
       content,
+      wrapped_content: None,
       table_headers: vec![
         "Title",
         "Year",

src/ui/radarr_ui/library/movie_details_ui.rs

@@ -269,7 +269,8 @@ fn draw_movie_history<B: Backend>(f: &mut Frame<'_, B>, app: &mut App<'_>, conte
       content_area,
       layout_block_top_border(),
       TableProps {
-        content: &mut movie_details_modal.movie_history,
+        content: Some(&mut movie_details_modal.movie_history),
+        wrapped_content: None,
         table_headers: vec!["Source Title", "Event Type", "Languages", "Quality", "Date"],
         constraints: vec![
           Constraint::Percentage(34),
@@ -326,13 +327,16 @@ fn draw_movie_cast<B: Backend>(f: &mut Frame<'_, B>, app: &mut App<'_>, content_
     content_area,
     layout_block_top_border(),
     TableProps {
-      content: &mut app
-        .data
-        .radarr_data
-        .movie_details_modal
-        .as_mut()
-        .unwrap()
-        .movie_cast,
+      content: Some(
+        &mut app
+          .data
+          .radarr_data
+          .movie_details_modal
+          .as_mut()
+          .unwrap()
+          .movie_cast,
+      ),
+      wrapped_content: None,
       constraints: iter::repeat(Constraint::Ratio(1, 2)).take(2).collect(),
       table_headers: vec!["Cast Member", "Character"],
       help: app
@@ -365,13 +369,16 @@ fn draw_movie_crew<B: Backend>(f: &mut Frame<'_, B>, app: &mut App<'_>, content_
     content_area,
     layout_block_top_border(),
     TableProps {
-      content: &mut app
-        .data
-        .radarr_data
-        .movie_details_modal
-        .as_mut()
-        .unwrap()
-        .movie_crew,
+      content: Some(
+        &mut app
+          .data
+          .radarr_data
+          .movie_details_modal
+          .as_mut()
+          .unwrap()
+          .movie_crew,
+      ),
+      wrapped_content: None,
       constraints: iter::repeat(Constraint::Ratio(1, 3)).take(3).collect(),
       table_headers: vec!["Crew Member", "Job", "Department"],
       help: app
@@ -455,13 +462,16 @@ fn draw_movie_releases<B: Backend>(f: &mut Frame<'_, B>, app: &mut App<'_>, cont
     content_area,
     layout_block_top_border(),
     TableProps {
-      content: &mut app
-        .data
-        .radarr_data
-        .movie_details_modal
-        .as_mut()
-        .unwrap()
-        .movie_releases,
+      content: Some(
+        &mut app
+          .data
+          .radarr_data
+          .movie_details_modal
+          .as_mut()
+          .unwrap()
+          .movie_releases,
+      ),
+      wrapped_content: None,
       constraints: vec![
         Constraint::Length(9),
         Constraint::Length(10),