emelie/zola
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cache get_image_metadata result

Browse source
This commit is contained in:
Vincent Prouillet 2021-06-14 20:06:57 +02:00
parent c0a0df4fe9
commit a8acf2cab7
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
components/templates/src/global_fns/images.rs
View file

@ -76,11 +76,12 @@ impl TeraFn for ResizeImage {
pub struct GetImageMetadata { pub struct GetImageMetadata {
/// The base path of the Zola site /// The base path of the Zola site
base_path: PathBuf, base_path: PathBuf,
result_cache: Arc<Mutex<HashMap<String, Value>>>,
} }
impl GetImageMetadata { impl GetImageMetadata {
pub fn new(base_path: PathBuf) -> Self { pub fn new(base_path: PathBuf) -> Self {
Self { base_path } Self { base_path, result_cache: Arc::new(Mutex::new(HashMap::new())) }
} }
} }
@ -97,7 +98,8 @@ impl TeraFn for GetImageMetadata {
"`get_image_metadata`: `allow_missing` must be a boolean (true or false)" "`get_image_metadata`: `allow_missing` must be a boolean (true or false)"
) )
.unwrap_or(false); .unwrap_or(false);
let (src_path, _) = match search_for_file(&self.base_path, &path)
let (src_path, unified_path) = match search_for_file(&self.base_path, &path)
.map_err(|e| format!("`get_image_metadata`: {}", e))? .map_err(|e| format!("`get_image_metadata`: {}", e))?
{ {
Some((f, p)) => (f, p), Some((f, p)) => (f, p),
@ -109,9 +111,17 @@ impl TeraFn for GetImageMetadata {
} }
}; };
let mut cache = self.result_cache.lock().expect("result cache lock");
if let Some(cached_result) = cache.get(&unified_path) {
return Ok(cached_result.clone());
}
let response = imageproc::read_image_metadata(&src_path) let response = imageproc::read_image_metadata(&src_path)
.map_err(|e| format!("`resize_image`: {}", e))?; .map_err(|e| format!("`resize_image`: {}", e))?;
to_value(response).map_err(Into::into) let out = to_value(response).unwrap();
cache.insert(unified_path, out.clone());
Ok(out)
} }
} }