diff options
| -rw-r--r-- | common/src/lib.rs | 54 | ||||
| -rw-r--r-- | server/src/library.rs | 4 | ||||
| -rw-r--r-- | tools/src/bin/import.rs | 34 |
3 files changed, 59 insertions, 33 deletions
diff --git a/common/src/lib.rs b/common/src/lib.rs index c678cdb..2e80744 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -3,26 +3,44 @@ pub mod r#impl; use bincode::{Decode, Encode}; use serde::{Deserialize, Serialize}; -use std::{collections::BTreeMap, path::PathBuf, ops::Deref}; +use std::{ + collections::BTreeMap, + ops::{Deref, DerefMut}, + path::PathBuf, +}; #[derive(Debug, Clone, Deserialize, Serialize)] pub struct CommmonInfo { pub title: String, - #[serde(default)] pub tagline: Option<String>, - #[serde(default)] pub description: Option<String>, - #[serde(default)] pub poster: Option<PathBuf>, - #[serde(default)] pub backdrop: Option<PathBuf>, + #[serde(default)] + pub tagline: Option<String>, + #[serde(default)] + pub description: Option<String>, + #[serde(default)] + pub poster: Option<PathBuf>, + #[serde(default)] + pub backdrop: Option<PathBuf>, } #[derive(Debug, Clone, Deserialize, Serialize)] pub struct DirectoryInfo { #[serde(flatten)] - pub commmon: CommmonInfo, + pub common: CommmonInfo, #[serde(default)] pub kind: DirectoryKind, } #[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ItemInfo { + #[serde(flatten)] + pub common: CommmonInfo, + pub duration: f64, // in seconds + pub tracks: BTreeMap<usize, SourceTrack>, +} + + + +#[derive(Debug, Clone, Deserialize, Serialize)] #[serde(rename_all = "snake_case")] pub enum DirectoryKind { Folder, @@ -37,14 +55,6 @@ impl Default for DirectoryKind { } #[derive(Debug, Clone, Deserialize, Serialize)] -pub struct ItemInfo { - #[serde(flatten)] - pub commmon: CommmonInfo, - pub duration: f64, // in seconds - pub tracks: BTreeMap<usize, SourceTrack>, -} - -#[derive(Debug, Clone, Deserialize, Serialize)] pub struct SourceTrack { pub path: PathBuf, pub track_number: u64, @@ -87,12 +97,22 @@ pub struct BlockIndex { impl Deref for ItemInfo { type Target = CommmonInfo; fn deref(&self) -> &Self::Target { - &self.commmon + &self.common } } impl Deref for DirectoryInfo { type Target = CommmonInfo; fn deref(&self) -> &Self::Target { - &self.commmon + &self.common + } +} +impl DerefMut for ItemInfo { + fn deref_mut(&mut self) -> &mut Self::Target { + &mut self.common } -}
\ No newline at end of file +} +impl DerefMut for DirectoryInfo { + fn deref_mut(&mut self) -> &mut Self::Target { + &mut self.common + } +} diff --git a/server/src/library.rs b/server/src/library.rs index 30d6e69..77bb6e5 100644 --- a/server/src/library.rs +++ b/server/src/library.rs @@ -85,8 +85,8 @@ impl Node { } pub fn commmon(&self) -> &CommmonInfo { match self { - Node::Directory(d) => &d.info.commmon, - Node::Item(i) => &i.info.commmon, + Node::Directory(d) => &d.info.common, + Node::Item(i) => &i.info.common, } } pub fn identifier(&self) -> &str { 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() |