refactor: move shared servarr types into servarr_models
SystemStatus was declared three times, byte for byte identically, in radarr_models, sonarr_models, and lidarr_models. MetadataProfile and the Lidarr release download body were each declared in a single servarr module despite having nothing servarr specific about them: MetadataProfile is an id and name pair structurally identical to QualityProfile, which already lives in servarr_models, and a download body of a guid plus an indexer id is the generic form of that request. Move all three into servarr_models, preserving that file's alphabetical ordering, and drop the prefix from LidarrReleaseDownloadBody now that it is no longer owned by one servarr. RadarrReleaseDownloadBody and SonarrReleaseDownloadBody deliberately stay where they are. Radarr's carries a movie id and Sonarr's carries optional series, episode, and season fields, so the three types are not interchangeable and only the Lidarr shape is the common one. Behavior is unchanged. Every remaining edit is an import path update or the rename at a call site.
This commit is contained in:
24 files changed
+101
-107
No files matched your search
@@ -1,7 +1,7 @@
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::models::lidarr_models::LidarrReleaseDownloadBody;
|
||||
use crate::models::servarr_data::Notification;
|
||||
use crate::models::servarr_models::ReleaseDownloadBody;
|
||||
use crate::network::lidarr_network::LidarrEvent;
|
||||
use crate::network::network_tests::test_utils::{MockServarrApi, test_network};
|
||||
use pretty_assertions::assert_eq;
|
||||
@@ -9,7 +9,7 @@ mod tests {
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_handle_download_lidarr_release_event_uses_provided_params() {
|
||||
let params = LidarrReleaseDownloadBody {
|
||||
let params = ReleaseDownloadBody {
|
||||
guid: "1234".to_owned(),
|
||||
indexer_id: 2,
|
||||
};
|
||||
@@ -44,7 +44,7 @@ mod tests {
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_handle_download_lidarr_release_event_sets_failure_notification_on_error() {
|
||||
let params = LidarrReleaseDownloadBody {
|
||||
let params = ReleaseDownloadBody {
|
||||
guid: "1234".to_owned(),
|
||||
indexer_id: 2,
|
||||
};
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use crate::models::lidarr_models::LidarrReleaseDownloadBody;
|
||||
use crate::models::servarr_data::Notification;
|
||||
use crate::models::servarr_models::ReleaseDownloadBody;
|
||||
use crate::network::lidarr_network::LidarrEvent;
|
||||
use crate::network::{Network, RequestMethod};
|
||||
use anyhow::Result;
|
||||
@@ -17,9 +17,9 @@ mod lidarr_library_network_tests;
|
||||
impl Network<'_, '_> {
|
||||
pub(in crate::network::lidarr_network) async fn download_lidarr_release(
|
||||
&mut self,
|
||||
lidarr_release_download_body: LidarrReleaseDownloadBody,
|
||||
lidarr_release_download_body: ReleaseDownloadBody,
|
||||
) -> Result<Value> {
|
||||
let event = LidarrEvent::DownloadRelease(LidarrReleaseDownloadBody::default());
|
||||
let event = LidarrEvent::DownloadRelease(ReleaseDownloadBody::default());
|
||||
info!("Downloading Lidarr release with params: {lidarr_release_download_body:?}");
|
||||
|
||||
let request_props = self
|
||||
@@ -33,7 +33,7 @@ impl Network<'_, '_> {
|
||||
.await;
|
||||
|
||||
let result = self
|
||||
.handle_request::<LidarrReleaseDownloadBody, Value>(request_props, |_, mut app| {
|
||||
.handle_request::<ReleaseDownloadBody, Value>(request_props, |_, mut app| {
|
||||
app.notification = Some(Notification::new(
|
||||
"Download Result".to_owned(),
|
||||
"Download request sent successfully".to_owned(),
|
||||
|
||||
@@ -6,11 +6,12 @@ pub mod test_utils {
|
||||
AudioTags, BlocklistItem, BlocklistResponse, DownloadRecord, DownloadStatus, DownloadsResponse,
|
||||
EditArtistParams, LidarrHistoryData, LidarrHistoryEventType, LidarrHistoryItem,
|
||||
LidarrHistoryWrapper, LidarrRelease, LidarrTask, LidarrTaskName, MediaInfo, Member,
|
||||
MetadataProfile, NewItemMonitorType, Ratings, SystemStatus, Track, TrackFile,
|
||||
NewItemMonitorType, Ratings, Track, TrackFile,
|
||||
};
|
||||
use crate::models::servarr_models::IndexerSettings;
|
||||
use crate::models::servarr_models::{
|
||||
Indexer, IndexerField, Quality, QualityProfile, QualityWrapper, RootFolder, Tag,
|
||||
Indexer, IndexerField, MetadataProfile, Quality, QualityProfile, QualityWrapper, RootFolder,
|
||||
SystemStatus, Tag,
|
||||
};
|
||||
use crate::models::{HorizontallyScrollableText, ScrollableText};
|
||||
use bimap::BiMap;
|
||||
|
||||
@@ -2,10 +2,12 @@
|
||||
mod tests {
|
||||
use crate::app::App;
|
||||
use crate::models::lidarr_models::{
|
||||
AddArtistBody, DeleteParams, EditArtistParams, LidarrSerdeable, MetadataProfile,
|
||||
AddArtistBody, DeleteParams, EditArtistParams, LidarrSerdeable,
|
||||
};
|
||||
use crate::models::servarr_data::lidarr::modals::EditArtistModal;
|
||||
use crate::models::servarr_models::{EditIndexerParams, IndexerSettings, QualityProfile, Tag};
|
||||
use crate::models::servarr_models::{
|
||||
EditIndexerParams, IndexerSettings, MetadataProfile, QualityProfile, Tag,
|
||||
};
|
||||
use crate::network::network_tests::test_utils::{MockServarrApi, test_network};
|
||||
use crate::network::{NetworkEvent, NetworkResource, lidarr_network::LidarrEvent};
|
||||
use bimap::BiMap;
|
||||
|
||||
@@ -3,10 +3,12 @@ use log::info;
|
||||
|
||||
use super::{NetworkEvent, NetworkResource};
|
||||
use crate::models::lidarr_models::{
|
||||
AddArtistBody, AddLidarrRootFolderBody, DeleteParams, EditArtistParams,
|
||||
LidarrReleaseDownloadBody, LidarrSerdeable, LidarrTaskName, MetadataProfile,
|
||||
AddArtistBody, AddLidarrRootFolderBody, DeleteParams, EditArtistParams, LidarrSerdeable,
|
||||
LidarrTaskName,
|
||||
};
|
||||
use crate::models::servarr_models::{
|
||||
EditIndexerParams, IndexerSettings, MetadataProfile, QualityProfile, ReleaseDownloadBody, Tag,
|
||||
};
|
||||
use crate::models::servarr_models::{EditIndexerParams, IndexerSettings, QualityProfile, Tag};
|
||||
use crate::network::{Network, RequestMethod};
|
||||
|
||||
mod blocklist;
|
||||
@@ -39,7 +41,7 @@ pub enum LidarrEvent {
|
||||
DeleteRootFolder(i64),
|
||||
DeleteTag(i64),
|
||||
DeleteTrackFile(i64),
|
||||
DownloadRelease(LidarrReleaseDownloadBody),
|
||||
DownloadRelease(ReleaseDownloadBody),
|
||||
EditArtist(EditArtistParams),
|
||||
EditAllIndexerSettings(IndexerSettings),
|
||||
EditIndexer(EditIndexerParams),
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::models::HorizontallyScrollableText;
|
||||
use crate::models::lidarr_models::{LidarrSerdeable, LidarrTask, LidarrTaskName, SystemStatus};
|
||||
use crate::models::lidarr_models::{LidarrSerdeable, LidarrTask, LidarrTaskName};
|
||||
use crate::models::servarr_models::{
|
||||
DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, Update,
|
||||
DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, SystemStatus, Update,
|
||||
};
|
||||
use crate::network::lidarr_network::LidarrEvent;
|
||||
use crate::network::lidarr_network::lidarr_network_test_utils::test_utils::updates;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use crate::models::lidarr_models::{LidarrTask, LidarrTaskName, SystemStatus};
|
||||
use crate::models::lidarr_models::{LidarrTask, LidarrTaskName};
|
||||
use crate::models::servarr_models::{
|
||||
CommandBody, DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, Update,
|
||||
CommandBody, DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, SystemStatus, Update,
|
||||
};
|
||||
use crate::models::{HorizontallyScrollableText, Scrollable, ScrollableText};
|
||||
use crate::network::lidarr_network::LidarrEvent;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use crate::models::radarr_models::{RadarrTask, RadarrTaskName, SystemStatus};
|
||||
use crate::models::radarr_models::{RadarrTask, RadarrTaskName};
|
||||
use crate::models::servarr_models::{
|
||||
CommandBody, DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, Update,
|
||||
CommandBody, DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, SystemStatus, Update,
|
||||
};
|
||||
use crate::models::{HorizontallyScrollableText, Scrollable, ScrollableText};
|
||||
use crate::network::radarr_network::RadarrEvent;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::models::HorizontallyScrollableText;
|
||||
use crate::models::radarr_models::{RadarrSerdeable, RadarrTask, RadarrTaskName, SystemStatus};
|
||||
use crate::models::radarr_models::{RadarrSerdeable, RadarrTask, RadarrTaskName};
|
||||
use crate::models::servarr_models::{
|
||||
DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, Update,
|
||||
DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, SystemStatus, Update,
|
||||
};
|
||||
use crate::network::network_tests::test_utils::{MockServarrApi, test_network};
|
||||
use crate::network::radarr_network::RadarrEvent;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use crate::models::servarr_models::{
|
||||
CommandBody, DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, Update,
|
||||
CommandBody, DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, SystemStatus, Update,
|
||||
};
|
||||
use crate::models::sonarr_models::{SonarrTask, SonarrTaskName, SystemStatus};
|
||||
use crate::models::sonarr_models::{SonarrTask, SonarrTaskName};
|
||||
use crate::models::{HorizontallyScrollableText, Scrollable, ScrollableText};
|
||||
use crate::network::sonarr_network::SonarrEvent;
|
||||
use crate::network::{Network, RequestMethod};
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
mod tests {
|
||||
use crate::models::HorizontallyScrollableText;
|
||||
use crate::models::servarr_models::{
|
||||
DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, Update,
|
||||
DiskSpace, HostConfig, LogResponse, QueueEvent, SecurityConfig, SystemStatus, Update,
|
||||
};
|
||||
use crate::models::sonarr_models::{SonarrSerdeable, SonarrTask, SonarrTaskName, SystemStatus};
|
||||
use crate::models::sonarr_models::{SonarrSerdeable, SonarrTask, SonarrTaskName};
|
||||
use crate::network::network_tests::test_utils::{MockServarrApi, test_network};
|
||||
use crate::network::sonarr_network::SonarrEvent;
|
||||
use crate::network::sonarr_network::sonarr_network_test_utils::test_utils::updates;
|
||||
|
||||
Reference in new issue
Block a user