diff --git a/src/cli/radarr/add_command_handler.rs b/src/cli/radarr/add_command_handler.rs index 098a532..c41bd64 100644 --- a/src/cli/radarr/add_command_handler.rs +++ b/src/cli/radarr/add_command_handler.rs @@ -4,6 +4,8 @@ use anyhow::Result; use clap::{arg, command, ArgAction, Subcommand}; use tokio::sync::Mutex; +use super::RadarrCommand; +use crate::models::servarr_models::AddRootFolderBody; use crate::{ app::App, cli::{CliCommandHandler, Command}, @@ -11,8 +13,6 @@ use crate::{ network::{radarr_network::RadarrEvent, NetworkTrait}, }; -use super::RadarrCommand; - #[cfg(test)] #[path = "add_command_handler_tests.rs"] mod add_command_handler_tests; @@ -138,9 +138,10 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, RadarrAddCommand> for RadarrAddCommandHan serde_json::to_string_pretty(&resp)? } RadarrAddCommand::RootFolder { root_folder_path } => { + let add_root_folder_body = AddRootFolderBody { path: root_folder_path }; let resp = self .network - .handle_network_event(RadarrEvent::AddRootFolder(Some(root_folder_path)).into()) + .handle_network_event(RadarrEvent::AddRootFolder(add_root_folder_body).into()) .await?; serde_json::to_string_pretty(&resp)? } diff --git a/src/cli/radarr/add_command_handler_tests.rs b/src/cli/radarr/add_command_handler_tests.rs index 83202b5..e1bbf53 100644 --- a/src/cli/radarr/add_command_handler_tests.rs +++ b/src/cli/radarr/add_command_handler_tests.rs @@ -368,6 +368,7 @@ mod tests { use super::*; use mockall::predicate::eq; + use crate::models::servarr_models::AddRootFolderBody; use serde_json::json; use tokio::sync::Mutex; @@ -421,11 +422,12 @@ mod tests { #[tokio::test] async fn test_handle_add_root_folder_command() { let expected_root_folder_path = "/nfs/test".to_owned(); + let expected_add_root_folder_body = AddRootFolderBody { path: expected_root_folder_path.clone() }; let mut mock_network = MockNetworkTrait::new(); mock_network .expect_handle_network_event() .with(eq::( - RadarrEvent::AddRootFolder(Some(expected_root_folder_path.clone())).into(), + RadarrEvent::AddRootFolder(expected_add_root_folder_body).into(), )) .times(1) .returning(|_| { diff --git a/src/handlers/radarr_handlers/root_folders/mod.rs b/src/handlers/radarr_handlers/root_folders/mod.rs index 6ffc3f0..f77d5fd 100644 --- a/src/handlers/radarr_handlers/root_folders/mod.rs +++ b/src/handlers/radarr_handlers/root_folders/mod.rs @@ -5,7 +5,7 @@ use crate::handlers::radarr_handlers::handle_change_tab_left_right_keys; use crate::handlers::table_handler::TableHandlingConfig; use crate::handlers::{handle_clear_errors, handle_prompt_toggle, KeyEventHandler}; use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, ROOT_FOLDERS_BLOCKS}; -use crate::models::servarr_models::RootFolder; +use crate::models::servarr_models::{AddRootFolderBody, RootFolder}; use crate::models::HorizontallyScrollableText; use crate::network::radarr_network::RadarrEvent; use crate::{handle_table_events, handle_text_box_keys, handle_text_box_left_right_keys}; @@ -28,6 +28,21 @@ impl<'a, 'b> RootFoldersHandler<'a, 'b> { self.app.data.radarr_data.root_folders, RootFolder ); + + fn build_add_root_folder_body(&mut self) -> AddRootFolderBody { + let path = self.app + .data + .radarr_data + .edit_root_folder + .as_ref() + .unwrap() + .text + .clone(); + + self.app.data.radarr_data.edit_root_folder = None; + + AddRootFolderBody { path } + } } impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<'a, 'b> { @@ -140,7 +155,7 @@ impl<'a, 'b> KeyEventHandler<'a, 'b, ActiveRadarrBlock> for RootFoldersHandler<' .text .is_empty() => { - self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::AddRootFolder(None)); + self.app.data.radarr_data.prompt_confirm_action = Some(RadarrEvent::AddRootFolder(self.build_add_root_folder_body())); self.app.data.radarr_data.prompt_confirm = true; self.app.should_ignore_quit_key = false; self.app.pop_navigation_stack(); diff --git a/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs b/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs index 420204a..7a38743 100644 --- a/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs +++ b/src/handlers/radarr_handlers/root_folders/root_folders_handler_tests.rs @@ -8,7 +8,7 @@ mod tests { use crate::handlers::radarr_handlers::root_folders::RootFoldersHandler; use crate::handlers::KeyEventHandler; use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, ROOT_FOLDERS_BLOCKS}; - use crate::models::servarr_models::RootFolder; + use crate::models::servarr_models::{AddRootFolderBody, RootFolder}; use crate::models::HorizontallyScrollableText; mod test_handle_home_end { @@ -250,6 +250,7 @@ mod tests { #[test] fn test_add_root_folder_prompt_confirm_submit() { let mut app = App::default(); + let expected_add_root_folder_body = AddRootFolderBody { path: "Test".to_owned() }; app .data .radarr_data @@ -273,7 +274,7 @@ mod tests { assert!(!app.should_ignore_quit_key); assert_eq!( app.data.radarr_data.prompt_confirm_action, - Some(RadarrEvent::AddRootFolder(None)) + Some(RadarrEvent::AddRootFolder(expected_add_root_folder_body)) ); assert_eq!( app.get_current_route(), @@ -638,6 +639,27 @@ mod tests { } }) } + + #[test] + fn test_build_add_root_folder_body() { + let mut app = App::default(); + app.data.radarr_data.edit_root_folder = Some("/nfs/test".into()); + let expected_add_root_folder_body = AddRootFolderBody { path: "/nfs/test".to_owned() }; + + let actual_add_root_folder_body = RootFoldersHandler::with( + DEFAULT_KEYBINDINGS.esc.key, + &mut app, + ActiveRadarrBlock::RootFolders, + None, + ).build_add_root_folder_body(); + + assert_eq!(actual_add_root_folder_body, expected_add_root_folder_body); + assert!(app + .data + .radarr_data + .edit_root_folder + .is_none()); + } #[test] fn test_root_folders_handler_not_ready_when_loading() { diff --git a/src/models/servarr_models.rs b/src/models/servarr_models.rs index 4f1810b..8625e74 100644 --- a/src/models/servarr_models.rs +++ b/src/models/servarr_models.rs @@ -11,7 +11,7 @@ use super::HorizontallyScrollableText; #[path = "servarr_models_tests.rs"] mod servarr_models_tests; -#[derive(Default, Serialize, Debug)] +#[derive(Default, Serialize, Debug, Clone, PartialEq, Eq)] pub struct AddRootFolderBody { pub path: String, } diff --git a/src/network/radarr_network.rs b/src/network/radarr_network.rs index 88b651b..300b787 100644 --- a/src/network/radarr_network.rs +++ b/src/network/radarr_network.rs @@ -36,7 +36,7 @@ mod radarr_network_tests; #[derive(Debug, Eq, PartialEq, Clone)] pub enum RadarrEvent { AddMovie(AddMovieBody), - AddRootFolder(Option), + AddRootFolder(AddRootFolderBody), AddTag(String), ClearBlocklist, DeleteBlocklistItem(Option), @@ -301,31 +301,14 @@ impl<'a, 'b> Network<'a, 'b> { .await } - async fn add_radarr_root_folder(&mut self, root_folder: Option) -> Result { + async fn add_radarr_root_folder(&mut self, add_root_folder_body: AddRootFolderBody) -> Result { info!("Adding new root folder to Radarr"); - let event = RadarrEvent::AddRootFolder(None); - let body = if let Some(path) = root_folder { - AddRootFolderBody { path } - } else { - let mut app = self.app.lock().await; - let path = app - .data - .radarr_data - .edit_root_folder - .as_ref() - .unwrap() - .text - .clone(); - - app.data.radarr_data.edit_root_folder = None; - - AddRootFolderBody { path } - }; - - debug!("Add root folder body: {body:?}"); + let event = RadarrEvent::AddRootFolder(add_root_folder_body.clone()); + + debug!("Add root folder body: {add_root_folder_body:?}"); let request_props = self - .request_props_from(event, RequestMethod::Post, Some(body), None, None) + .request_props_from(event, RequestMethod::Post, Some(add_root_folder_body), None, None) .await; self diff --git a/src/network/radarr_network_tests.rs b/src/network/radarr_network_tests.rs index 4a508bd..886b388 100644 --- a/src/network/radarr_network_tests.rs +++ b/src/network/radarr_network_tests.rs @@ -156,7 +156,7 @@ mod test { #[rstest] fn test_resource_root_folder( #[values( - RadarrEvent::AddRootFolder(None), + RadarrEvent::AddRootFolder(AddRootFolderBody::default()), RadarrEvent::GetRootFolders, RadarrEvent::DeleteRootFolder(None) )] @@ -3456,60 +3456,20 @@ mod test { })), Some(json!({})), None, - RadarrEvent::AddRootFolder(None), + RadarrEvent::AddRootFolder(AddRootFolderBody::default()), None, None, ) .await; - - app_arc.lock().await.data.radarr_data.edit_root_folder = Some("/nfs/test".into()); + let add_root_folder_body = AddRootFolderBody { path: "/nfs/test".to_owned() }; let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new()); assert!(network - .handle_radarr_event(RadarrEvent::AddRootFolder(None)) + .handle_radarr_event(RadarrEvent::AddRootFolder(add_root_folder_body)) .await .is_ok()); async_server.assert_async().await; - assert!(app_arc - .lock() - .await - .data - .radarr_data - .edit_root_folder - .is_none()); - } - - #[tokio::test] - async fn test_handle_add_radarr_root_folder_event_uses_provided_path() { - let (async_server, app_arc, _server) = mock_servarr_api( - RequestMethod::Post, - Some(json!({ - "path": "/test/test" - })), - Some(json!({})), - None, - RadarrEvent::AddRootFolder(None), - None, - None, - ) - .await; - - let mut network = Network::new(&app_arc, CancellationToken::new(), Client::new()); - - assert!(network - .handle_radarr_event(RadarrEvent::AddRootFolder(Some("/test/test".to_owned()))) - .await - .is_ok()); - - async_server.assert_async().await; - assert!(app_arc - .lock() - .await - .data - .radarr_data - .edit_root_folder - .is_none()); } #[tokio::test]