fix series refresh

Author: neckaros

Cargo.lock

@@ -24,6 +24,7 @@ tower-http = { version = "0.5.0", features = ["cors","trace", "normalize-path",
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_with = "3"
+serde_path_to_error = "0.1"
 nanoid = "0.4.0"
 http-body-util = "0.1.0"
 hyper = { version = "1.0.0", features = ["full"] }

Cargo.toml

@@ -1,7 +1,8 @@
 use chrono::{DateTime, FixedOffset};
 use http::{header::USER_AGENT, HeaderMap, HeaderValue};
-use reqwest::{Client, Url};
+use reqwest::{Client, Response, Url};
 use rs_plugin_common_interfaces::{domain::rs_ids::{RsIds, RsIdsError}, lookup::RsLookupMovie};
+use serde::de::DeserializeOwned;
 use tower::Service;
 use trakt_people::{TraktActorsResult, TraktPeopleSearchElement, TraktPerson};
 use crate::{domain::{episode::Episode, movie::Movie, people::Person, serie::Serie}, plugins::medias::trakt::{trakt_episode::TraktSeasonWithEpisodes, trakt_show::TraktFullShow}, tools::clock::{Clock, RsNaiveDate}, Error, Result};
@@ -10,6 +11,20 @@ use self::{trakt_episode::TraktFullEpisode, trakt_movie::{TraktFullMovie, TraktM
 // Context required for all requests
 use unidecode::unidecode;
 
+/// Deserialize JSON response with detailed error path information
+async fn json_with_path<T: DeserializeOwned>(response: Response, context: &str) -> crate::Result<T> {
+    let url = response.url().to_string();
+    let bytes = response.bytes().await?;
+    let jd = &mut serde_json::Deserializer::from_slice(&bytes);
+    serde_path_to_error::deserialize(jd).map_err(|e| {
+        let path = e.path().to_string();
+        Error::Error(format!(
+            "JSON parse error in {} at field '{}': {} (url: {})",
+            context, path, e.inner(), url
+        ))
+    })
+}
+
 mod trakt_show;
 mod trakt_episode;
 mod trakt_movie;
@@ -70,7 +85,7 @@ impl TraktContext {
 
         let url = self.base_url.join(&format!("shows/{}?extended=full", id)).unwrap();
         let r = self.client.get(url).header("trakt-api-key", &self.client_id).send().await?;
-        let show = r.json::<TraktFullShow>().await?;
+        let show: TraktFullShow = json_with_path(r, &format!("get_serie({})", id)).await?;
 
         let show_nous: Serie = show.into();
         Ok(show_nous)
@@ -100,7 +115,8 @@ impl TraktContext {
         let url = self.base_url.join(&format!("shows/{}/seasons?extended=full,episodes", serie_id)).unwrap();
         let r = self.client.get(url).header("trakt-api-key", &self.client_id).send().await?;
         let best_serie_id = id.clone().into_best().unwrap_or(serie_id.to_owned());
-        let episodes = r.json::<Vec<TraktSeasonWithEpisodes>>().await?.into_iter().flat_map(|s| s.episodes).map(|e| e.into_trakt(best_serie_id.clone())).collect::<Vec<_>>();
+        let seasons: Vec<TraktSeasonWithEpisodes> = json_with_path(r, &format!("all_episodes({})", serie_id)).await?;
+        let episodes = seasons.into_iter().flat_map(|s| s.episodes).map(|e| e.into_trakt(best_serie_id.clone())).collect::<Vec<_>>();
         Ok(episodes)
     }
 
@@ -115,8 +131,8 @@ impl TraktContext {
         }?;
         let url = self.base_url.join(&format!("shows/{}/seasons/{}/episodes/{}?extended=full", id, season, episode)).unwrap();
         let r = self.client.get(url).header("trakt-api-key", &self.client_id).send().await?;
-        let episodes = r.json::<TraktFullEpisode>().await?;
-        Ok(episodes.into_trakt(format!("trakt:")))
+        let ep: TraktFullEpisode = json_with_path(r, &format!("episode({} S{}E{})", id, season, episode)).await?;
+        Ok(ep.into_trakt(format!("trakt:")))
     }
 }
 

src/plugins/medias/trakt/mod.rs

@@ -1,12 +1,12 @@
+use crate::domain::episode::Episode;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
-use crate::domain::episode::Episode;
 
 use super::trakt_show::TraktIds;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct TraktSeasonWithEpisodes {
-    pub episodes: Vec<TraktFullEpisode>
+    pub episodes: Vec<TraktFullEpisode>,
 }
 
 /// An [episode] with full [extended info]
@@ -21,13 +21,13 @@ pub struct TraktFullEpisode {
     pub ids: TraktIds,
     pub number_abs: Option<u32>,
     pub overview: Option<String>,
-    pub rating: f32,
-    pub votes: u32,
-    pub comment_count: u32,
+    pub rating: Option<f32>,
+    pub votes: Option<u32>,
+    pub comment_count: Option<u32>,
     pub first_aired: Option<DateTime<Utc>>,
     pub updated_at: Option<DateTime<Utc>>,
-    pub available_translations: Vec<String>,
-    pub runtime: u32,
+    pub available_translations: Option<Vec<String>>,
+    pub runtime: Option<u32>,
 }
 
 impl TraktFullEpisode {
@@ -41,7 +41,7 @@ impl TraktFullEpisode {
             overview: self.overview,
             alt: None,
             airdate: self.first_aired.and_then(|t| Some(t.timestamp_millis())),
-            duration: Some(self.runtime as u64),
+            duration: self.runtime.map(|r| r as u64),
             params: None,
             imdb: self.ids.imdb,
             slug: self.ids.slug,
@@ -51,11 +51,10 @@ impl TraktFullEpisode {
             otherids: None,
             imdb_rating: None,
             imdb_votes: None,
-            trakt_rating: Some(self.rating),
-            trakt_votes: Some(self.votes.into()),
+            trakt_rating: self.rating,
+            trakt_votes: self.votes.map(|v| v.into()),
 
-            ..Default::default()     
+            ..Default::default()
         }
     }
 }
-

src/plugins/medias/trakt/trakt_episode.rs

@@ -1,8 +1,8 @@
 use std::time::{SystemTime, UNIX_EPOCH};
 
-use rs_plugin_common_interfaces::domain::rs_ids::RsIds;
-use serde::{Serialize, Deserialize};
 use chrono::{DateTime, Utc};
+use rs_plugin_common_interfaces::domain::rs_ids::RsIds;
+use serde::{Deserialize, Serialize};
 use strum_macros::{Display, EnumString};
 
 use crate::domain::serie::{Serie, SerieStatus};
@@ -23,8 +23,10 @@ pub enum TraktShowStatus {
     Released,
     Canceled,
     Pilot,
-    #[strum(default)] Other(String),
-    #[default] Unknown,
+    #[strum(default)]
+    Other(String),
+    #[default]
+    Unknown,
 }
 
 impl From<TraktShowStatus> for SerieStatus {
@@ -78,14 +80,21 @@ pub struct TraktIds {
 
 impl From<RsIds> for TraktIds {
     fn from(value: RsIds) -> Self {
-        TraktIds { trakt: value.trakt, slug: value.slug, tvdb: value.tvdb, imdb: value.imdb, tmdb: value.tmdb, tvrage: value.tvrage }
+        TraktIds {
+            trakt: value.trakt,
+            slug: value.slug,
+            tvdb: value.tvdb,
+            imdb: value.imdb,
+            tmdb: value.tmdb,
+            tvrage: value.tvrage,
+        }
     }
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct TraktTrendingShowResult {
     pub watchers: u64,
-    pub show: TraktFullShow
+    pub show: TraktFullShow,
 }
 
 /// A [show] with full [extended info]
@@ -99,27 +108,30 @@ pub struct TraktFullShow {
     pub ids: TraktIds,
     pub overview: Option<String>,
     pub first_aired: Option<DateTime<Utc>>,
-    pub airs: Airing,
+    pub airs: Option<Airing>,
     pub runtime: Option<u32>,
     pub certification: Option<String>,
     pub network: Option<String>,
     pub country: Option<String>,
     pub trailer: Option<String>,
     pub homepage: Option<String>,
     pub status: Option<TraktShowStatus>,
-    pub rating: f64,
-    pub votes: u32,
-    pub comment_count: u32,
+    pub rating: Option<f64>,
+    pub votes: Option<u32>,
+    pub comment_count: Option<u32>,
     pub updated_at: Option<DateTime<Utc>>,
     pub language: Option<String>,
-    pub available_translations: Vec<String>,
-    pub genres: Vec<String>,
-    pub aired_episodes: u32,
+    pub available_translations: Option<Vec<String>>,
+    pub genres: Option<Vec<String>>,
+    pub aired_episodes: Option<u32>,
 }
 
 impl From<TraktFullShow> for Serie {
     fn from(value: TraktFullShow) -> Self {
-        let t = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis() as u64;
+        let t = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .unwrap()
+            .as_millis() as u64;
         Serie {
             id: format!("trakt:{}", value.ids.trakt.unwrap()),
             name: value.title,
@@ -135,14 +147,14 @@ impl From<TraktFullShow> for Serie {
             otherids: None,
             imdb_rating: None,
             imdb_votes: None,
-            trakt_votes: Some(value.votes as u64),
-            trakt_rating: Some(value.rating as f32),
+            trakt_votes: value.votes.map(|v| v as u64),
+            trakt_rating: value.rating.map(|r| r as f32),
             trailer: value.trailer,
             year: value.year,
             max_created: None,
             modified: t,
             added: t,
-            
+
             ..Default::default()
         }
     }
@@ -151,6 +163,5 @@ impl From<TraktFullShow> for Serie {
 #[derive(Debug, Serialize, Deserialize)]
 pub struct TraktShowSearchElement {
     pub score: f64,
-    pub show: TraktFullShow
+    pub show: TraktFullShow,
 }
-