feat(network): Added support for fetching Sonarr queued events

src/models/radarr_models.rs

@@ -9,7 +9,7 @@ use strum_macros::EnumIter;
 
 use crate::{models::HorizontallyScrollableText, serde_enum_from};
 
-use super::servarr_models::{HostConfig, Indexer, SecurityConfig};
+use super::servarr_models::{HostConfig, Indexer, QueueEvent, SecurityConfig};
 use super::Serdeable;
 
 #[cfg(test)]
@@ -462,19 +462,6 @@ pub struct QualityWrapper {
   pub quality: Quality,
 }
 
-#[derive(Default, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
-#[serde(rename_all = "camelCase")]
-pub struct QueueEvent {
-  pub trigger: String,
-  pub name: String,
-  pub command_name: String,
-  pub status: String,
-  pub queued: DateTime<Utc>,
-  pub started: Option<DateTime<Utc>>,
-  pub ended: Option<DateTime<Utc>>,
-  pub duration: Option<String>,
-}
-
 #[derive(Derivative, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 #[derivative(Default)]
 pub struct Rating {

src/models/radarr_models_tests.rs

@@ -8,9 +8,9 @@ mod tests {
       AddMovieSearchResult, BlocklistItem, BlocklistResponse, Collection, Credit, DiskSpace,
       DownloadRecord, DownloadsResponse, Indexer, IndexerSettings, IndexerTestResult, Log,
       LogResponse, MinimumAvailability, Monitor, Movie, MovieHistoryItem, QualityProfile,
-      QueueEvent, RadarrSerdeable, Release, RootFolder, SystemStatus, Tag, Task, TaskName, Update,
+      RadarrSerdeable, Release, RootFolder, SystemStatus, Tag, Task, TaskName, Update,
     },
-    servarr_models::{HostConfig, SecurityConfig},
+    servarr_models::{HostConfig, QueueEvent, SecurityConfig},
     Serdeable,
   };
 

src/models/servarr_data/radarr/radarr_data.rs

@@ -7,13 +7,13 @@ use crate::app::radarr::radarr_context_clues::{
 };
 use crate::models::radarr_models::{
   AddMovieSearchResult, BlocklistItem, Collection, CollectionMovie, DiskSpace, DownloadRecord,
-  IndexerSettings, Movie, QueueEvent, RootFolder, Task,
+  IndexerSettings, Movie, RootFolder, Task,
 };
 use crate::models::servarr_data::radarr::modals::{
   AddMovieModal, EditCollectionModal, EditIndexerModal, EditMovieModal, IndexerTestResultModalItem,
   MovieDetailsModal,
 };
-use crate::models::servarr_models::Indexer;
+use crate::models::servarr_models::{Indexer, QueueEvent};
 use crate::models::stateful_list::StatefulList;
 use crate::models::stateful_table::StatefulTable;
 use crate::models::{

src/models/servarr_data/sonarr/sonarr_data.rs

@@ -3,7 +3,7 @@ use chrono::{DateTime, Utc};
 use strum::EnumIter;
 
 use crate::models::{
-  servarr_models::Indexer,
+  servarr_models::{Indexer, QueueEvent},
   sonarr_models::{BlocklistItem, DownloadRecord, Episode, IndexerSettings, Series},
   stateful_list::StatefulList,
   stateful_table::StatefulTable,
@@ -18,35 +18,37 @@ use super::modals::EpisodeDetailsModal;
 mod sonarr_data_tests;
 
 pub struct SonarrData {
-  pub version: String,
-  pub start_time: DateTime<Utc>,
-  pub series: StatefulTable<Series>,
   pub blocklist: StatefulTable<BlocklistItem>,
-  pub logs: StatefulList<HorizontallyScrollableText>,
-  pub episodes_tree: StatefulTree<Episode>,
-  pub episodes_table: StatefulTable<Episode>,
   pub downloads: StatefulTable<DownloadRecord>,
   pub episode_details_modal: Option<EpisodeDetailsModal>,
-  pub quality_profile_map: BiMap<i64, String>,
+  pub episodes_table: StatefulTable<Episode>,
+  pub episodes_tree: StatefulTree<Episode>,
   pub indexers: StatefulTable<Indexer>,
   pub indexer_settings: Option<IndexerSettings>,
+  pub logs: StatefulList<HorizontallyScrollableText>,
+  pub quality_profile_map: BiMap<i64, String>,
+  pub queued_events: StatefulTable<QueueEvent>,
+  pub series: StatefulTable<Series>,
+  pub start_time: DateTime<Utc>,
+  pub version: String,
 }
 
 impl Default for SonarrData {
   fn default() -> SonarrData {
     SonarrData {
-      version: String::new(),
-      start_time: DateTime::default(),
-      series: StatefulTable::default(),
       blocklist: StatefulTable::default(),
-      logs: StatefulList::default(),
-      episodes_tree: StatefulTree::default(),
-      episodes_table: StatefulTable::default(),
       downloads: StatefulTable::default(),
       episode_details_modal: None,
-      quality_profile_map: BiMap::new(),
+      episodes_table: StatefulTable::default(),
+      episodes_tree: StatefulTree::default(),
       indexers: StatefulTable::default(),
       indexer_settings: None,
+      logs: StatefulList::default(),
+      quality_profile_map: BiMap::new(),
+      queued_events: StatefulTable::default(),
+      series: StatefulTable::default(),
+      start_time: DateTime::default(),
+      version: String::new(),
     }
   }
 }

src/models/servarr_data/sonarr/sonarr_data_tests.rs

@@ -34,18 +34,19 @@ mod tests {
     fn test_sonarr_data_defaults() {
       let sonarr_data = SonarrData::default();
 
-      assert!(sonarr_data.version.is_empty());
-      assert_eq!(sonarr_data.start_time, <DateTime<Utc>>::default());
-      assert!(sonarr_data.series.is_empty());
       assert!(sonarr_data.blocklist.is_empty());
-      assert!(sonarr_data.logs.is_empty());
-      assert!(sonarr_data.episodes_tree.is_empty());
-      assert!(sonarr_data.episodes_table.is_empty());
       assert!(sonarr_data.downloads.is_empty());
       assert!(sonarr_data.episode_details_modal.is_none());
-      assert!(sonarr_data.quality_profile_map.is_empty());
+      assert!(sonarr_data.episodes_table.is_empty());
+      assert!(sonarr_data.episodes_tree.is_empty());
       assert!(sonarr_data.indexers.is_empty());
       assert!(sonarr_data.indexer_settings.is_none());
+      assert!(sonarr_data.logs.is_empty());
+      assert!(sonarr_data.quality_profile_map.is_empty());
+      assert!(sonarr_data.queued_events.is_empty());
+      assert!(sonarr_data.series.is_empty());
+      assert_eq!(sonarr_data.start_time, <DateTime<Utc>>::default());
+      assert!(sonarr_data.version.is_empty());
     }
   }
 }

src/models/servarr_models.rs

@@ -1,5 +1,6 @@
 use std::fmt::{Display, Formatter, Result};
 
+use chrono::{DateTime, Utc};
 use clap::ValueEnum;
 use serde::{Deserialize, Serialize};
 use serde_json::{Number, Value};
@@ -113,6 +114,19 @@ pub struct IndexerField {
   pub value: Option<Value>,
 }
 
+#[derive(Default, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct QueueEvent {
+  pub trigger: String,
+  pub name: String,
+  pub command_name: String,
+  pub status: String,
+  pub queued: DateTime<Utc>,
+  pub started: Option<DateTime<Utc>>,
+  pub ended: Option<DateTime<Utc>>,
+  pub duration: Option<String>,
+}
+
 #[derive(Default, Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct SecurityConfig {

src/models/sonarr_models.rs

@@ -10,7 +10,7 @@ use strum::EnumIter;
 use crate::serde_enum_from;
 
 use super::{
-  servarr_models::{HostConfig, Indexer, SecurityConfig},
+  servarr_models::{HostConfig, Indexer, QueueEvent, SecurityConfig},
   HorizontallyScrollableText, Serdeable,
 };
 
@@ -352,6 +352,7 @@ pub enum SonarrSerdeable {
   IndexerSettings(IndexerSettings),
   Indexers(Vec<Indexer>),
   QualityProfiles(Vec<QualityProfile>),
+  QueueEvents(Vec<QueueEvent>),
   SecurityConfig(SecurityConfig),
   SeriesVec(Vec<Series>),
   SystemStatus(SystemStatus),
@@ -381,6 +382,7 @@ serde_enum_from!(
     IndexerSettings(IndexerSettings),
     Indexers(Vec<Indexer>),
     QualityProfiles(Vec<QualityProfile>),
+    QueueEvents(Vec<QueueEvent>),
     SecurityConfig(SecurityConfig),
     SeriesVec(Vec<Series>),
     SystemStatus(SystemStatus),

src/models/sonarr_models_tests.rs

@@ -4,7 +4,7 @@ mod tests {
   use serde_json::json;
 
   use crate::models::{
-    servarr_models::{HostConfig, Indexer, SecurityConfig},
+    servarr_models::{HostConfig, Indexer, QueueEvent, SecurityConfig},
     sonarr_models::{
       BlocklistItem, BlocklistResponse, DownloadRecord, DownloadsResponse, Episode,
       IndexerSettings, Log, LogResponse, QualityProfile, Series, SeriesStatus, SeriesType,
@@ -231,6 +231,18 @@ mod tests {
     );
   }
 
+  #[test]
+  fn test_sonarr_serdeable_from_queue_events() {
+    let queue_events = vec![QueueEvent {
+      trigger: "test".to_owned(),
+      ..QueueEvent::default()
+    }];
+
+    let sonarr_serdeable: SonarrSerdeable = queue_events.clone().into();
+
+    assert_eq!(sonarr_serdeable, SonarrSerdeable::QueueEvents(queue_events));
+  }
+
   #[test]
   fn test_sonarr_serdeable_from_security_config() {
     let security_config = SecurityConfig {