diff --git a/src/cli/readarr/get_command_handler.rs b/src/cli/readarr/get_command_handler.rs index 4362793e..d3420a37 100644 --- a/src/cli/readarr/get_command_handler.rs +++ b/src/cli/readarr/get_command_handler.rs @@ -18,6 +18,8 @@ mod get_command_handler_tests; #[derive(Debug, Clone, PartialEq, Eq, Subcommand)] pub enum ReadarrGetCommand { + #[command(about = "Fetch the host config for your Readarr instance")] + HostConfig, #[command(about = "Get the system status")] SystemStatus, } @@ -49,6 +51,13 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, ReadarrGetCommand> for ReadarrGetCommandH async fn handle(self) -> Result { let result = match self.command { + ReadarrGetCommand::HostConfig => { + let resp = self + .network + .handle_network_event(ReadarrEvent::GetHostConfig.into()) + .await?; + serde_json::to_string_pretty(&resp)? + } ReadarrGetCommand::SystemStatus => { let resp = self .network diff --git a/src/cli/readarr/get_command_handler_tests.rs b/src/cli/readarr/get_command_handler_tests.rs index 822123bb..30214de0 100644 --- a/src/cli/readarr/get_command_handler_tests.rs +++ b/src/cli/readarr/get_command_handler_tests.rs @@ -22,7 +22,9 @@ mod tests { use rstest::rstest; #[rstest] - fn test_get_commands_have_no_arg_requirements(#[values("system-status")] subcommand: &str) { + fn test_get_commands_have_no_arg_requirements( + #[values("host-config", "system-status")] subcommand: &str, + ) { let result = Cli::command().try_get_matches_from(["managarr", "readarr", "get", subcommand]); assert_ok!(&result); @@ -46,6 +48,29 @@ mod tests { network::{MockNetworkTrait, NetworkEvent, readarr_network::ReadarrEvent}, }; + #[tokio::test] + async fn test_handle_get_host_config_command() { + let mut mock_network = MockNetworkTrait::new(); + mock_network + .expect_handle_network_event() + .with(eq::(ReadarrEvent::GetHostConfig.into())) + .times(1) + .returning(|_| { + Ok(Serdeable::Readarr(ReadarrSerdeable::Value( + json!({"testResponse": "response"}), + ))) + }); + let app_arc = Arc::new(Mutex::new(App::test_default())); + let get_host_config_command = ReadarrGetCommand::HostConfig; + + let result = + ReadarrGetCommandHandler::with(&app_arc, get_host_config_command, &mut mock_network) + .handle() + .await; + + assert_ok!(&result); + } + #[tokio::test] async fn test_handle_get_system_status_command() { let mut mock_network = MockNetworkTrait::new(); diff --git a/src/network/readarr_network/mod.rs b/src/network/readarr_network/mod.rs index 17e3a1c0..19349c54 100644 --- a/src/network/readarr_network/mod.rs +++ b/src/network/readarr_network/mod.rs @@ -14,6 +14,7 @@ mod readarr_network_tests; #[derive(Debug, Eq, PartialEq, Clone)] pub enum ReadarrEvent { GetDiskSpace, + GetHostConfig, GetStatus, HealthCheck, } @@ -21,6 +22,7 @@ pub enum ReadarrEvent { impl NetworkResource for ReadarrEvent { fn resource(&self) -> &'static str { match &self { + ReadarrEvent::GetHostConfig => "/config/host", ReadarrEvent::GetDiskSpace => "/diskspace", ReadarrEvent::HealthCheck => "/health", ReadarrEvent::GetStatus => "/system/status", @@ -44,6 +46,10 @@ impl Network<'_, '_> { .get_readarr_diskspace() .await .map(ReadarrSerdeable::from), + ReadarrEvent::GetHostConfig => self + .get_readarr_host_config() + .await + .map(ReadarrSerdeable::from), ReadarrEvent::GetStatus => self.get_readarr_status().await.map(ReadarrSerdeable::from), ReadarrEvent::HealthCheck => self .get_readarr_healthcheck() diff --git a/src/network/readarr_network/readarr_network_tests.rs b/src/network/readarr_network/readarr_network_tests.rs index a8703242..f55f6bdd 100644 --- a/src/network/readarr_network/readarr_network_tests.rs +++ b/src/network/readarr_network/readarr_network_tests.rs @@ -6,6 +6,7 @@ mod tests { use rstest::rstest; #[rstest] + #[case(ReadarrEvent::GetHostConfig, "/config/host")] #[case(ReadarrEvent::GetDiskSpace, "/diskspace")] #[case(ReadarrEvent::HealthCheck, "/health")] #[case(ReadarrEvent::GetStatus, "/system/status")] diff --git a/src/network/readarr_network/system/mod.rs b/src/network/readarr_network/system/mod.rs index 4660f761..93d63ad4 100644 --- a/src/network/readarr_network/system/mod.rs +++ b/src/network/readarr_network/system/mod.rs @@ -1,4 +1,4 @@ -use crate::models::servarr_models::{DiskSpace, SystemStatus}; +use crate::models::servarr_models::{DiskSpace, HostConfig, SystemStatus}; use crate::network::readarr_network::ReadarrEvent; use crate::network::{Network, RequestMethod}; use anyhow::Result; @@ -26,6 +26,21 @@ impl Network<'_, '_> { .await } + pub(in crate::network::readarr_network) async fn get_readarr_host_config( + &mut self, + ) -> Result { + info!("Fetching Readarr host config"); + let event = ReadarrEvent::GetHostConfig; + + let request_props = self + .request_props_from(event, RequestMethod::Get, None::<()>, None, None) + .await; + + self + .handle_request::<(), HostConfig>(request_props, |_, _| ()) + .await + } + pub(in crate::network::readarr_network) async fn get_readarr_status( &mut self, ) -> Result { diff --git a/src/network/readarr_network/system/readarr_system_network_tests.rs b/src/network/readarr_network/system/readarr_system_network_tests.rs index 50de66d9..038f63c9 100644 --- a/src/network/readarr_network/system/readarr_system_network_tests.rs +++ b/src/network/readarr_network/system/readarr_system_network_tests.rs @@ -1,7 +1,8 @@ #[cfg(test)] mod tests { + use crate::models::HorizontallyScrollableText; use crate::models::readarr_models::ReadarrSerdeable; - use crate::models::servarr_models::{DiskSpace, SystemStatus}; + use crate::models::servarr_models::{DiskSpace, HostConfig, SystemStatus}; use crate::network::network_tests::test_utils::{MockServarrApi, test_network}; use crate::network::readarr_network::ReadarrEvent; use chrono::DateTime; @@ -77,6 +78,69 @@ mod tests { assert_is_empty!(app.lock().await.data.readarr_data.disk_space_vec); } + #[tokio::test] + async fn test_handle_get_readarr_host_config_event() { + let (mock, app, _server) = MockServarrApi::get() + .returns(json!({ + "bindAddress": "*", + "port": 8787, + "urlBase": "", + "instanceName": "Readarr", + "applicationUrl": "", + "enableSsl": false, + "sslPort": 6868, + "sslCertPath": "", + "sslCertPassword": "" + })) + .build_for(ReadarrEvent::GetHostConfig) + .await; + app.lock().await.server_tabs.set_index(3); + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::GetHostConfig) + .await; + + mock.assert_async().await; + + let ReadarrSerdeable::HostConfig(host_config) = result.unwrap() else { + panic!("Expected HostConfig") + }; + + assert_eq!( + host_config, + HostConfig { + bind_address: "*".into(), + port: 8787, + url_base: Some(HorizontallyScrollableText::default()), + instance_name: Some("Readarr".into()), + application_url: Some(HorizontallyScrollableText::default()), + enable_ssl: false, + ssl_port: 6868, + ssl_cert_path: Some(String::new()), + ssl_cert_password: Some(String::new()), + } + ); + } + + #[tokio::test] + async fn test_handle_get_readarr_host_config_event_failure() { + let (mock, app, _server) = MockServarrApi::get() + .returns(json!({})) + .status(500) + .build_for(ReadarrEvent::GetHostConfig) + .await; + app.lock().await.server_tabs.set_index(3); + let mut network = test_network(&app); + + let result = network + .handle_readarr_event(ReadarrEvent::GetHostConfig) + .await; + + mock.assert_async().await; + assert_err!(result); + } + #[tokio::test] async fn test_handle_get_readarr_status_event() { let (mock, app, _server) = MockServarrApi::get()