fix(backend): handle case when plex directory is empty

IgnisDa · Feb 1, 2025 · 654c3f5 · 654c3f5
1 parent 5dcec14
commit 654c3f5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/crates/models/external/src/lib.rs b/crates/models/external/src/lib.rs
@@ -109,7 +109,7 @@ pub mod plex {
     #[derive(Debug, Deserialize, Serialize)]
     #[serde(rename_all = "PascalCase")]
     pub struct PlexMetadata {
-        pub metadata: Vec<PlexMetadataItem>,
+        pub metadata: Option<Vec<PlexMetadataItem>>,
     }
 
     #[derive(Debug, Deserialize, Serialize)]

diff --git a/crates/services/importer/src/plex.rs b/crates/services/importer/src/plex.rs
@@ -49,8 +49,17 @@ pub async fn import(input: DeployUrlAndKeyImportInput) -> Result<ImportResult> {
             .await?
             .json::<plex_models::PlexMediaResponse<plex_models::PlexMetadata>>()
             .await?;
-        let total = items.media_container.metadata.len();
-        for (idx, item) in items.media_container.metadata.into_iter().enumerate() {
+        let Some(metadata) = items.media_container.metadata else {
+            failed_items.push(ImportFailedItem {
+                lot: Some(lot),
+                step: ImportFailStep::ItemDetailsFromSource,
+                identifier: format!("{} ({}) - {}", dir.title, lot, dir.key),
+                error: Some("No metadata found".to_string()),
+            });
+            continue;
+        };
+        let total = metadata.len();
+        for (idx, item) in metadata.into_iter().enumerate() {
             let Some(_lv) = item.last_viewed_at else {
                 continue;
             };
@@ -102,7 +111,10 @@ pub async fn import(input: DeployUrlAndKeyImportInput) -> Result<ImportResult> {
                         identifier: tmdb_id.to_string(),
                         ..Default::default()
                     };
-                    for leaf in leaves.media_container.metadata {
+                    let Some(leafs) = leaves.media_container.metadata else {
+                        continue;
+                    };
+                    for leaf in leafs {
                         if leaf.last_viewed_at.is_some() {
                             item.seen_history.push(ImportOrExportMetadataItemSeen {
                                 show_episode_number: leaf.index,

diff --git a/crates/services/integration/src/yank/plex.rs b/crates/services/integration/src/yank/plex.rs
@@ -43,7 +43,10 @@ pub async fn sync_to_owned_collection(base_url: String, token: String) -> Result
             .await?
             .json::<plex_models::PlexMediaResponse<plex_models::PlexMetadata>>()
             .await?;
-        for (idx, item) in items.media_container.metadata.into_iter().enumerate() {
+        let Some(metadata) = items.media_container.metadata else {
+            continue;
+        };
+        for (idx, item) in metadata.into_iter().enumerate() {
             ryot_log!(debug, "Processing item {}", idx + 1);
             let gu_ids = item.guid.unwrap_or_default();
             let Some(tmdb_id) = gu_ids