From 05043f97a039836a9783d0451ba031c6f91edd13 Mon Sep 17 00:00:00 2001 From: Olivia Lee Date: Sat, 14 Dec 2024 15:59:45 -0800 Subject: [PATCH] rename Error::Image to Error::GenerateThumbnail The previous error was nonspecific and, because of the '#[from]' annotation, could have been used accidentally for *any* errors from the image crate. --- src/service/media.rs | 10 ++++++---- src/utils/error.rs | 7 ++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/service/media.rs b/src/service/media.rs index 84e5664c..cc0aded3 100644 --- a/src/service/media.rs +++ b/src/service/media.rs @@ -276,10 +276,12 @@ impl Service { t::debug!("Serializing thumbnail as PNG"); let mut thumbnail_bytes = Vec::new(); - thumbnail.write_to( - &mut Cursor::new(&mut thumbnail_bytes), - image::ImageFormat::Png, - )?; + thumbnail + .write_to( + &mut Cursor::new(&mut thumbnail_bytes), + image::ImageFormat::Png, + ) + .map_err(Error::GenerateThumbnail)?; Ok(Some(thumbnail_bytes)) } diff --git a/src/utils/error.rs b/src/utils/error.rs index 5dcb667e..db0735c4 100644 --- a/src/utils/error.rs +++ b/src/utils/error.rs @@ -36,11 +36,8 @@ pub(crate) enum Error { #[from] source: rocksdb::Error, }, - #[error("Could not generate an image.")] - Image { - #[from] - source: image::error::ImageError, - }, + #[error("Could not generate image thumbnail.")] + GenerateThumbnail(#[source] image::error::ImageError), #[error("Could not connect to server: {source}")] Reqwest { #[from]