From 02631fc14cf71aed0dd072e514b687a57bafc488 Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 21 Oct 2025 20:29:13 -0400 Subject: [PATCH] tsk-45: Code formatting --- src/detection/coverart.rs | 34 +++++++++++++++++++++++----------- src/detection/song.rs | 14 ++++++-------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/src/detection/coverart.rs b/src/detection/coverart.rs index 86e2176..c25f548 100644 --- a/src/detection/coverart.rs +++ b/src/detection/coverart.rs @@ -1,9 +1,16 @@ /// Gets the file type of a CoverArt given it's path -pub fn file_type_from_filepath(filepath: &str) -> Result { +pub fn file_type_from_filepath( + filepath: &str, +) -> Result { match imghdr::from_file(filepath) { - Ok(Some(imghdr::Type::Jpeg)) => Ok(crate::detection::FileType {mime: String::from("image/jpeg"), file_type: String::from(constants::JPEG_TYPE)}), - Ok(Some(imghdr::Type::Png)) => Ok(crate::detection::FileType {mime: String::from("image/png"), - file_type: String::from(constants::PNG_TYPE)}), + Ok(Some(imghdr::Type::Jpeg)) => Ok(crate::detection::FileType { + mime: String::from("image/jpeg"), + file_type: String::from(constants::JPEG_TYPE), + }), + Ok(Some(imghdr::Type::Png)) => Ok(crate::detection::FileType { + mime: String::from("image/png"), + file_type: String::from(constants::PNG_TYPE), + }), Ok(None) => Err(std::io::Error::other("Image file not supported")), Err(err) => Err(err), _ => Err(std::io::Error::other("Image file not supported")), @@ -13,22 +20,25 @@ pub fn file_type_from_filepath(filepath: &str) -> Result) -> Result { match imghdr::from_bytes(data) { - Some(imghdr::Type::Jpeg) => Ok(crate::detection::FileType {mime: String::from("image/jpeg"), file_type: String::from(constants::JPEG_TYPE)}), - Some(imghdr::Type::Png) => Ok(crate::detection::FileType {mime: String::from("image/png"), - file_type: String::from(constants::PNG_TYPE)}), + Some(imghdr::Type::Jpeg) => Ok(crate::detection::FileType { + mime: String::from("image/jpeg"), + file_type: String::from(constants::JPEG_TYPE), + }), + Some(imghdr::Type::Png) => Ok(crate::detection::FileType { + mime: String::from("image/png"), + file_type: String::from(constants::PNG_TYPE), + }), None => Err(std::io::Error::other("Image file not supported")), _ => Err(std::io::Error::other("Image file not supported")), } } - pub mod constants { pub const PNG_TYPE: &str = "png"; pub const JPEG_TYPE: &str = "jpeg"; pub const JPG_TYPE: &str = "jpg"; } - #[cfg(test)] mod tests { #[test] @@ -40,7 +50,8 @@ mod tests { match super::file_type_from_filepath(&filepath) { Ok(filetype) => { assert_eq!( - filetype.file_type, super::constants::PNG_TYPE, + filetype.file_type, + super::constants::PNG_TYPE, "The file type of the CoverArt should have been png" ); } @@ -60,7 +71,8 @@ mod tests { match super::file_type_from_data(&data) { Ok(filetype) => { assert_eq!( - filetype.file_type, super::constants::PNG_TYPE, + filetype.file_type, + super::constants::PNG_TYPE, "The file type of the CoverArt should have been png" ); } diff --git a/src/detection/song.rs b/src/detection/song.rs index a6ca378..38b2097 100644 --- a/src/detection/song.rs +++ b/src/detection/song.rs @@ -1,22 +1,20 @@ -pub fn file_type_from_filepath(filepath: &str) -> Result { +pub fn file_type_from_filepath( + filepath: &str, +) -> Result { match infer::get_from_path(filepath) { Ok(Some(kind)) => { let mime = kind.mime_type(); if mime == "audio/x-flac" { Ok(crate::detection::FileType { mime: String::from(mime), - file_type: String::from(constants::FLAC_TYPE) + file_type: String::from(constants::FLAC_TYPE), }) } else { Err(std::io::Error::other("Unsupported file type")) } } - Ok(None) => { - Err(std::io::Error::other("File type not determined")) - } - Err(err) => { - Err(err) - } + Ok(None) => Err(std::io::Error::other("File type not determined")), + Err(err) => Err(err), } }