From 14b44064b3003a631cb75c0d1a28ab027e687a3f Mon Sep 17 00:00:00 2001 From: Olivia Lee Date: Sun, 1 Dec 2024 15:03:59 -0800 Subject: [PATCH] propagate corrupted media key errors Now that we are able to distinguish between corrupted media keys and missing files, it makes more sense to propagate the corrupted keys up to the caller. --- src/service/media.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/service/media.rs b/src/service/media.rs index 74cc0f12..b9ccddae 100644 --- a/src/service/media.rs +++ b/src/service/media.rs @@ -99,7 +99,7 @@ impl Service { &self, mxc: OwnedMxcUri, ) -> Result)>> { - if let Ok(Some((meta, key))) = self.db.search_file_metadata(mxc, 0, 0) { + if let Some((meta, key)) = self.db.search_file_metadata(mxc, 0, 0)? { let path = services().globals.get_media_file(&key); let mut file_data = Vec::new(); let Ok(mut file) = File::open(path).await else { @@ -298,8 +298,8 @@ impl Service { let (width, height, crop) = Self::thumbnail_properties(width, height).unwrap_or((0, 0, false)); - if let Ok(Some((meta, key))) = - self.db.search_file_metadata(mxc.clone(), width, height) + if let Some((meta, key)) = + self.db.search_file_metadata(mxc.clone(), width, height)? { debug!("Using saved thumbnail"); let path = services().globals.get_media_file(&key); @@ -309,8 +309,8 @@ impl Service { return Ok(Some((meta, file.clone()))); } - let Ok(Some((meta, key))) = - self.db.search_file_metadata(mxc.clone(), 0, 0) + let Some((meta, key)) = + self.db.search_file_metadata(mxc.clone(), 0, 0)? else { debug!("Original image not found, can't generate thumbnail"); return Ok(None);