feat(network): Added netwwork support for fetching all indexer settings for Sonarr
This commit is contained in:
@@ -10,6 +10,7 @@ mod tests {
|
|||||||
LogResponse, MinimumAvailability, Monitor, Movie, MovieHistoryItem, QualityProfile,
|
LogResponse, MinimumAvailability, Monitor, Movie, MovieHistoryItem, QualityProfile,
|
||||||
QueueEvent, RadarrSerdeable, Release, RootFolder, SystemStatus, Tag, Task, TaskName, Update,
|
QueueEvent, RadarrSerdeable, Release, RootFolder, SystemStatus, Tag, Task, TaskName, Update,
|
||||||
},
|
},
|
||||||
|
servarr_models::{HostConfig, SecurityConfig},
|
||||||
Serdeable,
|
Serdeable,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -178,6 +179,18 @@ mod tests {
|
|||||||
assert_eq!(radarr_serdeable, RadarrSerdeable::DiskSpaces(disk_spaces));
|
assert_eq!(radarr_serdeable, RadarrSerdeable::DiskSpaces(disk_spaces));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_radarr_serdeable_from_host_config() {
|
||||||
|
let host_config = HostConfig {
|
||||||
|
port: 1234,
|
||||||
|
..HostConfig::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
let radarr_serdeable: RadarrSerdeable = host_config.clone().into();
|
||||||
|
|
||||||
|
assert_eq!(radarr_serdeable, RadarrSerdeable::HostConfig(host_config));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_radarr_serdeable_from_downloads_response() {
|
fn test_radarr_serdeable_from_downloads_response() {
|
||||||
let downloads_response = DownloadsResponse {
|
let downloads_response = DownloadsResponse {
|
||||||
@@ -326,6 +339,21 @@ mod tests {
|
|||||||
assert_eq!(radarr_serdeable, RadarrSerdeable::RootFolders(root_folders));
|
assert_eq!(radarr_serdeable, RadarrSerdeable::RootFolders(root_folders));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_radarr_serdeable_from_security_config() {
|
||||||
|
let security_config = SecurityConfig {
|
||||||
|
username: Some("Test".to_owned()),
|
||||||
|
..SecurityConfig::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
let radarr_serdeable: RadarrSerdeable = security_config.clone().into();
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
radarr_serdeable,
|
||||||
|
RadarrSerdeable::SecurityConfig(security_config)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_radarr_serdeable_from_system_status() {
|
fn test_radarr_serdeable_from_system_status() {
|
||||||
let system_status = SystemStatus {
|
let system_status = SystemStatus {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ use strum::EnumIter;
|
|||||||
|
|
||||||
use crate::models::{
|
use crate::models::{
|
||||||
servarr_models::Indexer,
|
servarr_models::Indexer,
|
||||||
sonarr_models::{BlocklistItem, DownloadRecord, Episode, Series},
|
sonarr_models::{BlocklistItem, DownloadRecord, Episode, IndexerSettings, Series},
|
||||||
stateful_list::StatefulList,
|
stateful_list::StatefulList,
|
||||||
stateful_table::StatefulTable,
|
stateful_table::StatefulTable,
|
||||||
stateful_tree::StatefulTree,
|
stateful_tree::StatefulTree,
|
||||||
@@ -29,6 +29,7 @@ pub struct SonarrData {
|
|||||||
pub episode_details_modal: Option<EpisodeDetailsModal>,
|
pub episode_details_modal: Option<EpisodeDetailsModal>,
|
||||||
pub quality_profile_map: BiMap<i64, String>,
|
pub quality_profile_map: BiMap<i64, String>,
|
||||||
pub indexers: StatefulTable<Indexer>,
|
pub indexers: StatefulTable<Indexer>,
|
||||||
|
pub indexer_settings: Option<IndexerSettings>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for SonarrData {
|
impl Default for SonarrData {
|
||||||
@@ -45,6 +46,7 @@ impl Default for SonarrData {
|
|||||||
episode_details_modal: None,
|
episode_details_modal: None,
|
||||||
quality_profile_map: BiMap::new(),
|
quality_profile_map: BiMap::new(),
|
||||||
indexers: StatefulTable::default(),
|
indexers: StatefulTable::default(),
|
||||||
|
indexer_settings: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ mod tests {
|
|||||||
assert!(sonarr_data.episode_details_modal.is_none());
|
assert!(sonarr_data.episode_details_modal.is_none());
|
||||||
assert!(sonarr_data.quality_profile_map.is_empty());
|
assert!(sonarr_data.quality_profile_map.is_empty());
|
||||||
assert!(sonarr_data.indexers.is_empty());
|
assert!(sonarr_data.indexers.is_empty());
|
||||||
|
assert!(sonarr_data.indexer_settings.is_none());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -106,6 +106,21 @@ pub struct EpisodeFile {
|
|||||||
pub media_info: Option<MediaInfo>,
|
pub media_info: Option<MediaInfo>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Default, Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct IndexerSettings {
|
||||||
|
#[serde(deserialize_with = "super::from_i64")]
|
||||||
|
pub id: i64,
|
||||||
|
#[serde(deserialize_with = "super::from_i64")]
|
||||||
|
pub mimimum_age: i64,
|
||||||
|
#[serde(deserialize_with = "super::from_i64")]
|
||||||
|
pub retention: i64,
|
||||||
|
#[serde(deserialize_with = "super::from_i64")]
|
||||||
|
pub maximum_size: i64,
|
||||||
|
#[serde(deserialize_with = "super::from_i64")]
|
||||||
|
pub rss_sync_interval: i64,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Default, Debug, Hash, Clone, PartialEq, Eq, Ord, PartialOrd)]
|
#[derive(Serialize, Deserialize, Default, Debug, Hash, Clone, PartialEq, Eq, Ord, PartialOrd)]
|
||||||
pub struct Language {
|
pub struct Language {
|
||||||
pub name: String,
|
pub name: String,
|
||||||
@@ -334,6 +349,7 @@ pub enum SonarrSerdeable {
|
|||||||
Episode(Episode),
|
Episode(Episode),
|
||||||
Episodes(Vec<Episode>),
|
Episodes(Vec<Episode>),
|
||||||
HostConfig(HostConfig),
|
HostConfig(HostConfig),
|
||||||
|
IndexerSettings(IndexerSettings),
|
||||||
Indexers(Vec<Indexer>),
|
Indexers(Vec<Indexer>),
|
||||||
QualityProfiles(Vec<QualityProfile>),
|
QualityProfiles(Vec<QualityProfile>),
|
||||||
SecurityConfig(SecurityConfig),
|
SecurityConfig(SecurityConfig),
|
||||||
@@ -362,6 +378,7 @@ serde_enum_from!(
|
|||||||
Episode(Episode),
|
Episode(Episode),
|
||||||
Episodes(Vec<Episode>),
|
Episodes(Vec<Episode>),
|
||||||
HostConfig(HostConfig),
|
HostConfig(HostConfig),
|
||||||
|
IndexerSettings(IndexerSettings),
|
||||||
Indexers(Vec<Indexer>),
|
Indexers(Vec<Indexer>),
|
||||||
QualityProfiles(Vec<QualityProfile>),
|
QualityProfiles(Vec<QualityProfile>),
|
||||||
SecurityConfig(SecurityConfig),
|
SecurityConfig(SecurityConfig),
|
||||||
|
|||||||
@@ -4,9 +4,11 @@ mod tests {
|
|||||||
use serde_json::json;
|
use serde_json::json;
|
||||||
|
|
||||||
use crate::models::{
|
use crate::models::{
|
||||||
|
servarr_models::{HostConfig, Indexer, SecurityConfig},
|
||||||
sonarr_models::{
|
sonarr_models::{
|
||||||
BlocklistItem, BlocklistResponse, DownloadRecord, DownloadsResponse, Episode, Log,
|
BlocklistItem, BlocklistResponse, DownloadRecord, DownloadsResponse, Episode,
|
||||||
LogResponse, QualityProfile, Series, SeriesStatus, SeriesType, SonarrSerdeable, SystemStatus,
|
IndexerSettings, Log, LogResponse, QualityProfile, Series, SeriesStatus, SeriesType,
|
||||||
|
SonarrSerdeable, SystemStatus,
|
||||||
},
|
},
|
||||||
Serdeable,
|
Serdeable,
|
||||||
};
|
};
|
||||||
@@ -101,6 +103,45 @@ mod tests {
|
|||||||
assert_eq!(sonarr_serdeable, SonarrSerdeable::Episodes(episodes));
|
assert_eq!(sonarr_serdeable, SonarrSerdeable::Episodes(episodes));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_sonarr_serdeable_from_host_config() {
|
||||||
|
let host_config = HostConfig {
|
||||||
|
port: 1234,
|
||||||
|
..HostConfig::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
let sonarr_serdeable: SonarrSerdeable = host_config.clone().into();
|
||||||
|
|
||||||
|
assert_eq!(sonarr_serdeable, SonarrSerdeable::HostConfig(host_config));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_sonarr_serdeable_from_indexers() {
|
||||||
|
let indexers = vec![Indexer {
|
||||||
|
id: 1,
|
||||||
|
..Indexer::default()
|
||||||
|
}];
|
||||||
|
|
||||||
|
let sonarr_serdeable: SonarrSerdeable = indexers.clone().into();
|
||||||
|
|
||||||
|
assert_eq!(sonarr_serdeable, SonarrSerdeable::Indexers(indexers));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_sonarr_serdeable_from_indexer_settings() {
|
||||||
|
let indexer_settings = IndexerSettings {
|
||||||
|
id: 1,
|
||||||
|
..IndexerSettings::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
let sonarr_serdeable: SonarrSerdeable = indexer_settings.clone().into();
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
sonarr_serdeable,
|
||||||
|
SonarrSerdeable::IndexerSettings(indexer_settings)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_sonarr_serdeable_from_series() {
|
fn test_sonarr_serdeable_from_series() {
|
||||||
let series = vec![Series {
|
let series = vec![Series {
|
||||||
@@ -189,4 +230,19 @@ mod tests {
|
|||||||
SonarrSerdeable::QualityProfiles(quality_profiles)
|
SonarrSerdeable::QualityProfiles(quality_profiles)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_sonarr_serdeable_from_security_config() {
|
||||||
|
let security_config = SecurityConfig {
|
||||||
|
username: Some("Test".to_owned()),
|
||||||
|
..SecurityConfig::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
let sonarr_serdeable: SonarrSerdeable = security_config.clone().into();
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
sonarr_serdeable,
|
||||||
|
SonarrSerdeable::SecurityConfig(security_config)
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -187,7 +187,7 @@ impl<'a, 'b> Network<'a, 'b> {
|
|||||||
}
|
}
|
||||||
RadarrEvent::EditMovie(params) => self.edit_movie(params).await.map(RadarrSerdeable::from),
|
RadarrEvent::EditMovie(params) => self.edit_movie(params).await.map(RadarrSerdeable::from),
|
||||||
RadarrEvent::GetAllIndexerSettings => self
|
RadarrEvent::GetAllIndexerSettings => self
|
||||||
.get_all_indexer_settings()
|
.get_all_radarr_indexer_settings()
|
||||||
.await
|
.await
|
||||||
.map(RadarrSerdeable::from),
|
.map(RadarrSerdeable::from),
|
||||||
RadarrEvent::GetBlocklist => self.get_radarr_blocklist().await.map(RadarrSerdeable::from),
|
RadarrEvent::GetBlocklist => self.get_radarr_blocklist().await.map(RadarrSerdeable::from),
|
||||||
@@ -1417,7 +1417,7 @@ impl<'a, 'b> Network<'a, 'b> {
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn get_all_indexer_settings(&mut self) -> Result<IndexerSettings> {
|
async fn get_all_radarr_indexer_settings(&mut self) -> Result<IndexerSettings> {
|
||||||
info!("Fetching Radarr indexer settings");
|
info!("Fetching Radarr indexer settings");
|
||||||
let event = RadarrEvent::GetAllIndexerSettings;
|
let event = RadarrEvent::GetAllIndexerSettings;
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ use std::collections::BTreeMap;
|
|||||||
|
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
use indoc::formatdoc;
|
use indoc::formatdoc;
|
||||||
use log::info;
|
use log::{debug, info};
|
||||||
use managarr_tree_widget::TreeItem;
|
use managarr_tree_widget::TreeItem;
|
||||||
use serde_json::{json, Value};
|
use serde_json::{json, Value};
|
||||||
|
|
||||||
@@ -11,8 +11,8 @@ use crate::{
|
|||||||
servarr_data::sonarr::{modals::EpisodeDetailsModal, sonarr_data::ActiveSonarrBlock},
|
servarr_data::sonarr::{modals::EpisodeDetailsModal, sonarr_data::ActiveSonarrBlock},
|
||||||
servarr_models::{HostConfig, Indexer, SecurityConfig},
|
servarr_models::{HostConfig, Indexer, SecurityConfig},
|
||||||
sonarr_models::{
|
sonarr_models::{
|
||||||
BlocklistResponse, DownloadRecord, DownloadsResponse, Episode, LogResponse, QualityProfile,
|
BlocklistResponse, DownloadRecord, DownloadsResponse, Episode, IndexerSettings, LogResponse,
|
||||||
Series, SonarrSerdeable, SystemStatus,
|
QualityProfile, Series, SonarrSerdeable, SystemStatus,
|
||||||
},
|
},
|
||||||
HorizontallyScrollableText, Route, Scrollable, ScrollableText,
|
HorizontallyScrollableText, Route, Scrollable, ScrollableText,
|
||||||
},
|
},
|
||||||
@@ -29,6 +29,7 @@ mod sonarr_network_tests;
|
|||||||
pub enum SonarrEvent {
|
pub enum SonarrEvent {
|
||||||
ClearBlocklist,
|
ClearBlocklist,
|
||||||
DeleteBlocklistItem(Option<i64>),
|
DeleteBlocklistItem(Option<i64>),
|
||||||
|
GetAllIndexerSettings,
|
||||||
GetBlocklist,
|
GetBlocklist,
|
||||||
GetDownloads,
|
GetDownloads,
|
||||||
GetHostConfig,
|
GetHostConfig,
|
||||||
@@ -48,6 +49,7 @@ impl NetworkResource for SonarrEvent {
|
|||||||
match &self {
|
match &self {
|
||||||
SonarrEvent::ClearBlocklist => "/blocklist/bulk",
|
SonarrEvent::ClearBlocklist => "/blocklist/bulk",
|
||||||
SonarrEvent::DeleteBlocklistItem(_) => "/blocklist",
|
SonarrEvent::DeleteBlocklistItem(_) => "/blocklist",
|
||||||
|
SonarrEvent::GetAllIndexerSettings => "/config/indexer",
|
||||||
SonarrEvent::GetBlocklist => "/blocklist?page=1&pageSize=10000",
|
SonarrEvent::GetBlocklist => "/blocklist?page=1&pageSize=10000",
|
||||||
SonarrEvent::GetDownloads => "/queue",
|
SonarrEvent::GetDownloads => "/queue",
|
||||||
SonarrEvent::GetEpisodes(_) | SonarrEvent::GetEpisodeDetails(_) => "/episode",
|
SonarrEvent::GetEpisodes(_) | SonarrEvent::GetEpisodeDetails(_) => "/episode",
|
||||||
@@ -78,6 +80,10 @@ impl<'a, 'b> Network<'a, 'b> {
|
|||||||
.clear_sonarr_blocklist()
|
.clear_sonarr_blocklist()
|
||||||
.await
|
.await
|
||||||
.map(SonarrSerdeable::from),
|
.map(SonarrSerdeable::from),
|
||||||
|
SonarrEvent::GetAllIndexerSettings => self
|
||||||
|
.get_all_sonarr_indexer_settings()
|
||||||
|
.await
|
||||||
|
.map(SonarrSerdeable::from),
|
||||||
SonarrEvent::DeleteBlocklistItem(blocklist_item_id) => self
|
SonarrEvent::DeleteBlocklistItem(blocklist_item_id) => self
|
||||||
.delete_sonarr_blocklist_item(blocklist_item_id)
|
.delete_sonarr_blocklist_item(blocklist_item_id)
|
||||||
.await
|
.await
|
||||||
@@ -182,6 +188,25 @@ impl<'a, 'b> Network<'a, 'b> {
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn get_all_sonarr_indexer_settings(&mut self) -> Result<IndexerSettings> {
|
||||||
|
info!("Fetching Sonarr indexer settings");
|
||||||
|
let event = SonarrEvent::GetAllIndexerSettings;
|
||||||
|
|
||||||
|
let request_props = self
|
||||||
|
.request_props_from(event, RequestMethod::Get, None::<()>, None, None)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
self
|
||||||
|
.handle_request::<(), IndexerSettings>(request_props, |indexer_settings, mut app| {
|
||||||
|
if app.data.sonarr_data.indexer_settings.is_none() {
|
||||||
|
app.data.sonarr_data.indexer_settings = Some(indexer_settings);
|
||||||
|
} else {
|
||||||
|
debug!("Indexer Settings are being modified. Ignoring update...");
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
async fn get_sonarr_healthcheck(&mut self) -> Result<()> {
|
async fn get_sonarr_healthcheck(&mut self) -> Result<()> {
|
||||||
info!("Performing Sonarr health check");
|
info!("Performing Sonarr health check");
|
||||||
let event = SonarrEvent::HealthCheck;
|
let event = SonarrEvent::HealthCheck;
|
||||||
|
|||||||
Reference in New Issue
Block a user