Merge pull request #2796 from tarkah/feat/gallery-enhancements

Add blurhash to gallery

Cargo.toml

@@ -200,6 +200,7 @@ unused_results = "deny"
 
 [workspace.lints.clippy]
 type-complexity = "allow"
+map-entry = "allow"
 semicolon_if_nothing_returned = "deny"
 trivially-copy-pass-by-ref = "deny"
 default_trait_access = "deny"

core/src/animation.rs

@@ -13,6 +13,7 @@ where
     T: Clone + Copy + PartialEq + Float,
 {
     raw: lilt::Animated<T, Instant>,
+    duration: Duration, // TODO: Expose duration getter in `lilt`
 }
 
 impl<T> Animation<T>
@@ -23,6 +24,7 @@ where
     pub fn new(state: T) -> Self {
         Self {
             raw: lilt::Animated::new(state),
+            duration: Duration::from_millis(100),
         }
     }
 
@@ -58,6 +60,7 @@ where
     /// Sets the duration of the [`Animation`] to the given value.
     pub fn duration(mut self, duration: Duration) -> Self {
         self.raw = self.raw.duration(duration.as_secs_f32() * 1_000.0);
+        self.duration = duration;
         self
     }
 
@@ -133,4 +136,13 @@ impl Animation<bool> {
     {
         self.raw.animate_bool(start, end, at)
     }
+
+    /// Returns the remaining [`Duration`] of the [`Animation`].
+    pub fn remaining(&self, at: Instant) -> Duration {
+        Duration::from_secs_f32(self.interpolate(
+            self.duration.as_secs_f32(),
+            0.0,
+            at,
+        ))
+    }
 }

core/src/length.rs

@@ -77,8 +77,8 @@ impl From<f32> for Length {
     }
 }
 
-impl From<u16> for Length {
-    fn from(units: u16) -> Self {
-        Length::Fixed(f32::from(units))
+impl From<u32> for Length {
+    fn from(units: u32) -> Self {
+        Length::Fixed(units as f32)
     }
 }

core/src/pixels.rs

@@ -20,9 +20,9 @@ impl From<f32> for Pixels {
     }
 }
 
-impl From<u16> for Pixels {
-    fn from(amount: u16) -> Self {
-        Self(f32::from(amount))
+impl From<u32> for Pixels {
+    fn from(amount: u32) -> Self {
+        Self(amount as f32)
     }
 }
 

examples/gallery/Cargo.toml

@@ -19,5 +19,7 @@ bytes.workspace = true
 image.workspace = true
 tokio.workspace = true
 
+blurhash = "0.2.3"
+
 [lints]
 workspace = true

examples/gallery/src/civitai.rs

@@ -10,6 +10,7 @@ use std::sync::Arc;
 pub struct Image {
     pub id: Id,
     url: String,
+    hash: String,
 }
 
 impl Image {
@@ -40,20 +41,37 @@ impl Image {
         Ok(response.items)
     }
 
+    pub async fn blurhash(
+        self,
+        width: u32,
+        height: u32,
+    ) -> Result<Rgba, Error> {
+        task::spawn_blocking(move || {
+            let pixels = blurhash::decode(&self.hash, width, height, 1.0)?;
+
+            Ok::<_, Error>(Rgba {
+                width,
+                height,
+                pixels: Bytes::from(pixels),
+            })
+        })
+        .await?
+    }
+
     pub async fn download(self, size: Size) -> Result<Rgba, Error> {
         let client = reqwest::Client::new();
 
         let bytes = client
             .get(match size {
                 Size::Original => self.url,
-                Size::Thumbnail => self
+                Size::Thumbnail { width } => self
                     .url
                     .split("/")
                     .map(|part| {
                         if part.starts_with("width=") {
-                            "width=640"
+                            format!("width={}", width * 2) // High DPI
                         } else {
-                            part
+                            part.to_owned()
                         }
                     })
                     .collect::<Vec<_>>()
@@ -107,7 +125,7 @@ impl fmt::Debug for Rgba {
 #[derive(Debug, Clone, Copy)]
 pub enum Size {
     Original,
-    Thumbnail,
+    Thumbnail { width: u32 },
 }
 
 #[derive(Debug, Clone)]
@@ -117,6 +135,7 @@ pub enum Error {
     IOFailed(Arc<io::Error>),
     JoinFailed(Arc<task::JoinError>),
     ImageDecodingFailed(Arc<image::ImageError>),
+    BlurhashDecodingFailed(Arc<blurhash::Error>),
 }
 
 impl From<reqwest::Error> for Error {
@@ -142,3 +161,9 @@ impl From<image::ImageError> for Error {
         Self::ImageDecodingFailed(Arc::new(error))
     }
 }
+
+impl From<blurhash::Error> for Error {
+    fn from(error: blurhash::Error) -> Self {
+        Self::BlurhashDecodingFailed(Arc::new(error))
+    }
+}