feat(network): Support for fetching all Sonarr root folders

This commit is contained in:
2024-11-21 16:37:23 -07:00
parent f4c647342b
commit 16538a3158
18 changed files with 138 additions and 45 deletions
+1 -19
View File
@@ -11,7 +11,7 @@ use crate::{models::HorizontallyScrollableText, serde_enum_from};
use super::servarr_models::{
HostConfig, Indexer, Language, LogResponse, QualityProfile, QualityWrapper, QueueEvent, Release,
SecurityConfig,
RootFolder, SecurityConfig,
};
use super::{EnumDisplayStyle, Serdeable};
@@ -440,18 +440,6 @@ pub struct ReleaseDownloadBody {
pub movie_id: i64,
}
#[derive(Default, Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct RootFolder {
#[serde(deserialize_with = "super::from_i64")]
pub id: i64,
pub path: String,
pub accessible: bool,
#[serde(deserialize_with = "super::from_i64")]
pub free_space: i64,
pub unmapped_folders: Option<Vec<UnmappedFolder>>,
}
#[derive(Default, Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
#[serde(rename_all = "camelCase")]
pub struct SystemStatus {
@@ -504,12 +492,6 @@ impl Display for TaskName {
}
}
#[derive(Serialize, Deserialize, Default, Debug, Clone, Eq, PartialEq)]
pub struct UnmappedFolder {
pub name: String,
pub path: String,
}
#[derive(Default, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
#[serde(rename_all = "camelCase")]
pub struct Update {
+2 -2
View File
@@ -8,9 +8,9 @@ mod tests {
AddMovieSearchResult, BlocklistItem, BlocklistResponse, Collection, Credit, DiskSpace,
DownloadRecord, DownloadsResponse, Indexer, IndexerSettings, IndexerTestResult,
MinimumAvailability, Monitor, Movie, MovieHistoryItem, QualityProfile, RadarrSerdeable,
Release, RootFolder, SystemStatus, Tag, Task, TaskName, Update,
Release, SystemStatus, Tag, Task, TaskName, Update,
},
servarr_models::{HostConfig, Log, LogResponse, QueueEvent, SecurityConfig},
servarr_models::{HostConfig, Log, LogResponse, QueueEvent, RootFolder, SecurityConfig},
EnumDisplayStyle, Serdeable,
};
+2 -2
View File
@@ -1,10 +1,10 @@
use strum::IntoEnumIterator;
use crate::models::radarr_models::{
Collection, Credit, MinimumAvailability, Monitor, Movie, MovieHistoryItem, RootFolder,
Collection, Credit, MinimumAvailability, Monitor, Movie, MovieHistoryItem,
};
use crate::models::servarr_data::radarr::radarr_data::RadarrData;
use crate::models::servarr_models::{Indexer, Release};
use crate::models::servarr_models::{Indexer, Release, RootFolder};
use crate::models::stateful_list::StatefulList;
use crate::models::stateful_table::StatefulTable;
use crate::models::{HorizontallyScrollableText, ScrollableText};
@@ -1,12 +1,12 @@
#[cfg(test)]
mod test {
use crate::models::radarr_models::{Collection, MinimumAvailability, Monitor, Movie, RootFolder};
use crate::models::radarr_models::{Collection, MinimumAvailability, Monitor, Movie};
use crate::models::servarr_data::radarr::modals::{
AddMovieModal, EditCollectionModal, EditIndexerModal, EditMovieModal,
};
use crate::models::servarr_data::radarr::radarr_data::radarr_test_utils::utils::create_test_radarr_data;
use crate::models::servarr_data::radarr::radarr_data::RadarrData;
use crate::models::servarr_models::{Indexer, IndexerField};
use crate::models::servarr_models::{Indexer, IndexerField, RootFolder};
use crate::models::stateful_table::StatefulTable;
use bimap::BiMap;
use pretty_assertions::{assert_eq, assert_str_eq};
@@ -7,13 +7,13 @@ use crate::app::radarr::radarr_context_clues::{
};
use crate::models::radarr_models::{
AddMovieSearchResult, BlocklistItem, Collection, CollectionMovie, DiskSpace, DownloadRecord,
IndexerSettings, Movie, RootFolder, Task,
IndexerSettings, Movie, Task,
};
use crate::models::servarr_data::radarr::modals::{
AddMovieModal, EditCollectionModal, EditIndexerModal, EditMovieModal, IndexerTestResultModalItem,
MovieDetailsModal,
};
use crate::models::servarr_models::{Indexer, QueueEvent};
use crate::models::servarr_models::{Indexer, QueueEvent, RootFolder};
use crate::models::stateful_list::StatefulList;
use crate::models::stateful_table::StatefulTable;
use crate::models::{
@@ -3,7 +3,7 @@ use chrono::{DateTime, Utc};
use strum::EnumIter;
use crate::models::{
servarr_models::{Indexer, QueueEvent},
servarr_models::{Indexer, QueueEvent, RootFolder},
sonarr_models::{
BlocklistItem, DownloadRecord, IndexerSettings, Season, Series, SonarrHistoryItem,
},
@@ -27,6 +27,7 @@ pub struct SonarrData {
pub logs: StatefulList<HorizontallyScrollableText>,
pub quality_profile_map: BiMap<i64, String>,
pub queued_events: StatefulTable<QueueEvent>,
pub root_folders: StatefulTable<RootFolder>,
pub seasons: StatefulTable<Season>,
pub season_details_modal: Option<SeasonDetailsModal>,
pub series: StatefulTable<Series>,
@@ -46,6 +47,7 @@ impl Default for SonarrData {
logs: StatefulList::default(),
quality_profile_map: BiMap::new(),
queued_events: StatefulTable::default(),
root_folders: StatefulTable::default(),
seasons: StatefulTable::default(),
season_details_modal: None,
series: StatefulTable::default(),
@@ -42,6 +42,7 @@ mod tests {
assert!(sonarr_data.logs.is_empty());
assert!(sonarr_data.quality_profile_map.is_empty());
assert!(sonarr_data.queued_events.is_empty());
assert!(sonarr_data.root_folders.is_empty());
assert!(sonarr_data.seasons.is_empty());
assert!(sonarr_data.season_details_modal.is_none());
assert!(sonarr_data.series.is_empty());
+18
View File
@@ -197,6 +197,18 @@ pub struct Release {
pub quality: QualityWrapper,
}
#[derive(Default, Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct RootFolder {
#[serde(deserialize_with = "super::from_i64")]
pub id: i64,
pub path: String,
pub accessible: bool,
#[serde(deserialize_with = "super::from_i64")]
pub free_space: i64,
pub unmapped_folders: Option<Vec<UnmappedFolder>>,
}
#[derive(Default, Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
#[serde(rename_all = "camelCase")]
pub struct SecurityConfig {
@@ -210,3 +222,9 @@ pub struct SecurityConfig {
pub api_key: String,
pub certificate_validation: CertificateValidation,
}
#[derive(Serialize, Deserialize, Default, Debug, Clone, Eq, PartialEq)]
pub struct UnmappedFolder {
pub name: String,
pub path: String,
}
+3 -1
View File
@@ -12,7 +12,7 @@ use crate::serde_enum_from;
use super::{
servarr_models::{
HostConfig, Indexer, Language, LogResponse, QualityProfile, QualityWrapper, QueueEvent,
Release, SecurityConfig,
Release, RootFolder, SecurityConfig,
},
EnumDisplayStyle, HorizontallyScrollableText, Serdeable,
};
@@ -402,6 +402,7 @@ pub enum SonarrSerdeable {
QualityProfiles(Vec<QualityProfile>),
QueueEvents(Vec<QueueEvent>),
Releases(Vec<Release>),
RootFolders(Vec<RootFolder>),
SecurityConfig(SecurityConfig),
SeriesVec(Vec<Series>),
Series(Series),
@@ -436,6 +437,7 @@ serde_enum_from!(
QualityProfiles(Vec<QualityProfile>),
QueueEvents(Vec<QueueEvent>),
Releases(Vec<Release>),
RootFolders(Vec<RootFolder>),
SecurityConfig(SecurityConfig),
SeriesVec(Vec<Series>),
Series(Series),
+14 -1
View File
@@ -5,7 +5,8 @@ mod tests {
use crate::models::{
servarr_models::{
HostConfig, Indexer, Log, LogResponse, QualityProfile, QueueEvent, Release, SecurityConfig,
HostConfig, Indexer, Log, LogResponse, QualityProfile, QueueEvent, Release, RootFolder,
SecurityConfig,
},
sonarr_models::{
BlocklistItem, BlocklistResponse, DownloadRecord, DownloadsResponse, Episode,
@@ -343,6 +344,18 @@ mod tests {
assert_eq!(sonarr_serdeable, SonarrSerdeable::Releases(releases));
}
#[test]
fn test_sonarr_serdeable_from_root_folders() {
let root_folders = vec![RootFolder {
id: 1,
..RootFolder::default()
}];
let sonarr_serdeable: SonarrSerdeable = root_folders.clone().into();
assert_eq!(sonarr_serdeable, SonarrSerdeable::RootFolders(root_folders));
}
#[test]
fn test_sonarr_serdeable_from_security_config() {
let security_config = SecurityConfig {