From f3a59e19d8fc946e2e08245a4b88b11cd1b88cf4 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Sun, 7 Jun 2020 15:56:48 +0200 Subject: [PATCH] simplify condition for jpeg-check --- src/blob.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/blob.rs b/src/blob.rs index 3bcadcac9..331dcc282 100644 --- a/src/blob.rs +++ b/src/blob.rs @@ -383,13 +383,10 @@ impl<'a> BlobObject<'a> { pub async fn recode_to_image_size(&self, context: &Context) -> Result<(), BlobError> { let blob_abs = self.to_abs_path(); - match message::guess_msgtype_from_suffix(Path::new(&blob_abs)) { - None => return Ok(()), - Some(imgtype) => { - if imgtype.1 != "image/jpeg" { - return Ok(()); - } - } + if message::guess_msgtype_from_suffix(Path::new(&blob_abs)) + != Some((Viewtype::Image, "image/jpeg")) + { + return Ok(()); } let img = image::open(&blob_abs).map_err(|err| BlobError::RecodeFailure {