feat(readarr): edit the shared indexer settings and expose the command on the CLI

This commit is contained in:
Dark-Alex-17 committed 2026-09-02 15:37:25 -06:00
1 parent 0867ae918e
commit dbd84d929d
6 files changed
+378 -5

No files matched your search

+66 -1
View File
@@ -5,7 +5,9 @@ use clap::{ArgAction, ArgGroup, Subcommand};
use tokio::sync::Mutex; use tokio::sync::Mutex;
use super::ReadarrCommand; use super::ReadarrCommand;
use crate::models::servarr_models::EditIndexerParams; use crate::models::Serdeable;
use crate::models::readarr_models::ReadarrSerdeable;
use crate::models::servarr_models::{EditIndexerParams, IndexerSettings};
use crate::{ use crate::{
app::App, app::App,
cli::{CliCommandHandler, Command, mutex_flags_or_option}, cli::{CliCommandHandler, Command, mutex_flags_or_option},
@@ -19,6 +21,40 @@ mod edit_command_handler_tests;
#[derive(Debug, Clone, PartialEq, Eq, Subcommand)] #[derive(Debug, Clone, PartialEq, Eq, Subcommand)]
pub enum ReadarrEditCommand { pub enum ReadarrEditCommand {
#[command(
about = "Edit the indexer settings that apply to all indexers",
group(
ArgGroup::new("edit_settings")
.args([
"maximum_size",
"minimum_age",
"retention",
"rss_sync_interval",
]).required(true)
.multiple(true))
)]
AllIndexerSettings {
#[arg(
long,
help = "The maximum size for a release to be grabbed in MB. Set to zero to set to unlimited"
)]
maximum_size: Option<i64>,
#[arg(
long,
help = "Usenet only: Minimum age in minutes of NZBs before they are grabbed. Use this to give new releases time to propagate to your usenet provider."
)]
minimum_age: Option<i64>,
#[arg(
long,
help = "Usenet only: The retention time in days to retain releases. Set to zero to set for unlimited retention"
)]
retention: Option<i64>,
#[arg(
long,
help = "The RSS sync interval in minutes. Set to zero to disable (this will stop all automatic release grabbing)"
)]
rss_sync_interval: Option<i64>,
},
#[command( #[command(
about = "Edit preferences for the specified author", about = "Edit preferences for the specified author",
group( group(
@@ -200,6 +236,35 @@ impl<'a, 'b> CliCommandHandler<'a, 'b, ReadarrEditCommand> for ReadarrEditComman
async fn handle(self) -> Result<String> { async fn handle(self) -> Result<String> {
let result = match self.command { let result = match self.command {
ReadarrEditCommand::AllIndexerSettings {
maximum_size,
minimum_age,
retention,
rss_sync_interval,
} => {
if let Serdeable::Readarr(ReadarrSerdeable::IndexerSettings(previous_indexer_settings)) =
self
.network
.handle_network_event(ReadarrEvent::GetAllIndexerSettings.into())
.await?
{
let params = IndexerSettings {
id: 1,
maximum_size: maximum_size.unwrap_or(previous_indexer_settings.maximum_size),
minimum_age: minimum_age.unwrap_or(previous_indexer_settings.minimum_age),
retention: retention.unwrap_or(previous_indexer_settings.retention),
rss_sync_interval: rss_sync_interval
.unwrap_or(previous_indexer_settings.rss_sync_interval),
};
self
.network
.handle_network_event(ReadarrEvent::EditAllIndexerSettings(params).into())
.await?;
"All indexer settings updated".to_owned()
} else {
String::new()
}
}
ReadarrEditCommand::Author { ReadarrEditCommand::Author {
author_id, author_id,
enable_monitoring, enable_monitoring,
+245 -1
View File
@@ -36,6 +36,102 @@ mod tests {
use pretty_assertions::assert_eq; use pretty_assertions::assert_eq;
use rstest::rstest; use rstest::rstest;
#[test]
fn test_edit_all_indexer_settings_requires_arguments() {
let result = Cli::command().try_get_matches_from([
"managarr",
"readarr",
"edit",
"all-indexer-settings",
]);
assert_err!(&result);
assert_eq!(
result.unwrap_err().kind(),
ErrorKind::MissingRequiredArgument
);
}
#[rstest]
fn test_edit_all_indexer_settings_assert_argument_flags_require_args(
#[values(
"--maximum-size",
"--minimum-age",
"--retention",
"--rss-sync-interval"
)]
flag: &str,
) {
let result = Cli::command().try_get_matches_from([
"managarr",
"readarr",
"edit",
"all-indexer-settings",
flag,
]);
assert_err!(&result);
assert_eq!(result.unwrap_err().kind(), ErrorKind::InvalidValue);
}
#[test]
fn test_edit_all_indexer_settings_only_requires_at_least_one_argument() {
let expected_args = ReadarrEditCommand::AllIndexerSettings {
maximum_size: Some(26500),
minimum_age: None,
retention: None,
rss_sync_interval: None,
};
let result = Cli::try_parse_from([
"managarr",
"readarr",
"edit",
"all-indexer-settings",
"--maximum-size",
"26500",
]);
assert_ok!(&result);
let Some(Command::Readarr(ReadarrCommand::Edit(edit_command))) = result.unwrap().command
else {
panic!("Unexpected command type");
};
assert_eq!(edit_command, expected_args);
}
#[test]
fn test_edit_all_indexer_settings_all_arguments_defined() {
let expected_args = ReadarrEditCommand::AllIndexerSettings {
maximum_size: Some(26500),
minimum_age: Some(17),
retention: Some(43),
rss_sync_interval: Some(35),
};
let result = Cli::try_parse_from([
"managarr",
"readarr",
"edit",
"all-indexer-settings",
"--maximum-size",
"26500",
"--minimum-age",
"17",
"--retention",
"43",
"--rss-sync-interval",
"35",
]);
assert_ok!(&result);
let Some(Command::Readarr(ReadarrCommand::Edit(edit_command))) = result.unwrap().command
else {
panic!("Unexpected command type");
};
assert_eq!(edit_command, expected_args);
}
#[test] #[test]
fn test_edit_author_requires_arguments() { fn test_edit_author_requires_arguments() {
let result = Cli::command().try_get_matches_from(["managarr", "readarr", "edit", "author"]); let result = Cli::command().try_get_matches_from(["managarr", "readarr", "edit", "author"]);
@@ -554,6 +650,7 @@ mod tests {
use std::sync::Arc; use std::sync::Arc;
use mockall::predicate::eq; use mockall::predicate::eq;
use pretty_assertions::assert_str_eq;
use serde_json::json; use serde_json::json;
use tokio::sync::Mutex; use tokio::sync::Mutex;
@@ -563,13 +660,160 @@ mod tests {
}; };
use crate::models::Serdeable; use crate::models::Serdeable;
use crate::models::readarr_models::{EditAuthorParams, NewItemMonitorType, ReadarrSerdeable}; use crate::models::readarr_models::{EditAuthorParams, NewItemMonitorType, ReadarrSerdeable};
use crate::models::servarr_models::EditIndexerParams; use crate::models::servarr_models::{EditIndexerParams, IndexerSettings};
use crate::network::readarr_network::ReadarrEvent; use crate::network::readarr_network::ReadarrEvent;
use crate::{ use crate::{
app::App, app::App,
network::{MockNetworkTrait, NetworkEvent}, network::{MockNetworkTrait, NetworkEvent},
}; };
#[tokio::test]
async fn test_handle_edit_all_indexer_settings_command() {
let expected_edit_all_indexer_settings = IndexerSettings {
id: 1,
maximum_size: 26500,
minimum_age: 17,
retention: 43,
rss_sync_interval: 35,
};
let mut mock_network = MockNetworkTrait::new();
mock_network
.expect_handle_network_event()
.with(eq::<NetworkEvent>(
ReadarrEvent::GetAllIndexerSettings.into(),
))
.times(1)
.returning(|_| {
Ok(Serdeable::Readarr(ReadarrSerdeable::IndexerSettings(
IndexerSettings {
id: 9,
maximum_size: 31200,
minimum_age: 22,
retention: 58,
rss_sync_interval: 90,
},
)))
});
mock_network
.expect_handle_network_event()
.with(eq::<NetworkEvent>(
ReadarrEvent::EditAllIndexerSettings(expected_edit_all_indexer_settings).into(),
))
.times(1)
.returning(|_| {
Ok(Serdeable::Readarr(ReadarrSerdeable::Value(
json!({"testResponse": "response"}),
)))
});
let app_arc = Arc::new(Mutex::new(App::test_default()));
let edit_all_indexer_settings_command = ReadarrEditCommand::AllIndexerSettings {
maximum_size: Some(26500),
minimum_age: Some(17),
retention: Some(43),
rss_sync_interval: Some(35),
};
let result = ReadarrEditCommandHandler::with(
&app_arc,
edit_all_indexer_settings_command,
&mut mock_network,
)
.handle()
.await;
assert_ok!(&result);
}
#[tokio::test]
async fn test_handle_edit_all_indexer_settings_command_defaults_to_previous_values() {
let expected_edit_all_indexer_settings = IndexerSettings {
id: 1,
maximum_size: 26500,
minimum_age: 22,
retention: 58,
rss_sync_interval: 90,
};
let mut mock_network = MockNetworkTrait::new();
mock_network
.expect_handle_network_event()
.with(eq::<NetworkEvent>(
ReadarrEvent::GetAllIndexerSettings.into(),
))
.times(1)
.returning(|_| {
Ok(Serdeable::Readarr(ReadarrSerdeable::IndexerSettings(
IndexerSettings {
id: 9,
maximum_size: 31200,
minimum_age: 22,
retention: 58,
rss_sync_interval: 90,
},
)))
});
mock_network
.expect_handle_network_event()
.with(eq::<NetworkEvent>(
ReadarrEvent::EditAllIndexerSettings(expected_edit_all_indexer_settings).into(),
))
.times(1)
.returning(|_| {
Ok(Serdeable::Readarr(ReadarrSerdeable::Value(
json!({"testResponse": "response"}),
)))
});
let app_arc = Arc::new(Mutex::new(App::test_default()));
let edit_all_indexer_settings_command = ReadarrEditCommand::AllIndexerSettings {
maximum_size: Some(26500),
minimum_age: None,
retention: None,
rss_sync_interval: None,
};
let result = ReadarrEditCommandHandler::with(
&app_arc,
edit_all_indexer_settings_command,
&mut mock_network,
)
.handle()
.await;
assert_ok!(&result);
}
#[tokio::test]
async fn test_handle_edit_all_indexer_settings_command_does_not_edit_on_unexpected_response() {
let mut mock_network = MockNetworkTrait::new();
mock_network
.expect_handle_network_event()
.with(eq::<NetworkEvent>(
ReadarrEvent::GetAllIndexerSettings.into(),
))
.times(1)
.returning(|_| {
Ok(Serdeable::Readarr(ReadarrSerdeable::Value(
json!({"testResponse": "response"}),
)))
});
let app_arc = Arc::new(Mutex::new(App::test_default()));
let edit_all_indexer_settings_command = ReadarrEditCommand::AllIndexerSettings {
maximum_size: Some(26500),
minimum_age: Some(17),
retention: Some(43),
rss_sync_interval: Some(35),
};
let result = ReadarrEditCommandHandler::with(
&app_arc,
edit_all_indexer_settings_command,
&mut mock_network,
)
.handle()
.await;
assert_str_eq!(assert_ok!(result), String::new());
}
#[tokio::test] #[tokio::test]
async fn test_handle_edit_author_command() { async fn test_handle_edit_author_command() {
let expected_edit_author_params = EditAuthorParams { let expected_edit_author_params = EditAuthorParams {
@@ -36,6 +36,23 @@ impl Network<'_, '_> {
.await .await
} }
pub(in crate::network::readarr_network) async fn edit_all_readarr_indexer_settings(
&mut self,
params: IndexerSettings,
) -> Result<Value> {
info!("Updating Readarr indexer settings");
let event = ReadarrEvent::EditAllIndexerSettings(IndexerSettings::default());
debug!("Indexer settings body: {params:?}");
let request_props = self
.request_props_from(event, RequestMethod::Put, Some(params), None, None)
.await;
self
.handle_request::<IndexerSettings, Value>(request_props, |_, _| {})
.await
}
pub(in crate::network::readarr_network) async fn get_all_readarr_indexer_settings( pub(in crate::network::readarr_network) async fn get_all_readarr_indexer_settings(
&mut self, &mut self,
) -> Result<IndexerSettings> { ) -> Result<IndexerSettings> {
@@ -714,4 +714,40 @@ mod tests {
let app = app.lock().await; let app = app.lock().await;
assert_none!(&app.data.readarr_data.indexer_settings); assert_none!(&app.data.readarr_data.indexer_settings);
} }
#[tokio::test]
async fn test_handle_edit_all_readarr_indexer_settings_event() {
let (mock, app, _server) = MockServarrApi::put()
.with_request_body(serde_json::from_str(INDEXER_SETTINGS_JSON).unwrap())
.build_for(ReadarrEvent::EditAllIndexerSettings(indexer_settings()))
.await;
app.lock().await.server_tabs.set_index(3);
let mut network = test_network(&app);
let result = network
.handle_readarr_event(ReadarrEvent::EditAllIndexerSettings(indexer_settings()))
.await;
mock.assert_async().await;
assert_ok!(&result);
}
#[tokio::test]
async fn test_handle_edit_all_readarr_indexer_settings_event_failure() {
let (mock, app, _server) = MockServarrApi::put()
.with_request_body(serde_json::from_str(INDEXER_SETTINGS_JSON).unwrap())
.returns(json!({ "message": "Internal Server Error" }))
.status(500)
.build_for(ReadarrEvent::EditAllIndexerSettings(indexer_settings()))
.await;
app.lock().await.server_tabs.set_index(3);
let mut network = test_network(&app);
let result = network
.handle_readarr_event(ReadarrEvent::EditAllIndexerSettings(indexer_settings()))
.await;
mock.assert_async().await;
assert_err!(result);
}
} }
+9 -2
View File
@@ -8,7 +8,7 @@ use crate::models::readarr_models::{
ReadarrTaskName, ReadarrTaskName,
}; };
use crate::models::servarr_models::{ use crate::models::servarr_models::{
EditIndexerParams, MetadataProfile, QualityProfile, ReleaseDownloadBody, Tag, EditIndexerParams, IndexerSettings, MetadataProfile, QualityProfile, ReleaseDownloadBody, Tag,
}; };
use crate::network::{Network, RequestMethod}; use crate::network::{Network, RequestMethod};
@@ -43,6 +43,7 @@ pub enum ReadarrEvent {
DeleteRootFolder(i64), DeleteRootFolder(i64),
DeleteTag(i64), DeleteTag(i64),
DownloadRelease(ReleaseDownloadBody), DownloadRelease(ReleaseDownloadBody),
EditAllIndexerSettings(IndexerSettings),
EditAuthor(EditAuthorParams), EditAuthor(EditAuthorParams),
EditIndexer(EditIndexerParams), EditIndexer(EditIndexerParams),
GetAllIndexerSettings, GetAllIndexerSettings,
@@ -113,7 +114,9 @@ impl NetworkResource for ReadarrEvent {
| ReadarrEvent::UpdateAndScanAuthor(_) | ReadarrEvent::UpdateAndScanAuthor(_)
| ReadarrEvent::UpdateDownloads => "/command", | ReadarrEvent::UpdateDownloads => "/command",
ReadarrEvent::GetHostConfig | ReadarrEvent::GetSecurityConfig => "/config/host", ReadarrEvent::GetHostConfig | ReadarrEvent::GetSecurityConfig => "/config/host",
ReadarrEvent::GetAllIndexerSettings => "/config/indexer", ReadarrEvent::GetAllIndexerSettings | ReadarrEvent::EditAllIndexerSettings(_) => {
"/config/indexer"
}
ReadarrEvent::GetDiskSpace => "/diskspace", ReadarrEvent::GetDiskSpace => "/diskspace",
ReadarrEvent::GetBookEditions(_) => "/edition", ReadarrEvent::GetBookEditions(_) => "/edition",
ReadarrEvent::HealthCheck => "/health", ReadarrEvent::HealthCheck => "/health",
@@ -201,6 +204,10 @@ impl Network<'_, '_> {
.download_readarr_release(release_download_body) .download_readarr_release(release_download_body)
.await .await
.map(ReadarrSerdeable::from), .map(ReadarrSerdeable::from),
ReadarrEvent::EditAllIndexerSettings(params) => self
.edit_all_readarr_indexer_settings(params)
.await
.map(ReadarrSerdeable::from),
ReadarrEvent::EditAuthor(edit_author_params) => self ReadarrEvent::EditAuthor(edit_author_params) => self
.edit_author(edit_author_params) .edit_author(edit_author_params)
.await .await
@@ -5,7 +5,7 @@ mod tests {
AddAuthorBody, AddReadarrRootFolderBody, DeleteParams, EditAuthorParams, ReadarrSerdeable, AddAuthorBody, AddReadarrRootFolderBody, DeleteParams, EditAuthorParams, ReadarrSerdeable,
}; };
use crate::models::servarr_models::{ use crate::models::servarr_models::{
EditIndexerParams, MetadataProfile, QualityProfile, ReleaseDownloadBody, Tag, EditIndexerParams, IndexerSettings, MetadataProfile, QualityProfile, ReleaseDownloadBody, Tag,
}; };
use crate::network::network_tests::test_utils::{MockServarrApi, test_network}; use crate::network::network_tests::test_utils::{MockServarrApi, test_network};
use crate::network::{NetworkEvent, NetworkResource, readarr_network::ReadarrEvent}; use crate::network::{NetworkEvent, NetworkResource, readarr_network::ReadarrEvent};
@@ -43,6 +43,10 @@ mod tests {
#[case(ReadarrEvent::GetHostConfig, "/config/host")] #[case(ReadarrEvent::GetHostConfig, "/config/host")]
#[case(ReadarrEvent::GetSecurityConfig, "/config/host")] #[case(ReadarrEvent::GetSecurityConfig, "/config/host")]
#[case(ReadarrEvent::GetAllIndexerSettings, "/config/indexer")] #[case(ReadarrEvent::GetAllIndexerSettings, "/config/indexer")]
#[case(
ReadarrEvent::EditAllIndexerSettings(IndexerSettings::default()),
"/config/indexer"
)]
#[case(ReadarrEvent::GetDiskSpace, "/diskspace")] #[case(ReadarrEvent::GetDiskSpace, "/diskspace")]
#[case(ReadarrEvent::GetBookEditions(1), "/edition")] #[case(ReadarrEvent::GetBookEditions(1), "/edition")]
#[case(ReadarrEvent::HealthCheck, "/health")] #[case(ReadarrEvent::HealthCheck, "/health")]