From 290cd4eaa878c7898ea0bda28434219e5906a066 Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 21 Oct 2025 21:08:14 -0400 Subject: [PATCH] tsk-45: Making use of constants --- src/detection/coverart.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/detection/coverart.rs b/src/detection/coverart.rs index c25f548..da51d71 100644 --- a/src/detection/coverart.rs +++ b/src/detection/coverart.rs @@ -4,11 +4,11 @@ pub fn file_type_from_filepath( ) -> Result { match imghdr::from_file(filepath) { Ok(Some(imghdr::Type::Jpeg)) => Ok(crate::detection::FileType { - mime: String::from("image/jpeg"), + mime: String::from(constants::mime::JPEG), file_type: String::from(constants::JPEG_TYPE), }), Ok(Some(imghdr::Type::Png)) => Ok(crate::detection::FileType { - mime: String::from("image/png"), + mime: String::from(constants::mime::PNG), file_type: String::from(constants::PNG_TYPE), }), Ok(None) => Err(std::io::Error::other("Image file not supported")), @@ -21,11 +21,11 @@ pub fn file_type_from_filepath( pub fn file_type_from_data(data: &Vec) -> Result { match imghdr::from_bytes(data) { Some(imghdr::Type::Jpeg) => Ok(crate::detection::FileType { - mime: String::from("image/jpeg"), + mime: String::from(constants::mime::JPEG), file_type: String::from(constants::JPEG_TYPE), }), Some(imghdr::Type::Png) => Ok(crate::detection::FileType { - mime: String::from("image/png"), + mime: String::from(constants::mime::PNG), file_type: String::from(constants::PNG_TYPE), }), None => Err(std::io::Error::other("Image file not supported")), @@ -37,6 +37,11 @@ pub mod constants { pub const PNG_TYPE: &str = "png"; pub const JPEG_TYPE: &str = "jpeg"; pub const JPG_TYPE: &str = "jpg"; + + pub mod mime { + pub const JPEG: &str = "image/jpeg"; + pub const PNG: &str = "image/png"; + } } #[cfg(test)]