tsk-45: Code formatting

.gitea/workflows/tag_release.yml

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

Cargo.lock

@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "icarus_meta"
-version = "0.4.4"
+version = "0.4.2"
 dependencies = [
  "imghdr",
  "infer",

Cargo.toml

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

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,34 +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:?}")
-            }
-        }
-    }
 }

src/properties.rs

@@ -1,4 +1,20 @@
-pub mod properties;
+use lofty::file::AudioFile;
+
+pub fn get_duration(song_path: &String) -> Result<std::time::Duration, std::io::Error> {
+    match std::fs::File::open(song_path) {
+        Ok(mut content) => {
+            match lofty::flac::FlacFile::read_from(&mut content, lofty::config::ParseOptions::new())
+            {
+                Ok(flac_file) => {
+                    let properties = flac_file.properties();
+                    Ok(properties.duration())
+                }
+                Err(err) => Err(std::io::Error::other(err.to_string())),
+            }
+        }
+        Err(err) => Err(err),
+    }
+}
 
 #[cfg(test)]
 mod tests {
@@ -12,7 +28,7 @@ mod tests {
         match test_util::util::file_exists(&dir, &filename) {
             Ok(_) => {
                 let filepath = test_util::util::get_full_path(&dir, &filename).unwrap();
-                match super::properties::get_duration(&filepath) {
+                match super::get_duration(&filepath) {
                     Ok(duration) => {
                         let song_duration: u64 = 41;
                         let fetched_song_duration = duration.as_secs();

src/properties/properties.rs

@@ -1,17 +0,0 @@
-use lofty::file::AudioFile;
-
-pub fn get_duration(song_path: &String) -> Result<std::time::Duration, std::io::Error> {
-    match std::fs::File::open(song_path) {
-        Ok(mut content) => {
-            match lofty::flac::FlacFile::read_from(&mut content, lofty::config::ParseOptions::new())
-            {
-                Ok(flac_file) => {
-                    let properties = flac_file.properties();
-                    Ok(properties.duration())
-                }
-                Err(err) => Err(std::io::Error::other(err.to_string())),
-            }
-        }
-        Err(err) => Err(err),
-    }
-}