Refactored things a bit and added help text support

src/network/radarr_network.rs

@@ -1,16 +1,16 @@
 use anyhow::anyhow;
-use chrono::{DateTime, Utc};
-use derivative::Derivative;
 use indoc::formatdoc;
 use log::{debug, error};
 use reqwest::RequestBuilder;
 use serde::de::DeserializeOwned;
-use serde::Deserialize;
-use serde_json::Number;
 use tokio::sync::MutexGuard;
 
-use crate::app::models::{HorizontallyScrollableText, ScrollableText};
 use crate::app::{App, RadarrConfig};
+use crate::models::radarr_models::{
+  Collection, Credit, CreditType, DiskSpace, DownloadsResponse, Movie, MovieHistoryItem,
+  QualityProfile, SystemStatus,
+};
+use crate::models::ScrollableText;
 use crate::network::utils::get_movie_status;
 use crate::network::{utils, Network, NetworkEvent};
 use crate::utils::{convert_runtime, convert_to_gb};
@@ -51,201 +51,6 @@ impl From<RadarrEvent> for NetworkEvent {
   }
 }
 
-#[derive(Deserialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct DiskSpace {
-  pub free_space: Number,
-  pub total_space: Number,
-}
-
-#[derive(Deserialize, Debug)]
-#[serde(rename_all = "camelCase")]
-struct SystemStatus {
-  version: String,
-  start_time: DateTime<Utc>,
-}
-
-#[derive(Derivative, Deserialize, Debug, Clone)]
-#[derivative(Default)]
-#[serde(rename_all = "camelCase")]
-pub struct Movie {
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub id: Number,
-  pub title: String,
-  pub original_language: Language,
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub size_on_disk: Number,
-  pub status: String,
-  pub overview: String,
-  pub path: String,
-  pub studio: String,
-  pub genres: Vec<String>,
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub year: Number,
-  pub monitored: bool,
-  pub has_file: bool,
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub runtime: Number,
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub quality_profile_id: Number,
-  pub certification: Option<String>,
-  pub ratings: RatingsList,
-  pub movie_file: Option<MovieFile>,
-  pub collection: Option<Collection>,
-}
-
-#[derive(Derivative, Deserialize, Debug, Clone)]
-#[derivative(Default)]
-#[serde(rename_all = "camelCase")]
-pub struct CollectionMovie {
-  pub title: String,
-  pub overview: String,
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub year: Number,
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub runtime: Number,
-  pub genres: Vec<String>,
-  pub ratings: RatingsList,
-}
-
-#[derive(Deserialize, Derivative, Clone, Debug)]
-#[derivative(Default)]
-#[serde(rename_all = "camelCase")]
-pub struct Collection {
-  pub title: String,
-  pub root_folder_path: Option<String>,
-  pub search_on_add: bool,
-  pub overview: Option<String>,
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub quality_profile_id: Number,
-  pub movies: Option<Vec<CollectionMovie>>,
-}
-
-#[derive(Deserialize, Derivative, Debug, Clone)]
-#[derivative(Default)]
-#[serde(rename_all = "camelCase")]
-pub struct MovieFile {
-  pub relative_path: String,
-  pub path: String,
-  pub date_added: DateTime<Utc>,
-  pub media_info: MediaInfo,
-}
-
-#[derive(Deserialize, Derivative, Debug, Clone)]
-#[derivative(Default)]
-#[serde(rename_all = "camelCase")]
-pub struct MediaInfo {
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub audio_bitrate: Number,
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub audio_channels: Number,
-  pub audio_codec: Option<String>,
-  pub audio_languages: Option<String>,
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub audio_stream_count: Number,
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub video_bit_depth: Number,
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub video_bitrate: Number,
-  pub video_codec: String,
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub video_fps: Number,
-  pub resolution: String,
-  pub run_time: String,
-  pub scan_type: String,
-}
-
-#[derive(Default, Deserialize, Debug, Clone)]
-#[serde(rename_all = "camelCase")]
-pub struct RatingsList {
-  pub imdb: Option<Rating>,
-  pub tmdb: Option<Rating>,
-  pub rotten_tomatoes: Option<Rating>,
-}
-
-#[derive(Derivative, Deserialize, Debug, Clone)]
-#[derivative(Default)]
-pub struct Rating {
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub value: Number,
-}
-
-#[derive(Derivative, Deserialize, Debug)]
-#[derivative(Default)]
-#[serde(rename_all = "camelCase")]
-pub struct DownloadsResponse {
-  pub records: Vec<DownloadRecord>,
-}
-
-#[derive(Derivative, Deserialize, Debug, Clone, PartialEq, Eq)]
-#[derivative(Default)]
-#[serde(rename_all = "camelCase")]
-pub struct DownloadRecord {
-  pub title: String,
-  pub status: String,
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub movie_id: Number,
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub size: Number,
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub sizeleft: Number,
-  pub output_path: HorizontallyScrollableText,
-  pub indexer: String,
-  pub download_client: String,
-}
-
-#[derive(Derivative, Deserialize, Debug)]
-#[derivative(Default)]
-#[serde(rename_all = "camelCase")]
-struct QualityProfile {
-  #[derivative(Default(value = "Number::from(0)"))]
-  pub id: Number,
-  pub name: String,
-}
-
-#[derive(Deserialize, Default, Debug, Clone, PartialEq, Eq)]
-#[serde(rename_all = "camelCase")]
-pub struct MovieHistoryItem {
-  pub source_title: HorizontallyScrollableText,
-  pub quality: QualityHistory,
-  pub languages: Vec<Language>,
-  pub date: DateTime<Utc>,
-  pub event_type: String,
-}
-
-#[derive(Deserialize, Default, Debug, Clone, PartialEq, Eq)]
-pub struct Language {
-  pub name: String,
-}
-
-#[derive(Deserialize, Default, Debug, Clone, PartialEq, Eq)]
-pub struct QualityHistory {
-  pub quality: Quality,
-}
-
-#[derive(Deserialize, Default, Debug, Clone, PartialEq, Eq)]
-pub struct Quality {
-  pub name: String,
-}
-
-#[derive(Deserialize, PartialEq, Eq, Clone, Debug)]
-#[serde(rename_all = "lowercase")]
-pub enum CreditType {
-  Cast,
-  Crew,
-}
-
-#[derive(Deserialize, Clone, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct Credit {
-  pub person_name: String,
-  pub character: Option<String>,
-  pub department: Option<String>,
-  pub job: Option<String>,
-  #[serde(rename(deserialize = "type"))]
-  pub credit_type: CreditType,
-}
-
 impl<'a> Network<'a> {
   pub async fn handle_radarr_event(&self, radarr_event: RadarrEvent) {
     match radarr_event {

src/network/utils.rs

@@ -2,7 +2,7 @@ use reqwest::Response;
 use serde::de::DeserializeOwned;
 use serde_json::Number;
 
-use crate::network::radarr_network::DownloadRecord;
+use crate::models::radarr_models::DownloadRecord;
 
 pub async fn parse_response<T: DeserializeOwned>(response: Response) -> Result<T, reqwest::Error> {
   response.json::<T>().await