tsk-45: Version bump

.gitea/workflows/tag_release.yml

@@ -4,9 +4,6 @@ on:
   push:
     branches:
       - main
-  pull_request:
-    branches:
-      - main
 
 jobs:
   release:

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(constants::mime::JPEG),
+            mime: String::from("image/jpeg"),
             file_type: String::from(constants::JPEG_TYPE),
         }),
         Ok(Some(imghdr::Type::Png)) => Ok(crate::detection::FileType {
-            mime: String::from(constants::mime::PNG),
+            mime: String::from("image/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(constants::mime::JPEG),
+            mime: String::from("image/jpeg"),
             file_type: String::from(constants::JPEG_TYPE),
         }),
         Some(imghdr::Type::Png) => Ok(crate::detection::FileType {
-            mime: String::from(constants::mime::PNG),
+            mime: String::from("image/png"),
             file_type: String::from(constants::PNG_TYPE),
         }),
         None => Err(std::io::Error::other("Image file not supported")),
@@ -37,11 +37,6 @@ 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/mod.rs

@@ -1,31 +1,7 @@
 pub mod coverart;
 pub mod song;
 
-#[derive(Debug, Default)]
 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

@@ -1,11 +1,10 @@
-/// 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 == constants::mime::FLAC {
+            if mime == "audio/x-flac" {
                 Ok(crate::detection::FileType {
                     mime: String::from(mime),
                     file_type: String::from(constants::FLAC_TYPE),
@@ -19,72 +18,6 @@ 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> {
-    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:?}")
-            }
-        }
-    }
 }