From 795ce4251843df95401084b50281a93eac353b8f Mon Sep 17 00:00:00 2001 From: Olivia Lee Date: Wed, 11 Dec 2024 15:07:06 -0800 Subject: [PATCH] return M_NOT_YET_UPLOADED when backing files are missing for a thumbnail This was done for fetching original media files in c70cfd3d254924d42b2c3b4a7c271526bd5c29ba, but the change for thumbnails was missed. --- src/service/media.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/service/media.rs b/src/service/media.rs index f892271c..9b965caa 100644 --- a/src/service/media.rs +++ b/src/service/media.rs @@ -314,11 +314,7 @@ impl Service { self.db.search_file_metadata(mxc.clone(), width, height)? { debug!("Using saved thumbnail"); - let path = services().globals.get_media_file(&key); - let mut file = Vec::new(); - File::open(path).await?.read_to_end(&mut file).await?; - - return Ok(Some((meta, file.clone()))); + return Ok(self.read_content(&key).await?.map(|file| (meta, file))); } let Some((meta, key)) = @@ -328,9 +324,10 @@ impl Service { return Ok(None); }; - let path = services().globals.get_media_file(&key); - let mut file = Vec::new(); - File::open(path).await?.read_to_end(&mut file).await?; + let Some(file) = self.read_content(&key).await? else { + debug!("Original image not found, can't generate thumbnail"); + return Ok(None); + }; debug!("Generating thumbnail"); let thumbnail_result = {