tsk-44 #47

Merged
phoenix merged 15 commits from tsk-44 into main 2025-10-21 16:20:51 +00:00
2 changed files with 48 additions and 1 deletions
Showing only changes of commit f20b16e59f - Show all commits

View File

@@ -9,6 +9,16 @@ pub fn file_type(filepath: &str) -> Result<String, std::io::Error> {
} }
} }
/// Gets the file type of a CoverArt given it's data
pub fn file_type_from_data(data: &Vec<u8>) -> Result<String, std::io::Error> {
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)] #[cfg(test)]
mod tests { mod tests {
#[test] #[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:?}");
}
}
}
} }

View File

@@ -5,7 +5,7 @@ pub mod types;
pub mod test_util { pub mod test_util {
pub mod util { pub mod util {
use std::io::{self, Write}; use std::io::{self, Read, Write};
use rand::Rng; use rand::Rng;
@@ -39,6 +39,23 @@ pub mod test_util {
std::fs::copy(src_path, dest_path) std::fs::copy(src_path, dest_path)
} }
pub fn get_data_from_file(source_path: &str) -> Result<Vec<u8>, std::io::Error> {
match std::fs::File::open(source_path) {
Ok(mut file) => {
let mut data: Vec<u8> = 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<bool, std::io::Error> { pub fn file_exists(directory: &String, filename: &String) -> Result<bool, std::io::Error> {
match path_buf(directory, filename) { match path_buf(directory, filename) {
Ok(pf) => Ok(pf.exists()), Ok(pf) => Ok(pf.exists()),