item descriptions

4 files changed, 18 insertions, 3 deletions

diff --git a/common/src/lib.rs b/common/src/lib.rs
index 90cbd3e..0587613 100644
--- a/common/src/lib.rs
+++ b/common/src/lib.rs
@@ -12,6 +12,8 @@ pub struct DirectoryInfo {
 pub struct ItemInfo {
     pub title: String,
     pub duration: f64, // in seconds
+    pub description_head: String,
+    pub description: String,
     pub banner: Option<PathBuf>,
     pub tracks: BTreeMap<usize, SourceTrack>,
 }
diff --git a/server/src/routes/ui/node.rs b/server/src/routes/ui/node.rs
index ec9cde8..b32e4b7 100644
--- a/server/src/routes/ui/node.rs
+++ b/server/src/routes/ui/node.rs
@@ -81,8 +81,8 @@ markup::define! {
                 a.play[href=&player_uri(&item.lib_path)] { "Watch now" }
             }
             div.details {
-                h3 { "Lorem Ipsum!" }
-                p { "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." }
+                h3 { @item.info.description_head }
+                p { @item.info.description }
             }
         }
     }
diff --git a/server/src/routes/ui/style/layout.css b/server/src/routes/ui/style/layout.css
index 3332460..f392d04 100644
--- a/server/src/routes/ui/style/layout.css
+++ b/server/src/routes/ui/style/layout.css
@@ -34,7 +34,6 @@ body {
     width: 100vw;
     margin: 0px;
     padding: 0px;
-    min-height: 100vh;
 }
 
 nav {
@@ -89,6 +88,7 @@ nav .account {
     margin-top: var(--bar-height);
     margin-left: var(--main-side-margin);
     margin-right: var(--main-side-margin);
+    margin-bottom: 1em;
 }
 
 .error {
diff --git a/tools/src/bin/import.rs b/tools/src/bin/import.rs
index d38925b..298e209 100644
--- a/tools/src/bin/import.rs
+++ b/tools/src/bin/import.rs
@@ -16,7 +16,12 @@ struct Args {
     #[clap(short, long)]
     title: Option<String>,
 
+    #[clap(short = 'D', long)]
+    description_head: Option<String>,
     #[clap(short = 'd', long)]
+    description: Option<String>,
+
+    #[clap(short = 'N', long)]
     dry: bool,
 
     #[clap(short = 'i', long)]
@@ -38,6 +43,8 @@ fn main() -> anyhow::Result<()> {
             ItemInfo {
                 duration: 0.0,
                 banner: 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: args.item.to_str().unwrap().to_string(),
                 tracks: Default::default(),
             }
@@ -50,6 +57,12 @@ fn main() -> anyhow::Result<()> {
     if let Some(banner) = args.banner {
         iteminfo.banner = Some(banner);
     }
+    if let Some(d) = args.description {
+        iteminfo.description = d;
+    }
+    if let Some(d) = args.description_head {
+        iteminfo.description_head = d;
+    }
 
     if let Some(input_path) = args.input {
         let input = File::open(input_path.clone()).unwrap();