human-readable cache keys

2 files changed, 4 insertions, 26 deletions

diff --git a/common/src/helpers.rs b/common/src/helpers.rs
index 431bf8c..d643aa6 100644
--- a/common/src/helpers.rs
+++ b/common/src/helpers.rs
@@ -4,9 +4,7 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 
-use base64::{Engine, prelude::BASE64_URL_SAFE};
-
-use crate::{CreditCategory, IdentifierType, Picture, PictureSlot};
+use crate::{CreditCategory, IdentifierType, PictureSlot};
 use std::{fmt::Display, ops::Deref, str::FromStr};
 
 #[derive(PartialEq)]
@@ -149,22 +147,3 @@ impl FromStr for PictureSlot {
         })
     }
 }
-
-impl Display for Picture {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(&BASE64_URL_SAFE.encode(self.0))
-    }
-}
-impl FromStr for Picture {
-    type Err = &'static str;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let mut out = [0; 32];
-        let size = BASE64_URL_SAFE
-            .decode_slice(s, &mut out)
-            .map_err(|_| "invalid base64 picture key")?;
-        if size != out.len() {
-            return Err("picture key parse invalid size");
-        }
-        Ok(Self(out))
-    }
-}
diff --git a/common/src/lib.rs b/common/src/lib.rs
index cf79cc5..670d9af 100644
--- a/common/src/lib.rs
+++ b/common/src/lib.rs
@@ -68,7 +68,7 @@ pub struct Node {
     pub federated: Option<String>,
     pub tags: BTreeSet<String>,
     pub ratings: BTreeMap<RatingType, f64>,
-    pub pictures: BTreeMap<PictureSlot, Picture>,
+    pub pictures: BTreeMap<PictureSlot, Asset>,
     pub credits: BTreeMap<CreditCategory, Vec<Appearance>>,
     pub identifiers: BTreeMap<IdentifierType, String>,
     pub visibility: Visibility,
@@ -104,9 +104,8 @@ pub enum IdentifierType {
     Omdb,
 }
 
-// TODO custom b64 ser
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone, Copy)]
-pub struct Picture(pub [u8; 32]);
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone, Hash)]
+pub struct Asset(pub String);
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct Appearance {