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/handlers/radarr_handlers/indexers/edit_indexer_settings_handler.rs

@@ -1,7 +1,7 @@
-use crate::app::radarr::{ActiveRadarrBlock, INDEXER_SETTINGS_BLOCKS};
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::KeyEventHandler;
+use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, INDEXER_SETTINGS_BLOCKS};
 
 #[cfg(test)]
 #[path = "./edit_indexer_settings_handler_tests.rs"]

src/handlers/radarr_handlers/indexers/edit_indexer_settings_handler_tests.rs

@@ -3,17 +3,17 @@ mod tests {
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
-  use crate::app::radarr::{ActiveRadarrBlock, INDEXER_SETTINGS_BLOCKS};
   use crate::app::App;
   use crate::event::Key;
   use crate::handlers::radarr_handlers::indexers::edit_indexer_settings_handler::IndexerSettingsHandler;
   use crate::handlers::KeyEventHandler;
+  use crate::models::servarr_data::radarr_data::{ActiveRadarrBlock, INDEXER_SETTINGS_BLOCKS};
 
   mod test_handle_scroll_up_and_down {
     use pretty_assertions::assert_eq;
     use rstest::rstest;
 
-    use crate::app::radarr::INDEXER_SETTINGS_SELECTION_BLOCKS;
+    use crate::models::servarr_data::radarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS;
     use crate::models::BlockSelectionState;
 
     use super::*;
@@ -56,7 +56,7 @@ mod tests {
   mod test_handle_esc {
     use pretty_assertions::assert_eq;
 
-    use crate::app::radarr::radarr_test_utils::utils::create_test_radarr_data;
+    use crate::models::servarr_data::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
 
     use super::*;
 

src/handlers/radarr_handlers/indexers/indexers_handler_tests.rs

@@ -5,11 +5,13 @@ mod tests {
   use strum::IntoEnumIterator;
 
   use crate::app::key_binding::DEFAULT_KEYBINDINGS;
-  use crate::app::radarr::{ActiveRadarrBlock, INDEXERS_BLOCKS, INDEXER_SETTINGS_BLOCKS};
   use crate::app::App;
   use crate::event::Key;
   use crate::handlers::radarr_handlers::indexers::IndexersHandler;
   use crate::handlers::KeyEventHandler;
+  use crate::models::servarr_data::radarr_data::{
+    ActiveRadarrBlock, INDEXERS_BLOCKS, INDEXER_SETTINGS_BLOCKS,
+  };
   use crate::test_handler_delegation;
 
   mod test_handle_scroll_up_and_down {
@@ -251,8 +253,8 @@ mod tests {
   mod test_handle_key_char {
     use pretty_assertions::assert_eq;
 
-    use crate::app::radarr::INDEXER_SETTINGS_SELECTION_BLOCKS;
     use crate::assert_refresh_key;
+    use crate::models::servarr_data::radarr_data::INDEXER_SETTINGS_SELECTION_BLOCKS;
 
     use super::*;
 

src/handlers/radarr_handlers/indexers/mod.rs

@@ -1,10 +1,12 @@
 use crate::app::key_binding::DEFAULT_KEYBINDINGS;
-use crate::app::radarr::{ActiveRadarrBlock, INDEXERS_BLOCKS, INDEXER_SETTINGS_SELECTION_BLOCKS};
 use crate::app::App;
 use crate::event::Key;
 use crate::handlers::radarr_handlers::handle_change_tab_left_right_keys;
 use crate::handlers::radarr_handlers::indexers::edit_indexer_settings_handler::IndexerSettingsHandler;
 use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler};
+use crate::models::servarr_data::radarr_data::{
+  ActiveRadarrBlock, INDEXERS_BLOCKS, INDEXER_SETTINGS_SELECTION_BLOCKS,
+};
 use crate::models::{BlockSelectionState, Scrollable};
 use crate::network::radarr_network::RadarrEvent;