refactor for last commit

1 files changed, 20 insertions, 14 deletions

diff --git a/tools/src/bin/import.rs b/tools/src/bin/import.rs
index 8505e01..c771450 100644
--- a/tools/src/bin/import.rs
+++ b/tools/src/bin/import.rs
@@ -5,7 +5,7 @@ Copyright (C) 2023 metamuffin <metamuffin.org>
 */
 use anyhow::Context;
 use clap::{Parser, Subcommand};
-use jellycommon::ItemInfo;
+use jellycommon::{CommmonInfo, ItemInfo};
 use jellymatroska::read::EbmlReader;
 use jellyremuxer::import::import_read;
 use jellytools::tmdb::{tmdb_details, tmdb_image, tmdb_search};
@@ -43,7 +43,7 @@ enum Action {
         #[arg(short, long)]
         title: Option<String>,
         #[arg(short = 'D', long)]
-        description_head: Option<String>,
+        tagline: Option<String>,
         #[arg(short = 'd', long)]
         description: Option<String>,
         #[arg(short = 'c', long)]
@@ -120,12 +120,16 @@ fn main() -> anyhow::Result<()> {
                 })
                 .transpose()?;
 
-            let mut iteminfo = ItemInfo {
+            let common = CommmonInfo {
                 poster,
                 backdrop,
-                description: details.overview,
-                description_head: details.tagline.unwrap_or_default(),
+                description: Some(details.overview),
+                tagline: details.tagline,
                 title: details.title,
+            };
+
+            let mut iteminfo = ItemInfo {
+                common,
                 duration: Default::default(),
                 tracks: Default::default(),
             };
@@ -157,7 +161,7 @@ fn main() -> anyhow::Result<()> {
             poster,
             clear_inputs,
             description,
-            description_head,
+            tagline,
             input,
             item,
             title,
@@ -168,12 +172,14 @@ fn main() -> anyhow::Result<()> {
                     warn!("could not load item info: {e}");
                     warn!("using the default instead");
                     ItemInfo {
+                        common: CommmonInfo {
+                            poster: None,
+                            backdrop: None,
+                            tagline: None,
+                            description: None,
+                            title: item.to_str().unwrap().to_string(),
+                        },
                         duration: 0.0,
-                        poster: None,
-                        backdrop: None,
-                        description_head: "Lorem ipsum!".to_string(),
-                        description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.".to_string(),
-                        title: item.to_str().unwrap().to_string(),
                         tracks: Default::default(),
                     }
                 }
@@ -186,10 +192,10 @@ fn main() -> anyhow::Result<()> {
                 iteminfo.poster = Some(poster);
             }
             if let Some(d) = description {
-                iteminfo.description = d;
+                iteminfo.description = Some(d);
             }
-            if let Some(d) = description_head {
-                iteminfo.description_head = d;
+            if let Some(d) = tagline {
+                iteminfo.tagline = Some(d);
             }
             if clear_inputs {
                 iteminfo.tracks = Default::default()