Improve media info page

src/audio.rs

@@ -288,9 +288,15 @@ impl FromStr for Audio {
 }
 
 impl Item for Audio {
-  fn info(&self) -> Info {
+  fn info(&self, url: String) -> Info {
     Info::Map(vec![
-      ("filename".into(), Info::Value(self.filename.to_string())),
+      (
+        "filename".into(),
+        Info::Link {
+          text: self.filename.to_string(),
+          url,
+        },
+      ),
       ("title".into(), Info::Value(self.title.to_string())),
       ("artist".into(), Info::Value(self.artist.to_string())),
       ("album".into(), Info::Value(self.album.to_string())),

src/image.rs

@@ -133,9 +133,15 @@ impl FromStr for Image {
 }
 
 impl Item for Image {
-  fn info(&self) -> Info {
+  fn info(&self, url: String) -> Info {
     Info::Map(vec![
-      ("filename".into(), Info::Value(self.filename.to_string())),
+      (
+        "filename".into(),
+        Info::Link {
+          text: self.filename.to_string(),
+          url,
+        },
+      ),
       ("type".into(), Info::Value(self.ty.to_string())),
       (
         "dimensions".into(),

src/info.rs

@@ -1,5 +1,6 @@
 #[derive(Debug, PartialEq)]
 pub(crate) enum Info {
+  Link { text: String, url: String },
   List(Vec<Info>),
   Map(Vec<(String, Info)>),
   Value(String),

src/item.rs

@@ -1,7 +1,7 @@
 use super::*;
 
 pub(crate) trait Item {
-  fn info(&self) -> Info;
+  fn info(&self, url: String) -> Info;
 
   fn path(&self) -> RelativePath;
 

src/templates/info.rs

@@ -7,6 +7,18 @@ pub(crate) struct InfoHtml<'a>(pub(crate) &'a Info);
 mod tests {
   use {super::*, pretty_assertions::assert_eq};
 
+  #[test]
+  fn link() {
+    assert_eq!(
+      InfoHtml(&Info::Link {
+        text: "foo".into(),
+        url: "/bar".into(),
+      })
+      .to_string(),
+      "<a href=/bar>foo</a>\n",
+    );
+  }
+
   #[test]
   fn list() {
     assert_eq!(

src/templates/media.rs

@@ -13,6 +13,10 @@ impl MediaHtml {
 }
 
 impl Page for MediaHtml {
+  fn stylesheet(&self) -> Option<&'static str> {
+    Some("/static/media.css")
+  }
+
   fn title(&self) -> String {
     if let Some(title) = self.title() {
       format!("{title} media · filepack")

src/video.rs

@@ -532,9 +532,15 @@ impl FromStr for Video {
 }
 
 impl Item for Video {
-  fn info(&self) -> Info {
+  fn info(&self, url: String) -> Info {
     Info::Map(vec![
-      ("filename".into(), Info::Value(self.filename.to_string())),
+      (
+        "filename".into(),
+        Info::Link {
+          text: self.filename.to_string(),
+          url,
+        },
+      ),
       ("type".into(), Info::Value(self.ty.to_string())),
       (
         "duration".into(),

static/media.css

@@ -0,0 +1,9 @@
+dl {
+  display: grid;
+  gap: 0 1em;
+  grid-template-columns: max-content auto;
+}
+
+dd {
+  margin: 0;
+}

templates/info.html

@@ -1,4 +1,7 @@
 %% match self.0 {
+%%   Info::Link { text, url } => {
+<a href={{ url }}>{{ text }}</a>
+%%   }
 %%   Info::List(items) => {
 <ol>
 %%     for item in items {

templates/media.html

@@ -7,9 +7,8 @@ <h1 class=code><a href=/package/{{ self.fingerprint }}>{{ self.fingerprint }}</a
 <ol>
 %% for i in 0..media.items() {
 %%   let item = media.item(i).unwrap();
-%%   let info = item.info();
+%%   let info = item.info(format!("/package/{}/item/{}", self.fingerprint, Ordinal(i)));
   <li>
-    <a href=/package/{{ self.fingerprint }}/item/{{ Ordinal(i) }}>{{ item.path() }}</a>
     {{ Trusted(InfoHtml(&info)) }}
   </li>
 %% }