tsk-45: Added macros of FileType

src/detection/mod.rs

@@ -6,26 +6,3 @@ pub struct FileType {
     pub mime: String,
     pub file_type: String,
 }
-
-
-/// Initializes a FileType given a filetype passed.
-pub fn init_filetype(filetype: &str) -> Result<FileType, std::io::Error> {
-    if filetype == song::constants::FLAC_TYPE {
-        Ok(FileType {
-            mime: String::from(song::constants::mime::FLAC),
-            file_type: String::from(song::constants::FLAC_TYPE),
-        })
-    } else if filetype == coverart::constants::PNG_TYPE {
-        Ok(FileType {
-            mime: String::from(coverart::constants::mime::PNG),
-            file_type: String::from(coverart::constants::PNG_TYPE),
-        })
-    } else if filetype == coverart::constants::JPEG_TYPE || filetype == coverart::constants::JPG_TYPE {
-        Ok(FileType {
-            mime: String::from(coverart::constants::mime::JPEG),
-            file_type: String::from(coverart::constants::JPEG_TYPE),
-        })
-    } else {
-        Err(std::io::Error::other(format!("Unsupported FileType: {filetype:?}")))
-    }
-}

src/detection/song.rs

@@ -20,7 +20,7 @@ pub fn file_type_from_filepath(
 }
 
 /// Gets the file type of a Song given it's data
-pub fn file_type_from_data(data: &[u8]) -> Result<crate::detection::FileType, std::io::Error> {
+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();