phoenix/icarus_meta
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 50 Wiki Activity

tsk-45: Making use of constants

Browse Source
This commit is contained in:
phoenix
2025-10-21 21:08:14 -04:00
parent 0c3e4bf82a
commit 290cd4eaa8
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/detection/coverart.rs
View File

@@ -4,11 +4,11 @@ pub fn file_type_from_filepath(
) -> Result<crate::detection::FileType, std::io::Error> { ) -> Result<crate::detection::FileType, std::io::Error> {
match imghdr::from_file(filepath) { match imghdr::from_file(filepath) {
Ok(Some(imghdr::Type::Jpeg)) => Ok(crate::detection::FileType { 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), file_type: String::from(constants::JPEG_TYPE),
}), }),
Ok(Some(imghdr::Type::Png)) => Ok(crate::detection::FileType { 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), file_type: String::from(constants::PNG_TYPE),
}), }),
Ok(None) => Err(std::io::Error::other("Image file not supported")), 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<u8>) -> Result<crate::detection::FileType, std::io::Error> { pub fn file_type_from_data(data: &Vec<u8>) -> Result<crate::detection::FileType, std::io::Error> {
match imghdr::from_bytes(data) { match imghdr::from_bytes(data) {
Some(imghdr::Type::Jpeg) => Ok(crate::detection::FileType { 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), file_type: String::from(constants::JPEG_TYPE),
}), }),
Some(imghdr::Type::Png) => Ok(crate::detection::FileType { 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), file_type: String::from(constants::PNG_TYPE),
}), }),
None => Err(std::io::Error::other("Image file not supported")), 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 PNG_TYPE: &str = "png";
pub const JPEG_TYPE: &str = "jpeg"; pub const JPEG_TYPE: &str = "jpeg";
pub const JPG_TYPE: &str = "jpg"; pub const JPG_TYPE: &str = "jpg";
pub mod mime {
pub const JPEG: &str = "image/jpeg";
pub const PNG: &str = "image/png";
}
} }
#[cfg(test)] #[cfg(test)]