test: Updated Rust edition to 2024 and refactored network module tests to be more idiomatic

src/ui/radarr_ui/blocklist/blocklist_ui_tests.rs

@@ -1,8 +1,8 @@
 #[cfg(test)]
 mod tests {
   use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, BLOCKLIST_BLOCKS};
-  use crate::ui::radarr_ui::blocklist::BlocklistUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::blocklist::BlocklistUi;
   use strum::IntoEnumIterator;
 
   #[test]

src/ui/radarr_ui/blocklist/mod.rs

@@ -1,19 +1,19 @@
 use crate::app::App;
+use crate::models::Route;
 use crate::models::radarr_models::BlocklistItem;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, BLOCKLIST_BLOCKS};
-use crate::models::Route;
+use crate::ui::DrawUi;
 use crate::ui::styles::ManagarrStyle;
 use crate::ui::utils::{get_width_from_percentage, layout_block_top_border};
 use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt;
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::message::Message;
 use crate::ui::widgets::popup::{Popup, Size};
-use crate::ui::DrawUi;
+use ratatui::Frame;
 use ratatui::layout::{Alignment, Constraint, Rect};
 use ratatui::style::{Style, Stylize};
 use ratatui::text::{Line, Text};
 use ratatui::widgets::{Cell, Row};
-use ratatui::Frame;
 
 #[cfg(test)]
 #[path = "blocklist_ui_tests.rs"]

src/ui/radarr_ui/collections/collection_details_ui.rs

@@ -1,15 +1,15 @@
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Flex, Layout, Rect};
 use ratatui::style::Stylize;
 use ratatui::text::{Line, Text};
 use ratatui::widgets::{Cell, Paragraph, Row, Wrap};
-use ratatui::Frame;
 
 use crate::app::App;
+use crate::models::Route;
 use crate::models::radarr_models::CollectionMovie;
 use crate::models::servarr_data::radarr::radarr_data::{
   ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS,
 };
-use crate::models::Route;
 use crate::ui::styles::ManagarrStyle;
 use crate::ui::utils::{
   borderless_block, get_width_from_percentage, layout_block_top_border_with_title, title_block,
@@ -17,7 +17,7 @@ use crate::ui::utils::{
 };
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::popup::Size;
-use crate::ui::{draw_popup, DrawUi};
+use crate::ui::{DrawUi, draw_popup};
 use crate::utils::convert_runtime;
 
 #[cfg(test)]

src/ui/radarr_ui/collections/collection_details_ui_tests.rs

@@ -5,8 +5,8 @@ mod tests {
   use crate::models::servarr_data::radarr::radarr_data::{
     ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS,
   };
-  use crate::ui::radarr_ui::collections::collection_details_ui::CollectionDetailsUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::collections::collection_details_ui::CollectionDetailsUi;
 
   #[test]
   fn test_collection_details_ui_accepts() {

src/ui/radarr_ui/collections/collections_ui_tests.rs

@@ -3,10 +3,10 @@ mod tests {
   use strum::IntoEnumIterator;
 
   use crate::models::servarr_data::radarr::radarr_data::{
-    ActiveRadarrBlock, COLLECTIONS_BLOCKS, COLLECTION_DETAILS_BLOCKS, EDIT_COLLECTION_BLOCKS,
+    ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS, COLLECTIONS_BLOCKS, EDIT_COLLECTION_BLOCKS,
   };
-  use crate::ui::radarr_ui::collections::CollectionsUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::collections::CollectionsUi;
 
   #[test]
   fn test_collections_ui_accepts() {

src/ui/radarr_ui/collections/edit_collection_ui.rs

@@ -1,14 +1,14 @@
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Layout, Rect};
 use ratatui::widgets::ListItem;
-use ratatui::Frame;
 use std::sync::atomic::Ordering;
 
 use crate::app::App;
+use crate::models::Route;
 use crate::models::servarr_data::radarr::modals::EditCollectionModal;
 use crate::models::servarr_data::radarr::radarr_data::{
   ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS, EDIT_COLLECTION_BLOCKS,
 };
-use crate::models::Route;
 use crate::render_selectable_input_box;
 use crate::ui::radarr_ui::collections::collection_details_ui::CollectionDetailsUi;
 use crate::ui::styles::ManagarrStyle;
@@ -18,7 +18,7 @@ use crate::ui::widgets::checkbox::Checkbox;
 use crate::ui::widgets::input_box::InputBox;
 use crate::ui::widgets::popup::{Popup, Size};
 use crate::ui::widgets::selectable_list::SelectableList;
-use crate::ui::{draw_popup, DrawUi};
+use crate::ui::{DrawUi, draw_popup};
 
 #[cfg(test)]
 #[path = "edit_collection_ui_tests.rs"]
@@ -42,10 +42,10 @@ impl DrawUi for EditCollectionUi {
 
   fn draw(f: &mut Frame<'_>, app: &mut App<'_>, _area: Rect) {
     if let Route::Radarr(active_radarr_block, context_option) = app.get_current_route() {
-      if let Some(context) = context_option {
-        if COLLECTION_DETAILS_BLOCKS.contains(&context) {
-          draw_popup(f, app, CollectionDetailsUi::draw, Size::Large);
-        }
+      if let Some(context) = context_option
+        && COLLECTION_DETAILS_BLOCKS.contains(&context)
+      {
+        draw_popup(f, app, CollectionDetailsUi::draw, Size::Large);
       }
 
       draw_popup(
@@ -100,19 +100,27 @@ fn draw_edit_collection_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>
   let selected_minimum_availability = minimum_availability_list.current_selection();
   let selected_quality_profile = quality_profile_list.current_selection();
 
-  let [paragraph_area, monitored_area, min_availability_area, quality_profile_area, root_folder_area, search_on_add_area, _, buttons_area] =
-    Layout::vertical([
-      Constraint::Length(6),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Fill(1),
-      Constraint::Length(3),
-    ])
-    .margin(1)
-    .areas(area);
+  let [
+    paragraph_area,
+    monitored_area,
+    min_availability_area,
+    quality_profile_area,
+    root_folder_area,
+    search_on_add_area,
+    _,
+    buttons_area,
+  ] = Layout::vertical([
+    Constraint::Length(6),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Fill(1),
+    Constraint::Length(3),
+  ])
+  .margin(1)
+  .areas(area);
   let [save_area, cancel_area] =
     Layout::horizontal([Constraint::Percentage(50), Constraint::Percentage(50)])
       .areas(buttons_area);

src/ui/radarr_ui/collections/edit_collection_ui_tests.rs

@@ -5,8 +5,8 @@ mod tests {
   use crate::models::servarr_data::radarr::radarr_data::{
     ActiveRadarrBlock, EDIT_COLLECTION_BLOCKS,
   };
-  use crate::ui::radarr_ui::collections::edit_collection_ui::EditCollectionUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::collections::edit_collection_ui::EditCollectionUi;
 
   #[test]
   fn test_edit_collection_ui_accepts() {

src/ui/radarr_ui/collections/mod.rs

@@ -1,11 +1,12 @@
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Rect};
 use ratatui::widgets::{Cell, Row};
-use ratatui::Frame;
 
 use crate::app::App;
+use crate::models::Route;
 use crate::models::radarr_models::Collection;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, COLLECTIONS_BLOCKS};
-use crate::models::Route;
+use crate::ui::DrawUi;
 use crate::ui::radarr_ui::collections::collection_details_ui::CollectionDetailsUi;
 use crate::ui::radarr_ui::collections::edit_collection_ui::EditCollectionUi;
 use crate::ui::styles::ManagarrStyle;
@@ -13,7 +14,6 @@ use crate::ui::utils::{get_width_from_percentage, layout_block_top_border};
 use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt;
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::popup::{Popup, Size};
-use crate::ui::DrawUi;
 
 mod collection_details_ui;
 #[cfg(test)]

src/ui/radarr_ui/downloads/downloads_ui_tests.rs

@@ -3,8 +3,8 @@ mod tests {
   use strum::IntoEnumIterator;
 
   use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DOWNLOADS_BLOCKS};
-  use crate::ui::radarr_ui::downloads::DownloadsUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::downloads::DownloadsUi;
 
   #[test]
   fn test_downloads_ui_accepts() {

src/ui/radarr_ui/downloads/mod.rs

@@ -1,17 +1,17 @@
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Rect};
 use ratatui::widgets::{Cell, Row};
-use ratatui::Frame;
 
 use crate::app::App;
 use crate::models::radarr_models::DownloadRecord;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DOWNLOADS_BLOCKS};
 use crate::models::{HorizontallyScrollableText, Route};
+use crate::ui::DrawUi;
 use crate::ui::styles::ManagarrStyle;
 use crate::ui::utils::{get_width_from_percentage, layout_block_top_border};
 use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt;
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::popup::{Popup, Size};
-use crate::ui::DrawUi;
 use crate::utils::convert_to_gb;
 
 #[cfg(test)]

src/ui/radarr_ui/indexers/edit_indexer_ui.rs

@@ -1,8 +1,8 @@
 use std::sync::atomic::Ordering;
 
 use crate::app::App;
-use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, EDIT_INDEXER_BLOCKS};
 use crate::models::Route;
+use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, EDIT_INDEXER_BLOCKS};
 use crate::render_selectable_input_box;
 use crate::ui::styles::ManagarrStyle;
 use crate::ui::utils::title_block_centered;
@@ -11,9 +11,9 @@ use crate::ui::widgets::checkbox::Checkbox;
 use crate::ui::widgets::input_box::InputBox;
 use crate::ui::widgets::loading_block::LoadingBlock;
 use crate::ui::widgets::popup::Size;
-use crate::ui::{draw_popup, DrawUi};
-use ratatui::layout::{Constraint, Flex, Layout, Rect};
+use crate::ui::{DrawUi, draw_popup};
 use ratatui::Frame;
+use ratatui::layout::{Constraint, Flex, Layout, Rect};
 
 #[cfg(test)]
 #[path = "edit_indexer_ui_tests.rs"]
@@ -55,15 +55,20 @@ fn draw_edit_indexer_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
       Layout::horizontal([Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)])
         .margin(1)
         .areas(settings_area);
-    let [name_area, rss_area, auto_search_area, interactive_search_area, priority_area] =
-      Layout::vertical([
-        Constraint::Length(3),
-        Constraint::Length(3),
-        Constraint::Length(3),
-        Constraint::Length(3),
-        Constraint::Length(3),
-      ])
-      .areas(left_side_area);
+    let [
+      name_area,
+      rss_area,
+      auto_search_area,
+      interactive_search_area,
+      priority_area,
+    ] = Layout::vertical([
+      Constraint::Length(3),
+      Constraint::Length(3),
+      Constraint::Length(3),
+      Constraint::Length(3),
+      Constraint::Length(3),
+    ])
+    .areas(left_side_area);
     let [url_area, api_key_area, seed_ratio_area, tags_area] = Layout::vertical([
       Constraint::Length(3),
       Constraint::Length(3),

src/ui/radarr_ui/indexers/edit_indexer_ui_tests.rs

@@ -1,8 +1,8 @@
 #[cfg(test)]
 mod tests {
   use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, EDIT_INDEXER_BLOCKS};
-  use crate::ui::radarr_ui::indexers::edit_indexer_ui::EditIndexerUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::indexers::edit_indexer_ui::EditIndexerUi;
   use strum::IntoEnumIterator;
 
   #[test]

src/ui/radarr_ui/indexers/indexer_settings_ui.rs

@@ -1,13 +1,13 @@
 use std::sync::atomic::Ordering;
 
-use ratatui::layout::{Constraint, Flex, Layout, Rect};
 use ratatui::Frame;
+use ratatui::layout::{Constraint, Flex, Layout, Rect};
 
 use crate::app::App;
+use crate::models::Route;
 use crate::models::servarr_data::radarr::radarr_data::{
   ActiveRadarrBlock, INDEXER_SETTINGS_BLOCKS,
 };
-use crate::models::Route;
 use crate::render_selectable_input_box;
 use crate::ui::styles::ManagarrStyle;
 use crate::ui::utils::title_block_centered;
@@ -16,7 +16,7 @@ use crate::ui::widgets::checkbox::Checkbox;
 use crate::ui::widgets::input_box::InputBox;
 use crate::ui::widgets::loading_block::LoadingBlock;
 use crate::ui::widgets::popup::Size;
-use crate::ui::{draw_popup, DrawUi};
+use crate::ui::{DrawUi, draw_popup};
 
 #[cfg(test)]
 #[path = "indexer_settings_ui_tests.rs"]
@@ -62,21 +62,30 @@ fn draw_edit_indexer_settings_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area:
       Layout::horizontal([Constraint::Ratio(1, 2), Constraint::Ratio(1, 2)])
         .margin(1)
         .areas(settings_area);
-    let [min_age_area, retention_area, max_size_area, prefer_flags_area] = Layout::vertical([
+    let [
+      min_age_area,
+      retention_area,
+      max_size_area,
+      prefer_flags_area,
+    ] = Layout::vertical([
       Constraint::Length(3),
       Constraint::Length(3),
       Constraint::Length(3),
       Constraint::Length(3),
     ])
     .areas(left_side_area);
-    let [availability_delay_area, rss_sync_interval_area, whitelisted_sub_tags_area, allow_hardcoded_subs_area] =
-      Layout::vertical([
-        Constraint::Length(3),
-        Constraint::Length(3),
-        Constraint::Length(3),
-        Constraint::Length(3),
-      ])
-      .areas(right_side_area);
+    let [
+      availability_delay_area,
+      rss_sync_interval_area,
+      whitelisted_sub_tags_area,
+      allow_hardcoded_subs_area,
+    ] = Layout::vertical([
+      Constraint::Length(3),
+      Constraint::Length(3),
+      Constraint::Length(3),
+      Constraint::Length(3),
+    ])
+    .areas(right_side_area);
 
     if let Route::Radarr(active_radarr_block, _) = app.get_current_route() {
       let min_age = indexer_settings.minimum_age.to_string();

src/ui/radarr_ui/indexers/indexer_settings_ui_tests.rs

@@ -5,8 +5,8 @@ mod tests {
   use crate::models::servarr_data::radarr::radarr_data::{
     ActiveRadarrBlock, INDEXER_SETTINGS_BLOCKS,
   };
-  use crate::ui::radarr_ui::indexers::indexer_settings_ui::IndexerSettingsUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::indexers::indexer_settings_ui::IndexerSettingsUi;
 
   #[test]
   fn test_indexer_settings_ui_accepts() {

src/ui/radarr_ui/indexers/indexers_ui_tests.rs

@@ -3,10 +3,10 @@ mod tests {
   use strum::IntoEnumIterator;
 
   use crate::models::servarr_data::radarr::radarr_data::{
-    ActiveRadarrBlock, EDIT_INDEXER_BLOCKS, INDEXERS_BLOCKS, INDEXER_SETTINGS_BLOCKS,
+    ActiveRadarrBlock, EDIT_INDEXER_BLOCKS, INDEXER_SETTINGS_BLOCKS, INDEXERS_BLOCKS,
   };
-  use crate::ui::radarr_ui::indexers::IndexersUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::indexers::IndexersUi;
 
   #[test]
   fn test_indexers_ui_accepts() {

src/ui/radarr_ui/indexers/mod.rs

@@ -1,13 +1,14 @@
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Rect};
 use ratatui::style::{Style, Stylize};
 use ratatui::text::Text;
 use ratatui::widgets::{Cell, Row};
-use ratatui::Frame;
 
 use crate::app::App;
+use crate::models::Route;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, INDEXERS_BLOCKS};
 use crate::models::servarr_models::Indexer;
-use crate::models::Route;
+use crate::ui::DrawUi;
 use crate::ui::radarr_ui::indexers::edit_indexer_ui::EditIndexerUi;
 use crate::ui::radarr_ui::indexers::indexer_settings_ui::IndexerSettingsUi;
 use crate::ui::radarr_ui::indexers::test_all_indexers_ui::TestAllIndexersUi;
@@ -18,7 +19,6 @@ use crate::ui::widgets::loading_block::LoadingBlock;
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::message::Message;
 use crate::ui::widgets::popup::{Popup, Size};
-use crate::ui::DrawUi;
 
 mod edit_indexer_ui;
 mod indexer_settings_ui;

src/ui/radarr_ui/indexers/test_all_indexers_ui.rs

@@ -1,15 +1,15 @@
 use crate::app::App;
+use crate::models::Route;
 use crate::models::servarr_data::modals::IndexerTestResultModalItem;
 use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
-use crate::models::Route;
 use crate::ui::styles::ManagarrStyle;
 use crate::ui::utils::{get_width_from_percentage, title_block};
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::popup::Size;
-use crate::ui::{draw_popup, DrawUi};
+use crate::ui::{DrawUi, draw_popup};
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Rect};
 use ratatui::widgets::{Cell, Row};
-use ratatui::Frame;
 
 #[cfg(test)]
 #[path = "test_all_indexers_ui_tests.rs"]

src/ui/radarr_ui/indexers/test_all_indexers_ui_tests.rs

@@ -3,8 +3,8 @@ mod tests {
   use strum::IntoEnumIterator;
 
   use crate::models::servarr_data::radarr::radarr_data::ActiveRadarrBlock;
-  use crate::ui::radarr_ui::indexers::test_all_indexers_ui::TestAllIndexersUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::indexers::test_all_indexers_ui::TestAllIndexersUi;
 
   #[test]
   fn test_test_all_indexers_ui_accepts() {

src/ui/radarr_ui/library/add_movie_ui.rs

@@ -1,13 +1,13 @@
 use std::sync::atomic::Ordering;
 
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Layout, Rect};
 use ratatui::widgets::{Cell, ListItem, Row};
-use ratatui::Frame;
 
+use crate::models::Route;
 use crate::models::radarr_models::AddMovieSearchResult;
 use crate::models::servarr_data::radarr::modals::AddMovieModal;
-use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, ADD_MOVIE_BLOCKS};
-use crate::models::Route;
+use crate::models::servarr_data::radarr::radarr_data::{ADD_MOVIE_BLOCKS, ActiveRadarrBlock};
 use crate::ui::radarr_ui::collections::CollectionsUi;
 use crate::ui::styles::ManagarrStyle;
 use crate::ui::utils::{
@@ -19,9 +19,9 @@ use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::message::Message;
 use crate::ui::widgets::popup::{Popup, Size};
 use crate::ui::widgets::selectable_list::SelectableList;
-use crate::ui::{draw_popup, DrawUi};
+use crate::ui::{DrawUi, draw_popup};
 use crate::utils::convert_runtime;
-use crate::{render_selectable_input_box, App};
+use crate::{App, render_selectable_input_box};
 
 #[cfg(test)]
 #[path = "add_movie_ui_tests.rs"]
@@ -297,19 +297,27 @@ fn draw_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
 
   f.render_widget(title_block_centered(&title), area);
 
-  let [paragraph_area, root_folder_area, monitor_area, min_availability_area, quality_profile_area, tags_area, _, buttons_area] =
-    Layout::vertical([
-      Constraint::Length(6),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Fill(1),
-      Constraint::Length(3),
-    ])
-    .margin(1)
-    .areas(area);
+  let [
+    paragraph_area,
+    root_folder_area,
+    monitor_area,
+    min_availability_area,
+    quality_profile_area,
+    tags_area,
+    _,
+    buttons_area,
+  ] = Layout::vertical([
+    Constraint::Length(6),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Fill(1),
+    Constraint::Length(3),
+  ])
+  .margin(1)
+  .areas(area);
 
   let prompt_paragraph = layout_paragraph_borderless(&prompt);
   f.render_widget(prompt_paragraph, paragraph_area);

src/ui/radarr_ui/library/add_movie_ui_tests.rs

@@ -2,9 +2,9 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, ADD_MOVIE_BLOCKS};
-  use crate::ui::radarr_ui::library::add_movie_ui::AddMovieUi;
+  use crate::models::servarr_data::radarr::radarr_data::{ADD_MOVIE_BLOCKS, ActiveRadarrBlock};
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::library::add_movie_ui::AddMovieUi;
 
   #[test]
   fn test_add_movie_ui_accepts() {

src/ui/radarr_ui/library/delete_movie_ui.rs

@@ -1,13 +1,13 @@
-use ratatui::layout::Rect;
 use ratatui::Frame;
+use ratatui::layout::Rect;
 
 use crate::app::App;
-use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DELETE_MOVIE_BLOCKS};
 use crate::models::Route;
+use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DELETE_MOVIE_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};
-use crate::ui::DrawUi;
 
 #[cfg(test)]
 #[path = "delete_movie_ui_tests.rs"]

src/ui/radarr_ui/library/delete_movie_ui_tests.rs

@@ -3,8 +3,8 @@ mod tests {
   use strum::IntoEnumIterator;
 
   use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DELETE_MOVIE_BLOCKS};
-  use crate::ui::radarr_ui::library::delete_movie_ui::DeleteMovieUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::library::delete_movie_ui::DeleteMovieUi;
 
   #[test]
   fn test_delete_movie_ui_accepts() {

src/ui/radarr_ui/library/edit_movie_ui.rs

@@ -1,16 +1,16 @@
 use std::sync::atomic::Ordering;
 
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Rect};
 use ratatui::prelude::Layout;
 use ratatui::widgets::ListItem;
-use ratatui::Frame;
 
 use crate::app::App;
+use crate::models::Route;
 use crate::models::servarr_data::radarr::modals::EditMovieModal;
 use crate::models::servarr_data::radarr::radarr_data::{
   ActiveRadarrBlock, EDIT_MOVIE_BLOCKS, MOVIE_DETAILS_BLOCKS,
 };
-use crate::models::Route;
 use crate::render_selectable_input_box;
 use crate::ui::radarr_ui::library::movie_details_ui::MovieDetailsUi;
 
@@ -21,7 +21,7 @@ use crate::ui::widgets::checkbox::Checkbox;
 use crate::ui::widgets::input_box::InputBox;
 use crate::ui::widgets::popup::{Popup, Size};
 use crate::ui::widgets::selectable_list::SelectableList;
-use crate::ui::{draw_popup, DrawUi};
+use crate::ui::{DrawUi, draw_popup};
 
 #[cfg(test)]
 #[path = "edit_movie_ui_tests.rs"]
@@ -40,10 +40,10 @@ impl DrawUi for EditMovieUi {
 
   fn draw(f: &mut Frame<'_>, app: &mut App<'_>, _area: Rect) {
     if let Route::Radarr(active_radarr_block, context_option) = app.get_current_route() {
-      if let Some(context) = context_option {
-        if MOVIE_DETAILS_BLOCKS.contains(&context) {
-          draw_popup(f, app, MovieDetailsUi::draw, Size::Large);
-        }
+      if let Some(context) = context_option
+        && MOVIE_DETAILS_BLOCKS.contains(&context)
+      {
+        draw_popup(f, app, MovieDetailsUi::draw, Size::Large);
       }
 
       draw_popup(f, app, draw_edit_movie_confirmation_prompt, Size::Medium);
@@ -92,19 +92,27 @@ fn draw_edit_movie_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, are
   let selected_minimum_availability = minimum_availability_list.current_selection();
   let selected_quality_profile = quality_profile_list.current_selection();
 
-  let [paragraph_area, monitored_area, min_availability_area, quality_profile_area, path_area, tags_area, _, buttons_area] =
-    Layout::vertical([
-      Constraint::Length(6),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Length(3),
-      Constraint::Fill(1),
-      Constraint::Length(3),
-    ])
-    .margin(1)
-    .areas(area);
+  let [
+    paragraph_area,
+    monitored_area,
+    min_availability_area,
+    quality_profile_area,
+    path_area,
+    tags_area,
+    _,
+    buttons_area,
+  ] = Layout::vertical([
+    Constraint::Length(6),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Length(3),
+    Constraint::Fill(1),
+    Constraint::Length(3),
+  ])
+  .margin(1)
+  .areas(area);
   let [save_area, cancel_area] =
     Layout::horizontal([Constraint::Percentage(50), Constraint::Percentage(50)])
       .areas(buttons_area);

src/ui/radarr_ui/library/edit_movie_ui_tests.rs

@@ -3,8 +3,8 @@ mod tests {
   use strum::IntoEnumIterator;
 
   use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, EDIT_MOVIE_BLOCKS};
-  use crate::ui::radarr_ui::library::edit_movie_ui::EditMovieUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::library::edit_movie_ui::EditMovieUi;
 
   #[test]
   fn test_edit_movie_ui_accepts() {

src/ui/radarr_ui/library/library_ui_tests.rs

@@ -3,11 +3,11 @@ mod tests {
   use strum::IntoEnumIterator;
 
   use crate::models::servarr_data::radarr::radarr_data::{
-    ActiveRadarrBlock, ADD_MOVIE_BLOCKS, DELETE_MOVIE_BLOCKS, EDIT_MOVIE_BLOCKS, LIBRARY_BLOCKS,
+    ADD_MOVIE_BLOCKS, ActiveRadarrBlock, DELETE_MOVIE_BLOCKS, EDIT_MOVIE_BLOCKS, LIBRARY_BLOCKS,
     MOVIE_DETAILS_BLOCKS,
   };
-  use crate::ui::radarr_ui::library::LibraryUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::library::LibraryUi;
 
   #[test]
   fn test_library_ui_accepts() {

src/ui/radarr_ui/library/mod.rs

@@ -1,11 +1,12 @@
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Rect};
 use ratatui::widgets::{Cell, Row};
-use ratatui::Frame;
 
 use crate::app::App;
+use crate::models::Route;
 use crate::models::radarr_models::Movie;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, LIBRARY_BLOCKS};
-use crate::models::Route;
+use crate::ui::DrawUi;
 use crate::ui::radarr_ui::decorate_with_row_style;
 use crate::ui::radarr_ui::library::add_movie_ui::AddMovieUi;
 use crate::ui::radarr_ui::library::delete_movie_ui::DeleteMovieUi;
@@ -15,7 +16,6 @@ use crate::ui::utils::{get_width_from_percentage, layout_block_top_border};
 use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt;
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::popup::{Popup, Size};
-use crate::ui::DrawUi;
 use crate::utils::{convert_runtime, convert_to_gb};
 
 mod add_movie_ui;

src/ui/radarr_ui/library/movie_details_ui.rs

@@ -1,17 +1,17 @@
 use std::iter;
 
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Layout, Rect};
 use ratatui::style::{Style, Stylize};
 use ratatui::text::{Line, Span, Text};
 use ratatui::widgets::{Cell, Paragraph, Row, Wrap};
-use ratatui::Frame;
 use serde_json::Number;
 
 use crate::app::App;
+use crate::models::Route;
 use crate::models::radarr_models::{Credit, MovieHistoryItem, RadarrRelease};
 use crate::models::servarr_data::radarr::modals::MovieDetailsModal;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, MOVIE_DETAILS_BLOCKS};
-use crate::models::Route;
 use crate::ui::styles::ManagarrStyle;
 use crate::ui::utils::{
   borderless_block, decorate_peer_style, get_width_from_percentage, layout_block_bottom_border,
@@ -21,7 +21,7 @@ use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt;
 use crate::ui::widgets::loading_block::LoadingBlock;
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::popup::{Popup, Size};
-use crate::ui::{draw_popup, draw_tabs, DrawUi};
+use crate::ui::{DrawUi, draw_popup, draw_tabs};
 use crate::utils::convert_to_gb;
 
 #[cfg(test)]
@@ -117,16 +117,22 @@ fn draw_file_info(f: &mut Frame<'_>, app: &App<'_>, area: Rect) {
       let file_info = movie_details_modal.file_details.to_owned();
       let audio_details = movie_details_modal.audio_details.to_owned();
       let video_details = movie_details_modal.video_details.to_owned();
-      let [file_details_title_area, file_details_area, audio_details_title_area, audio_details_area, video_details_title_area, video_details_area] =
-        Layout::vertical([
-          Constraint::Length(2),
-          Constraint::Length(5),
-          Constraint::Length(1),
-          Constraint::Length(6),
-          Constraint::Length(1),
-          Constraint::Length(7),
-        ])
-        .areas(area);
+      let [
+        file_details_title_area,
+        file_details_area,
+        audio_details_title_area,
+        audio_details_area,
+        video_details_title_area,
+        video_details_area,
+      ] = Layout::vertical([
+        Constraint::Length(2),
+        Constraint::Length(5),
+        Constraint::Length(1),
+        Constraint::Length(6),
+        Constraint::Length(1),
+        Constraint::Length(7),
+      ])
+      .areas(area);
 
       let file_details_title_paragraph =
         Paragraph::new("File Details".bold()).block(layout_block_top_border());

src/ui/radarr_ui/library/movie_details_ui_tests.rs

@@ -6,11 +6,11 @@ mod tests {
   use strum::IntoEnumIterator;
 
   use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, MOVIE_DETAILS_BLOCKS};
+  use crate::ui::DrawUi;
   use crate::ui::radarr_ui::library::movie_details_ui::{
-    style_from_download_status, MovieDetailsUi,
+    MovieDetailsUi, style_from_download_status,
   };
   use crate::ui::styles::ManagarrStyle;
-  use crate::ui::DrawUi;
 
   #[test]
   fn test_movie_details_ui_accepts() {

src/ui/radarr_ui/mod.rs

@@ -1,18 +1,19 @@
 use std::{cmp, iter};
 
 use chrono::{Duration, Utc};
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Layout, Rect};
 use ratatui::prelude::Stylize;
 use ratatui::text::Text;
 use ratatui::widgets::{Paragraph, Row};
-use ratatui::Frame;
 
 use crate::app::App;
 use crate::logos::RADARR_LOGO;
+use crate::models::Route;
 use crate::models::radarr_models::{DownloadRecord, Movie};
 use crate::models::servarr_data::radarr::radarr_data::RadarrData;
 use crate::models::servarr_models::{DiskSpace, RootFolder};
-use crate::models::Route;
+use crate::ui::DrawUi;
 use crate::ui::draw_tabs;
 use crate::ui::radarr_ui::blocklist::BlocklistUi;
 use crate::ui::radarr_ui::collections::CollectionsUi;
@@ -26,7 +27,6 @@ use crate::ui::utils::{
   borderless_block, layout_block, line_gauge_with_label, line_gauge_with_title, title_block,
 };
 use crate::ui::widgets::loading_block::LoadingBlock;
-use crate::ui::DrawUi;
 use crate::utils::convert_to_gb;
 
 mod blocklist;

src/ui/radarr_ui/root_folders/mod.rs

@@ -1,17 +1,17 @@
+use ratatui::Frame;
 use ratatui::layout::{Constraint, Rect};
 use ratatui::widgets::{Cell, Row};
-use ratatui::Frame;
 
 use crate::app::App;
+use crate::models::Route;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, ROOT_FOLDERS_BLOCKS};
 use crate::models::servarr_models::RootFolder;
-use crate::models::Route;
 use crate::ui::styles::ManagarrStyle;
 use crate::ui::utils::layout_block_top_border;
 use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt;
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::popup::{Popup, Size};
-use crate::ui::{draw_input_box_popup, draw_popup, DrawUi};
+use crate::ui::{DrawUi, draw_input_box_popup, draw_popup};
 use crate::utils::convert_to_gb;
 
 #[cfg(test)]

src/ui/radarr_ui/root_folders/root_folders_ui_tests.rs

@@ -3,8 +3,8 @@ mod tests {
   use strum::IntoEnumIterator;
 
   use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, ROOT_FOLDERS_BLOCKS};
-  use crate::ui::radarr_ui::root_folders::RootFoldersUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::root_folders::RootFoldersUi;
 
   #[test]
   fn test_root_folders_ui_accepts() {

src/ui/radarr_ui/system/mod.rs

@@ -6,9 +6,9 @@ use ratatui::style::Style;
 use ratatui::text::{Span, Text};
 use ratatui::widgets::{Cell, Row};
 use ratatui::{
+  Frame,
   layout::{Constraint, Rect},
   widgets::ListItem,
-  Frame,
 };
 
 use crate::app::App;
@@ -23,7 +23,7 @@ use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::selectable_list::SelectableList;
 use crate::{
   models::Route,
-  ui::{utils::title_block, DrawUi},
+  ui::{DrawUi, utils::title_block},
 };
 
 mod system_details_ui;

src/ui/radarr_ui/system/system_details_ui.rs

@@ -1,14 +1,14 @@
+use ratatui::Frame;
 use ratatui::layout::Rect;
 use ratatui::text::{Span, Text};
 use ratatui::widgets::{Cell, ListItem, Paragraph, Row};
-use ratatui::Frame;
 
 use crate::app::App;
+use crate::models::Route;
 use crate::models::radarr_models::RadarrTask;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS};
-use crate::models::Route;
 use crate::ui::radarr_ui::system::{
-  draw_queued_events, extract_task_props, TASK_TABLE_CONSTRAINTS, TASK_TABLE_HEADERS,
+  TASK_TABLE_CONSTRAINTS, TASK_TABLE_HEADERS, draw_queued_events, extract_task_props,
 };
 use crate::ui::styles::ManagarrStyle;
 use crate::ui::utils::{borderless_block, style_log_list_item, title_block};
@@ -17,7 +17,7 @@ use crate::ui::widgets::loading_block::LoadingBlock;
 use crate::ui::widgets::managarr_table::ManagarrTable;
 use crate::ui::widgets::popup::{Popup, Size};
 use crate::ui::widgets::selectable_list::SelectableList;
-use crate::ui::{draw_popup, DrawUi};
+use crate::ui::{DrawUi, draw_popup};
 
 #[cfg(test)]
 #[path = "system_details_ui_tests.rs"]

src/ui/radarr_ui/system/system_details_ui_tests.rs

@@ -5,8 +5,8 @@ mod tests {
   use crate::models::servarr_data::radarr::radarr_data::{
     ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS,
   };
-  use crate::ui::radarr_ui::system::system_details_ui::SystemDetailsUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::system::system_details_ui::SystemDetailsUi;
 
   #[test]
   fn test_system_details_ui_accepts() {

src/ui/radarr_ui/system/system_ui_tests.rs

@@ -5,8 +5,8 @@ mod tests {
   use crate::models::servarr_data::radarr::radarr_data::{
     ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS,
   };
-  use crate::ui::radarr_ui::system::SystemUi;
   use crate::ui::DrawUi;
+  use crate::ui::radarr_ui::system::SystemUi;
 
   #[test]
   fn test_system_ui_accepts() {