human-readable cache keys

1 files changed, 16 insertions, 13 deletions

diff --git a/stream/src/metadata.rs b/stream/src/metadata.rs
index fe553e2..30d30e5 100644
--- a/stream/src/metadata.rs
+++ b/stream/src/metadata.rs
@@ -5,22 +5,25 @@
 */
 
 use anyhow::{anyhow, Result};
-use jellycache::{cache_memory, CacheKey};
+use jellycache::{cache_memory, HashKey};
 use jellyremuxer::{demuxers::create_demuxer_autodetect, matroska::Segment};
 use std::{fs::File, path::Path, sync::Arc};
 
 pub fn read_metadata(path: &Path) -> Result<Arc<Segment>> {
-    cache_memory(CacheKey::new_json(("media-metadata", path)), move || {
-        let media = File::open(path)?;
-        let mut media =
-            create_demuxer_autodetect(Box::new(media))?.ok_or(anyhow!("media format unknown"))?;
+    cache_memory(
+        &format!("media/stream-metadata/{}.json", HashKey(path)),
+        move || {
+            let media = File::open(path)?;
+            let mut media = create_demuxer_autodetect(Box::new(media))?
+                .ok_or(anyhow!("media format unknown"))?;
 
-        let info = media.info()?;
-        let tracks = media.tracks()?;
-        Ok(Segment {
-            info,
-            tracks,
-            ..Default::default()
-        })
-    })
+            let info = media.info()?;
+            let tracks = media.tracks()?;
+            Ok(Segment {
+                info,
+                tracks,
+                ..Default::default()
+            })
+        },
+    )
 }