tsk-44: Merge conflict

Cargo.lock

@@ -81,7 +81,7 @@ dependencies = [
 
 [[package]]
 name = "icarus_meta"
-version = "0.4.1"
+version = "0.4.2"
 dependencies = [
  "imghdr",
  "lofty",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "icarus_meta"
-version = "0.4.1"
+version = "0.4.2"
 edition = "2024"
 rust-version = "1.90"
 

src/detection/coverart.rs

@@ -1,5 +1,5 @@
 /// Gets the file type of a CoverArt given it's path
-pub fn file_type(filepath: &str) -> Result<String, std::io::Error> {
+pub fn file_type_from_filepath(filepath: &str) -> Result<String, std::io::Error> {
     match imghdr::from_file(filepath) {
         Ok(Some(imghdr::Type::Jpeg)) => Ok(String::from("jpeg")),
         Ok(Some(imghdr::Type::Png)) => Ok(String::from("png")),
@@ -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)]
 mod tests {
     #[test]
@@ -17,7 +27,27 @@ mod tests {
         let filename = String::from("Sample Tracks 3.png");
         let filepath = format!("{directory}/{filename}");
 
-        match super::file_type(&filepath) {
+        match super::file_type_from_filepath(&filepath) {
+            Ok(filetype) => {
+                assert_eq!(
+                    filetype, "png",
+                    "The file type of the CoverArt should have been png"
+                );
+            }
+            Err(err) => {
+                assert!(false, "Error: {err:?}");
+            }
+        }
+    }
+
+    #[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",

src/lib.rs

@@ -5,10 +5,11 @@ pub mod types;
 
 pub mod test_util {
     pub mod util {
-        use std::io::{self, Write};
+        use std::io::{self, Read, Write};
 
         use rand::Rng;
 
+
         // Function to save a Vec<u8> to a file
         pub fn save_bytes_to_file(bytes: &[u8], file_path: &String) -> io::Result<()> {
             let file = std::path::Path::new(file_path);
@@ -39,6 +40,19 @@ pub mod test_util {
             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> {
             match path_buf(directory, filename) {
                 Ok(pf) => Ok(pf.exists()),