cache by hash instead of path

1 files changed, 13 insertions, 12 deletions

diff --git a/src/embedders.rs b/src/embedders.rs
index 0693b5e..8911e95 100644
--- a/src/embedders.rs
+++ b/src/embedders.rs
@@ -1,5 +1,6 @@
+use anyhow::{bail, Result};
 use rayon::prelude::*;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use serde::{Deserialize, Serialize};
 
 pub trait MetricElem: Send + Sync + 'static + Serialize + for<'a> Deserialize<'a> {
@@ -16,21 +17,21 @@ pub trait EmbedderT: Send + Sync {
     type Embedding: MetricElem;
     const NAME: &'static str;
 
-    fn embed(&self, _: &PathBuf) -> Result<Self::Embedding, String>;
+    fn embed(&self, _: &Path) -> Result<Self::Embedding>;
 }
 
 pub trait BatchEmbedder: Send + Sync {
     type Embedding: MetricElem;
     const NAME: &'static str;
 
-    fn embeds(&mut self, _: &[PathBuf]) -> Result<Vec<Self::Embedding>, String>;
+    fn embeds(&mut self, _: &[PathBuf]) -> Result<Vec<Self::Embedding>>;
 }
 
 impl<T: EmbedderT> BatchEmbedder for T {
     type Embedding = T::Embedding;
     const NAME: &'static str = T::NAME;
 
-    fn embeds(&mut self, paths: &[PathBuf]) -> Result<Vec<Self::Embedding>, String> {
+    fn embeds(&mut self, paths: &[PathBuf]) -> Result<Vec<Self::Embedding>> {
         paths.par_iter()
         .map(|p| self.embed(p))
         .collect::<Vec<_>>()
@@ -44,12 +45,12 @@ impl EmbedderT for BrightnessEmbedder {
     type Embedding = f64;
     const NAME: &'static str = "Brightness";
 
-    fn embed(&self, path: &PathBuf) -> Result<f64, String> {
-        let im = image::open(path).map_err(|e| e.to_string())?;
+    fn embed(&self, path: &Path) -> Result<f64> {
+        let im = image::open(path)?;
         let num_bytes = 3 * (im.height() * im.width());
 
         if num_bytes == 0 {
-            return Err("Encountered NaN brightness, due to an empty image".to_string());
+            bail!("Encountered NaN brightness, due to an empty image");
         }
 
         Ok(im.to_rgb8()
@@ -74,8 +75,8 @@ impl EmbedderT for HueEmbedder {
     type Embedding = Hue;
     const NAME: &'static str = "Hue";
 
-    fn embed(&self, path: &PathBuf) -> Result<Hue, String> {
-        let im = image::open(path).map_err(|e| e.to_string())?;
+    fn embed(&self, path: &Path) -> Result<Hue> {
+        let im = image::open(path)?;
         let num_pixels = im.height() * im.width();
         let [sr, sg, sb] = im
             .to_rgb8()
@@ -98,7 +99,7 @@ impl EmbedderT for HueEmbedder {
             };
 
         if hue.is_nan() {
-            return Err("Encountered NaN hue, possibly because of a colorless or empty image".to_string());
+            bail!("Encountered NaN hue, possibly because of a colorless or empty image");
         }
 
         Ok(Hue(hue))
@@ -118,8 +119,8 @@ impl EmbedderT for ColorEmbedder {
     type Embedding = (f64, f64, f64);
     const NAME: &'static str = "Color";
 
-    fn embed(&self, path: &PathBuf) -> Result<(f64, f64, f64), String> {
-        let im = image::open(path).map_err(|e| e.to_string())?;
+    fn embed(&self, path: &Path) -> Result<(f64, f64, f64)> {
+        let im = image::open(path)?;
         let num_pixels = im.height() * im.width();
         let [sr, sg, sb] = im
             .to_rgb8()