tsk-45: Code formatting

src/detection/coverart.rs

@@ -4,11 +4,11 @@ pub fn file_type_from_filepath(
 ) -> Result<crate::detection::FileType, std::io::Error> {
     match imghdr::from_file(filepath) {
         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),
         }),
         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),
         }),
         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> {
     match imghdr::from_bytes(data) {
         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),
         }),
         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),
         }),
         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 JPEG_TYPE: &str = "jpeg";
     pub const JPG_TYPE: &str = "jpg";
+
+    pub mod mime {
+        pub const JPEG: &str = "image/jpeg";
+        pub const PNG: &str = "image/png";
+    }
 }
 
 #[cfg(test)]

src/detection/song.rs

@@ -1,10 +1,11 @@
+/// Gets the file type of a Song from it's path
 pub fn file_type_from_filepath(
     filepath: &str,
 ) -> Result<crate::detection::FileType, std::io::Error> {
     match infer::get_from_path(filepath) {
         Ok(Some(kind)) => {
             let mime = kind.mime_type();
-            if mime == "audio/x-flac" {
+            if mime == constants::mime::FLAC {
                 Ok(crate::detection::FileType {
                     mime: String::from(mime),
                     file_type: String::from(constants::FLAC_TYPE),
@@ -18,6 +19,72 @@ pub fn file_type_from_filepath(
     }
 }
 
+/// Gets the file type of a Song given it's data
+pub fn file_type_from_data(data: &Vec<u8>) -> Result<crate::detection::FileType, std::io::Error> {
+    match infer::get(data) {
+        Some(kind) => {
+            let mime = kind.mime_type();
+            if mime == constants::mime::FLAC {
+                Ok(crate::detection::FileType {
+                    mime: String::from(mime),
+                    file_type: String::from(constants::FLAC_TYPE),
+                })
+            } else {
+                Err(std::io::Error::other("Unsupported file type"))
+            }
+        }
+        None => Err(std::io::Error::other("File type not determined")),
+    }
+}
+
 pub mod constants {
     pub const FLAC_TYPE: &str = "flac";
+
+    pub mod mime {
+        pub const FLAC: &str = "audio/x-flac";
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_song_file_type() {
+        let directory = String::from(crate::test_util::util::TESTFILEDIRECTORY);
+        let filename = String::from("track01.flac");
+        let filepath = format!("{directory}/{filename}");
+
+        match super::file_type_from_filepath(&filepath) {
+            Ok(filetype) => {
+                assert_eq!(
+                    filetype.file_type,
+                    crate::detection::song::constants::FLAC_TYPE,
+                    "Types do not match"
+                )
+            }
+            Err(err) => {
+                assert!(false, "Error: {err:?}")
+            }
+        }
+    }
+
+    #[test]
+    fn test_song_file_type_from_data() {
+        let directory = String::from(crate::test_util::util::TESTFILEDIRECTORY);
+        let filename = String::from("track01.flac");
+        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.file_type,
+                    crate::detection::song::constants::FLAC_TYPE,
+                    "Types do not match"
+                )
+            }
+            Err(err) => {
+                assert!(false, "Error: {err:?}")
+            }
+        }
+    }
 }