From f20b16e59f6a2dc74a118ef3727de17c7be77acf Mon Sep 17 00:00:00 2001 From: phoenix Date: Tue, 21 Oct 2025 12:08:55 -0400 Subject: [PATCH] tsk-44: Added function to get CoverArt type from data --- src/detection/coverart.rs | 30 ++++++++++++++++++++++++++++++ src/lib.rs | 19 ++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/src/detection/coverart.rs b/src/detection/coverart.rs index 6bd5d01..3a7e91d 100644 --- a/src/detection/coverart.rs +++ b/src/detection/coverart.rs @@ -9,6 +9,16 @@ pub fn file_type(filepath: &str) -> Result { } } +/// Gets the file type of a CoverArt given it's data +pub fn file_type_from_data(data: &Vec) -> Result { + match imghdr::from_bytes(data) { + Some(imghdr::Type::Jpeg) => Ok(String::from("jpeg")), + Some(imghdr::Type::Png) => Ok(String::from("png")), + None => Err(std::io::Error::other("Image file not supported")), + _ => Err(std::io::Error::other("Image file not supported")), + } +} + #[cfg(test)] mod tests { #[test] @@ -29,4 +39,24 @@ mod tests { } } } + + #[test] + fn test_coverart_file_type_from_data() { + let directory = String::from(crate::test_util::util::TESTFILEDIRECTORY); + let filename = String::from("Sample Tracks 3.png"); + let filepath = format!("{directory}/{filename}"); + let data = crate::test_util::util::get_data_from_file(&filepath).unwrap(); + + match super::file_type_from_data(&data) { + Ok(filetype) => { + assert_eq!( + filetype, "png", + "The file type of the CoverArt should have been png" + ); + } + Err(err) => { + assert!(false, "Error: {err:?}"); + } + } + } } diff --git a/src/lib.rs b/src/lib.rs index 97c6803..9440697 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,7 +5,7 @@ pub mod types; pub mod test_util { pub mod util { - use std::io::{self, Write}; + use std::io::{self, Read, Write}; use rand::Rng; @@ -39,6 +39,23 @@ pub mod test_util { std::fs::copy(src_path, dest_path) } + pub fn get_data_from_file(source_path: &str) -> Result, std::io::Error> { + match std::fs::File::open(source_path) { + Ok(mut file) => { + let mut data: Vec = Vec::new(); + match file.read_to_end(&mut data) { + Ok(_) => { + Ok(data) + } + Err(err) => Err(err) + } + } + Err(err) => { + Err(err) + } + } + } + pub fn file_exists(directory: &String, filename: &String) -> Result { match path_buf(directory, filename) { Ok(pf) => Ok(pf.exists()),