tsk-45: Warning fix

Reviewed-on: #47
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>

.gitea/workflows/tag_release.yml

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

Cargo.lock

@@ -10,9 +10,15 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "bitflags"
-version = "2.9.4"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "byteorder"
@@ -21,10 +27,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
-name = "cfg-if"
-version = "1.0.3"
+name = "cfb"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"
+dependencies = [
+ "byteorder",
+ "fnv",
+ "uuid",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "crc32fast"
@@ -68,25 +85,59 @@ dependencies = [
 ]
 
 [[package]]
-name = "getrandom"
-version = "0.3.3"
+name = "fnv"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "libc",
  "r-efi",
- "wasi",
+ "wasip2",
 ]
 
 [[package]]
 name = "icarus_meta"
-version = "0.4.0"
+version = "0.4.3"
 dependencies = [
+ "imghdr",
+ "infer",
  "lofty",
+ "rand",
  "tempfile",
 ]
 
+[[package]]
+name = "imghdr"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8b35f3ad95576ac81603375dfe47a0450b70a368aa34d2b6e5bb0a0d7f02428"
+
+[[package]]
+name = "infer"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7"
+dependencies = [
+ "cfb",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.177"
@@ -162,6 +213,15 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.101"
@@ -186,6 +246,35 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom",
+]
+
 [[package]]
 name = "rustix"
 version = "1.1.2"
@@ -199,6 +288,12 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
 [[package]]
 name = "simd-adler32"
 version = "0.3.7"
@@ -207,9 +302,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
 [[package]]
 name = "syn"
-version = "2.0.106"
+version = "2.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -236,12 +331,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 
 [[package]]
-name = "wasi"
-version = "0.14.7+wasi-0.2.4"
+name = "uuid"
+version = "1.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 dependencies = [
- "wasip2",
+ "js-sys",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -253,6 +349,65 @@ dependencies = [
  "wit-bindgen",
 ]
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+dependencies = [
+ "unicode-ident",
+]
+
 [[package]]
 name = "windows-link"
 version = "0.2.1"
@@ -273,3 +428,23 @@ name = "wit-bindgen"
 version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
+[[package]]
+name = "zerocopy"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]

Cargo.toml

@@ -1,11 +1,14 @@
 [package]
 name = "icarus_meta"
-version = "0.4.0"
+version = "0.4.3"
 edition = "2024"
 rust-version = "1.90"
 
 [dependencies]
 lofty = { version = "0.22.4" }
+imghdr = { version = "0.7.0" }
+infer = { version = "0.19.0" }
+rand = { version = "0.9.2" }
 
 [dev-dependencies]
 tempfile = { version = "3.23.0" }

src/detection/coverart.rs

@@ -0,0 +1,89 @@
+/// Gets the file type of a CoverArt given it's path
+pub fn file_type_from_filepath(
+    filepath: &str,
+) -> 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),
+            file_type: String::from(constants::JPEG_TYPE),
+        }),
+        Ok(Some(imghdr::Type::Png)) => Ok(crate::detection::FileType {
+            mime: String::from(constants::mime::PNG),
+            file_type: String::from(constants::PNG_TYPE),
+        }),
+        Ok(None) => Err(std::io::Error::other("Image file not supported")),
+        Err(err) => Err(err),
+        _ => Err(std::io::Error::other("Image file not supported")),
+    }
+}
+
+/// Gets the file type of a CoverArt given it's data
+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),
+            file_type: String::from(constants::JPEG_TYPE),
+        }),
+        Some(imghdr::Type::Png) => Ok(crate::detection::FileType {
+            mime: String::from(constants::mime::PNG),
+            file_type: String::from(constants::PNG_TYPE),
+        }),
+        None => Err(std::io::Error::other("Image file not supported")),
+        _ => Err(std::io::Error::other("Image file not supported")),
+    }
+}
+
+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)]
+mod tests {
+    #[test]
+    fn test_coverart_file_type() {
+        let directory = String::from(crate::test_util::util::TESTFILEDIRECTORY);
+        let filename = String::from("Sample Tracks 3.png");
+        let filepath = format!("{directory}/{filename}");
+
+        match super::file_type_from_filepath(&filepath) {
+            Ok(filetype) => {
+                assert_eq!(
+                    filetype.file_type,
+                    super::constants::PNG_TYPE,
+                    "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.file_type,
+                    super::constants::PNG_TYPE,
+                    "The file type of the CoverArt should have been png"
+                );
+            }
+            Err(err) => {
+                assert!(false, "Error: {err:?}");
+            }
+        }
+    }
+}

src/detection/mod.rs

@@ -0,0 +1,8 @@
+pub mod coverart;
+pub mod song;
+
+#[derive(Debug, Default)]
+pub struct FileType {
+    pub mime: String,
+    pub file_type: String,
+}

src/detection/song.rs

@@ -0,0 +1,90 @@
+/// 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 {
+                Ok(crate::detection::FileType {
+                    mime: String::from(mime),
+                    file_type: String::from(constants::FLAC_TYPE),
+                })
+            } else {
+                Err(std::io::Error::other("Unsupported file type"))
+            }
+        }
+        Ok(None) => Err(std::io::Error::other("File type not determined")),
+        Err(err) => Err(err),
+    }
+}
+
+/// 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/lib.rs

@@ -1,10 +1,13 @@
+pub mod detection;
 pub mod meta;
 pub mod properties;
 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<()> {
@@ -36,6 +39,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()),
@@ -43,6 +59,25 @@ pub mod test_util {
             }
         }
 
+        pub fn generate_filename() -> Result<String, std::io::Error> {
+            let mut filename = String::from("track-");
+            let length = 20;
+            let characters = "abcdef0123456789";
+            let amount_of_characters = characters.len() - 1;
+            let mut rng = rand::rng();
+
+            for _ in 0..length {
+                let index = rng.random_range(0..=amount_of_characters);
+                let random_c = characters.chars().nth(index);
+
+                if let Some(c) = random_c {
+                    filename.push(c);
+                }
+            }
+
+            Ok(format!("{filename}.flac"))
+        }
+
         fn path_buf(
             directory: &String,
             filename: &String,

src/meta.rs

@@ -544,7 +544,7 @@ mod tests {
 
             let temp_file = tempfile::tempdir().expect("Could not create test directory");
             let test_dir = String::from(temp_file.path().to_str().unwrap());
-            let test_filename = String::from("track08.flac");
+            let test_filename = util::generate_filename().unwrap();
             let new_filepath = test_dir + "/" + &test_filename;
 
             match file_exists(&dir, &filename) {
@@ -597,7 +597,7 @@ mod tests {
 
             let temp_file = tempfile::tempdir().expect("Could not create test directory");
             let test_dir = String::from(temp_file.path().to_str().unwrap());
-            let test_filename = String::from("track08.flac");
+            let test_filename = util::generate_filename().unwrap();
             let new_filepath = test_dir + "/" + &test_filename;
 
             match file_exists(&dir, &filename) {
@@ -806,7 +806,7 @@ mod tests {
 
             let temp_file = tempfile::tempdir().expect("Could not create test directory");
             let test_dir = String::from(temp_file.path().to_str().unwrap());
-            let test_filename = String::from("track08.flac");
+            let test_filename = util::generate_filename().unwrap();
             let new_filepath = test_dir + "/" + &test_filename;
 
             match file_exists(&dir, &filename) {
@@ -907,7 +907,7 @@ mod tests {
 
             let temp_file = tempfile::tempdir().expect("Could not create test directory");
             let test_dir = String::from(temp_file.path().to_str().unwrap());
-            let test_filename = String::from("track08.flac");
+            let test_filename = util::generate_filename().unwrap();
             let new_filepath = test_dir + "/" + &test_filename;
 
             match file_exists(&dir, &filename) {
@@ -1021,7 +1021,7 @@ mod tests {
 
             let temp_file = tempfile::tempdir().expect("Could not create test directory");
             let test_dir = String::from(temp_file.path().to_str().unwrap());
-            let test_filename = String::from("track08.flac");
+            let test_filename = util::generate_filename().unwrap();
             let new_filepath = test_dir + "/" + &test_filename;
 
             match file_exists(&dir, &filename) {