Refactored the RadarrData and ActiveRadarrBlock structs into their own file in models/servarr_data to make things neater and cleaner and easier to build on

src/ui/radarr_ui/collections/collection_details_ui.rs

@@ -6,9 +6,9 @@ use tui::Frame;
 
 use crate::app::context_clues::{build_context_clue_string, BARE_POPUP_CONTEXT_CLUES};
 use crate::app::radarr::radarr_context_clues::COLLECTION_DETAILS_CONTEXT_CLUES;
-use crate::app::radarr::{ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS};
 use crate::app::App;
 use crate::models::radarr_models::CollectionMovie;
+use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS};
 use crate::models::Route;
 use crate::ui::radarr_ui::collections::draw_collections;
 use crate::ui::utils::{

src/ui/radarr_ui/collections/collection_details_ui_tests.rs

@@ -2,7 +2,7 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::app::radarr::{ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS};
+  use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS};
   use crate::ui::radarr_ui::collections::collection_details_ui::CollectionDetailsUi;
   use crate::ui::DrawUi;
 

src/ui/radarr_ui/collections/collections_ui_tests.rs

@@ -2,7 +2,7 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::app::radarr::{
+  use crate::models::servarr_data::radarr_data::{
     ActiveRadarrBlock, COLLECTIONS_BLOCKS, COLLECTION_DETAILS_BLOCKS, EDIT_COLLECTION_BLOCKS,
   };
   use crate::ui::radarr_ui::collections::CollectionsUi;

src/ui/radarr_ui/collections/edit_collection_ui.rs

@@ -2,8 +2,10 @@ use tui::backend::Backend;
 use tui::layout::{Constraint, Rect};
 use tui::Frame;
 
-use crate::app::radarr::{ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS, EDIT_COLLECTION_BLOCKS};
 use crate::app::App;
+use crate::models::servarr_data::radarr_data::{
+  ActiveRadarrBlock, COLLECTION_DETAILS_BLOCKS, EDIT_COLLECTION_BLOCKS,
+};
 use crate::models::Route;
 use crate::ui::radarr_ui::collections::collection_details_ui::CollectionDetailsUi;
 use crate::ui::radarr_ui::collections::draw_collections;

src/ui/radarr_ui/collections/edit_collection_ui_tests.rs

@@ -2,7 +2,7 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::app::radarr::{ActiveRadarrBlock, EDIT_COLLECTION_BLOCKS};
+  use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, EDIT_COLLECTION_BLOCKS};
   use crate::ui::radarr_ui::collections::edit_collection_ui::EditCollectionUi;
   use crate::ui::DrawUi;
 

src/ui/radarr_ui/collections/mod.rs

@@ -5,9 +5,9 @@ use tui::Frame;
 
 pub(super) use collection_details_ui::draw_collection_details;
 
-use crate::app::radarr::{ActiveRadarrBlock, COLLECTIONS_BLOCKS};
 use crate::app::App;
 use crate::models::radarr_models::Collection;
+use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, COLLECTIONS_BLOCKS};
 use crate::models::Route;
 use crate::ui::radarr_ui::collections::collection_details_ui::CollectionDetailsUi;
 use crate::ui::radarr_ui::collections::edit_collection_ui::EditCollectionUi;

src/ui/radarr_ui/downloads/downloads_ui_tests.rs

@@ -2,7 +2,7 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::app::radarr::{ActiveRadarrBlock, DOWNLOADS_BLOCKS};
+  use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, DOWNLOADS_BLOCKS};
   use crate::ui::radarr_ui::downloads::DownloadsUi;
   use crate::ui::DrawUi;
 

src/ui/radarr_ui/downloads/mod.rs

@@ -3,9 +3,9 @@ use tui::layout::{Constraint, Rect};
 use tui::widgets::{Cell, Row};
 use tui::Frame;
 
-use crate::app::radarr::{ActiveRadarrBlock, DOWNLOADS_BLOCKS};
 use crate::app::App;
 use crate::models::radarr_models::DownloadRecord;
+use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, DOWNLOADS_BLOCKS};
 use crate::models::{HorizontallyScrollableText, Route};
 use crate::ui::utils::{get_width_from_percentage, layout_block_top_border, style_primary};
 use crate::ui::{draw_prompt_box, draw_prompt_popup_over, draw_table, DrawUi, TableProps};

src/ui/radarr_ui/indexers/indexer_settings_ui.rs

@@ -2,8 +2,8 @@ use tui::backend::Backend;
 use tui::layout::Rect;
 use tui::Frame;
 
-use crate::app::radarr::INDEXER_SETTINGS_BLOCKS;
 use crate::app::App;
+use crate::models::servarr_data::radarr_data::INDEXER_SETTINGS_BLOCKS;
 use crate::models::Route;
 use crate::ui::DrawUi;
 

src/ui/radarr_ui/indexers/indexer_settings_ui_tests.rs

@@ -2,7 +2,7 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::app::radarr::{ActiveRadarrBlock, INDEXER_SETTINGS_BLOCKS};
+  use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, INDEXER_SETTINGS_BLOCKS};
   use crate::ui::radarr_ui::indexers::indexer_settings_ui::IndexerSettingsUi;
   use crate::ui::DrawUi;
 

src/ui/radarr_ui/indexers/indexers_ui_tests.rs

@@ -2,7 +2,9 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::app::radarr::{ActiveRadarrBlock, INDEXERS_BLOCKS, INDEXER_SETTINGS_BLOCKS};
+  use crate::models::servarr_data::radarr_data::{
+    ActiveRadarrBlock, INDEXERS_BLOCKS, INDEXER_SETTINGS_BLOCKS,
+  };
   use crate::ui::radarr_ui::indexers::IndexersUi;
   use crate::ui::DrawUi;
 

src/ui/radarr_ui/indexers/mod.rs

@@ -4,9 +4,9 @@ use tui::text::Text;
 use tui::widgets::{Cell, Row};
 use tui::Frame;
 
-use crate::app::radarr::{ActiveRadarrBlock, INDEXERS_BLOCKS};
 use crate::app::App;
 use crate::models::radarr_models::Indexer;
+use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, INDEXERS_BLOCKS};
 use crate::models::Route;
 use crate::ui::radarr_ui::indexers::indexer_settings_ui::IndexerSettingsUi;
 use crate::ui::utils::{layout_block_top_border, style_failure, style_primary, style_success};

src/ui/radarr_ui/library/add_movie_ui.rs

@@ -6,8 +6,8 @@ use tui::Frame;
 
 use crate::app::context_clues::{build_context_clue_string, BARE_POPUP_CONTEXT_CLUES};
 use crate::app::radarr::radarr_context_clues::ADD_MOVIE_SEARCH_RESULTS_CONTEXT_CLUES;
-use crate::app::radarr::{ActiveRadarrBlock, ADD_MOVIE_BLOCKS};
 use crate::models::radarr_models::AddMovieSearchResult;
+use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, ADD_MOVIE_BLOCKS};
 use crate::models::Route;
 use crate::ui::radarr_ui::collections::{draw_collection_details, draw_collections};
 use crate::ui::radarr_ui::library::draw_library;

src/ui/radarr_ui/library/add_movie_ui_tests.rs

@@ -2,7 +2,7 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::app::radarr::{ActiveRadarrBlock, ADD_MOVIE_BLOCKS};
+  use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, ADD_MOVIE_BLOCKS};
   use crate::ui::radarr_ui::library::add_movie_ui::AddMovieUi;
   use crate::ui::DrawUi;
 

src/ui/radarr_ui/library/delete_movie_ui.rs

@@ -2,8 +2,8 @@ use tui::backend::Backend;
 use tui::layout::Rect;
 use tui::Frame;
 
-use crate::app::radarr::{ActiveRadarrBlock, DELETE_MOVIE_BLOCKS};
 use crate::app::App;
+use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, DELETE_MOVIE_BLOCKS};
 use crate::models::Route;
 use crate::ui::radarr_ui::library::draw_library;
 use crate::ui::{draw_prompt_box_with_checkboxes, draw_prompt_popup_over, DrawUi};

src/ui/radarr_ui/library/delete_movie_ui_tests.rs

@@ -2,7 +2,7 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::app::radarr::{ActiveRadarrBlock, DELETE_MOVIE_BLOCKS};
+  use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, DELETE_MOVIE_BLOCKS};
   use crate::ui::radarr_ui::library::delete_movie_ui::DeleteMovieUi;
   use crate::ui::DrawUi;
 

src/ui/radarr_ui/library/edit_movie_ui.rs

@@ -2,8 +2,10 @@ use tui::backend::Backend;
 use tui::layout::{Constraint, Rect};
 use tui::Frame;
 
-use crate::app::radarr::{ActiveRadarrBlock, EDIT_MOVIE_BLOCKS, MOVIE_DETAILS_BLOCKS};
 use crate::app::App;
+use crate::models::servarr_data::radarr_data::{
+  ActiveRadarrBlock, EDIT_MOVIE_BLOCKS, MOVIE_DETAILS_BLOCKS,
+};
 use crate::models::Route;
 use crate::ui::radarr_ui::library::draw_library;
 use crate::ui::radarr_ui::library::movie_details_ui::MovieDetailsUi;

src/ui/radarr_ui/library/edit_movie_ui_tests.rs

@@ -2,7 +2,7 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::app::radarr::{ActiveRadarrBlock, EDIT_MOVIE_BLOCKS};
+  use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, EDIT_MOVIE_BLOCKS};
   use crate::ui::radarr_ui::library::edit_movie_ui::EditMovieUi;
   use crate::ui::DrawUi;
 

src/ui/radarr_ui/library/library_ui_tests.rs

@@ -2,7 +2,7 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::app::radarr::{
+  use crate::models::servarr_data::radarr_data::{
     ActiveRadarrBlock, ADD_MOVIE_BLOCKS, DELETE_MOVIE_BLOCKS, EDIT_MOVIE_BLOCKS, LIBRARY_BLOCKS,
     MOVIE_DETAILS_BLOCKS,
   };

src/ui/radarr_ui/library/mod.rs

@@ -3,9 +3,9 @@ use tui::layout::{Constraint, Rect};
 use tui::widgets::{Cell, Row};
 use tui::Frame;
 
-use crate::app::radarr::{ActiveRadarrBlock, LIBRARY_BLOCKS};
 use crate::app::App;
 use crate::models::radarr_models::Movie;
+use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, LIBRARY_BLOCKS};
 use crate::models::Route;
 use crate::ui::radarr_ui::library::add_movie_ui::AddMovieUi;
 use crate::ui::radarr_ui::library::delete_movie_ui::DeleteMovieUi;

src/ui/radarr_ui/library/movie_details_ui.rs

@@ -7,9 +7,9 @@ use tui::text::{Line, Span, Text};
 use tui::widgets::{Cell, ListItem, Paragraph, Row, Wrap};
 use tui::Frame;
 
-use crate::app::radarr::{ActiveRadarrBlock, MOVIE_DETAILS_BLOCKS};
 use crate::app::App;
 use crate::models::radarr_models::{Credit, MovieHistoryItem, Release, ReleaseField};
+use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, MOVIE_DETAILS_BLOCKS};
 use crate::models::Route;
 use crate::ui::radarr_ui::library::draw_library;
 use crate::ui::utils::{

src/ui/radarr_ui/library/movie_details_ui_tests.rs

@@ -2,7 +2,7 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::app::radarr::{ActiveRadarrBlock, MOVIE_DETAILS_BLOCKS};
+  use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, MOVIE_DETAILS_BLOCKS};
   use crate::ui::radarr_ui::library::movie_details_ui::MovieDetailsUi;
   use crate::ui::DrawUi;
 

src/ui/radarr_ui/mod.rs

@@ -9,10 +9,12 @@ use tui::widgets::ListItem;
 use tui::widgets::Paragraph;
 use tui::Frame;
 
-use crate::app::radarr::{ActiveRadarrBlock, RadarrData, FILTER_BLOCKS, SEARCH_BLOCKS};
 use crate::app::App;
 use crate::logos::RADARR_LOGO;
 use crate::models::radarr_models::{DiskSpace, DownloadRecord, Movie, RootFolder};
+use crate::models::servarr_data::radarr_data::{
+  ActiveRadarrBlock, RadarrData, FILTER_BLOCKS, SEARCH_BLOCKS,
+};
 use crate::models::Route;
 use crate::ui::draw_selectable_list;
 use crate::ui::draw_tabs;

src/ui/radarr_ui/radarr_ui_tests.rs

@@ -2,7 +2,7 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::app::radarr::ActiveRadarrBlock;
+  use crate::models::servarr_data::radarr_data::ActiveRadarrBlock;
   use crate::ui::radarr_ui::RadarrUi;
   use crate::ui::DrawUi;
 

src/ui/radarr_ui/root_folders/mod.rs

@@ -3,9 +3,9 @@ use tui::layout::{Alignment, Constraint, Rect};
 use tui::widgets::{Cell, Paragraph, Row};
 use tui::Frame;
 
-use crate::app::radarr::{ActiveRadarrBlock, ROOT_FOLDERS_BLOCKS};
 use crate::app::App;
 use crate::models::radarr_models::RootFolder;
+use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, ROOT_FOLDERS_BLOCKS};
 use crate::models::Route;
 use crate::ui::utils::{
   borderless_block, layout_block_top_border, show_cursor, style_default, style_help, style_primary,

src/ui/radarr_ui/root_folders/root_folders_ui_tests.rs

@@ -2,7 +2,7 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::app::radarr::{ActiveRadarrBlock, ROOT_FOLDERS_BLOCKS};
+  use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, ROOT_FOLDERS_BLOCKS};
   use crate::ui::radarr_ui::root_folders::RootFoldersUi;
   use crate::ui::DrawUi;
 

src/ui/radarr_ui/system/mod.rs

@@ -11,7 +11,9 @@ use tui::{
   Frame,
 };
 
+use crate::app::App;
 use crate::models::radarr_models::Task;
+use crate::models::servarr_data::radarr_data::ActiveRadarrBlock;
 use crate::ui::radarr_ui::radarr_ui_utils::{
   convert_to_minutes_hours_days, determine_log_style_by_level,
 };
@@ -19,7 +21,6 @@ use crate::ui::radarr_ui::system::system_details_ui::SystemDetailsUi;
 use crate::ui::utils::{layout_block_top_border, style_help, style_primary};
 use crate::ui::{draw_table, ListProps, TableProps};
 use crate::{
-  app::{radarr::ActiveRadarrBlock, App},
   models::Route,
   ui::{
     draw_list_box,

src/ui/radarr_ui/system/system_details_ui.rs

@@ -6,8 +6,8 @@ use tui::Frame;
 
 use crate::app::context_clues::{build_context_clue_string, BARE_POPUP_CONTEXT_CLUES};
 use crate::app::radarr::radarr_context_clues::SYSTEM_TASKS_CONTEXT_CLUES;
-use crate::app::radarr::{ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS};
 use crate::app::App;
+use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS};
 use crate::models::Route;
 use crate::ui::radarr_ui::radarr_ui_utils::determine_log_style_by_level;
 use crate::ui::radarr_ui::system::{

src/ui/radarr_ui/system/system_details_ui_tests.rs

@@ -2,7 +2,7 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::app::radarr::{ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS};
+  use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS};
   use crate::ui::radarr_ui::system::system_details_ui::SystemDetailsUi;
   use crate::ui::DrawUi;
 

src/ui/radarr_ui/system/system_ui_tests.rs

@@ -2,7 +2,7 @@
 mod tests {
   use strum::IntoEnumIterator;
 
-  use crate::app::radarr::{ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS};
+  use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, SYSTEM_DETAILS_BLOCKS};
   use crate::ui::radarr_ui::system::SystemUi;
   use crate::ui::DrawUi;