Added more fields (#18)

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

.gitea/workflows/workflow.yml

@@ -11,22 +11,6 @@ on:
       - devel
 
 jobs:
-  install_dependencies:
-    # runs-on: ubuntu-latest # Or similar Debian/Ubuntu based runner
-    runs-on: ubuntu-24.04
-    container: rust:1.86.0 # Example using the official Rust image (Debian based)
-    steps:
-      - name: Install FFmpeg development libraries
-        run: |
-          apt-get update -y
-          apt-get install -y --no-install-recommends \
-            libavutil-dev \
-            libavformat-dev \
-            libavcodec-dev \
-            libswscale-dev \
-            # Add other ffmpeg dev packages if needed by your specific crate
-          rm -rf /var/lib/apt/lists/* # Clean up
-
   check:
     name: Check
     runs-on: ubuntu-24.04
@@ -116,5 +100,4 @@ jobs:
           ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
           eval $(ssh-agent -s)
           ssh-add -v ~/.ssh/gitlab_deploy_key
-          cargo build --release
-
+          cargo build --release

Cargo.toml

@@ -5,5 +5,5 @@ edition = "2024"
 rust-version = "1.86"
 
 [dependencies]
-metadata = { version = "0.1.10" }
+lofty = { version = "0.22.3" }
 icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.4.3" }

src/lib.rs

@@ -1,119 +1,2 @@
-pub mod meta_type {
-    pub enum Type {
-        Title,
-        Artist,
-        Album,
-        Genre,
-        Year,
-        Track,
-    }
-}
-
-pub mod meta_nouveaou {
-    use super::*;
-
-    pub fn get_meta(t: meta_type::Type, filepath: &String) -> Result<String, std::io::Error> {
-        match t {
-            meta_type::Type::Title => match new_meta(filepath) {
-                Ok(metaa) => match get_val(t, metaa.tags) {
-                    Ok(val) => Ok(val),
-                    Err(err) => Err(err),
-                },
-                Err(err) => Err(err),
-            },
-            meta_type::Type::Artist => match new_meta(filepath) {
-                Ok(metaa) => match get_val(t, metaa.tags) {
-                    Ok(val) => Ok(val),
-                    Err(err) => Err(err),
-                },
-                Err(err) => Err(err),
-            },
-            meta_type::Type::Album => match new_meta(filepath) {
-                Ok(metaa) => match get_val(t, metaa.tags) {
-                    Ok(val) => Ok(val),
-                    Err(err) => Err(err),
-                },
-                Err(err) => Err(err),
-            },
-            meta_type::Type::Genre => match new_meta(filepath) {
-                Ok(metaa) => match get_val(t, metaa.tags) {
-                    Ok(val) => Ok(val),
-                    Err(err) => Err(err),
-                },
-                Err(err) => Err(err),
-            },
-            meta_type::Type::Year => match new_meta(filepath) {
-                Ok(metaa) => match get_val(t, metaa.tags) {
-                    Ok(val) => Ok(val),
-                    Err(err) => Err(err),
-                },
-                Err(err) => Err(err),
-            },
-            meta_type::Type::Track => match new_meta(filepath) {
-                Ok(metaa) => match get_val(t, metaa.tags) {
-                    Ok(val) => Ok(val),
-                    Err(err) => Err(err),
-                },
-                Err(err) => Err(err),
-            },
-        }
-    }
-
-    fn get_type(t: meta_type::Type) -> Result<String, std::io::Error> {
-        match t {
-            meta_type::Type::Title => Ok("TITLE".to_string()),
-            meta_type::Type::Artist => Ok("ARTIST".to_string()),
-            meta_type::Type::Album => Ok("".to_string()),
-            meta_type::Type::Genre => Ok("".to_string()),
-            meta_type::Type::Year => Ok("".to_string()),
-            meta_type::Type::Track => Ok("".to_string()),
-        }
-    }
-
-    fn get_val(t: meta_type::Type, tags: Vec<(String, String)>) -> Result<String, std::io::Error> {
-        let type_ma: String = get_type(t).unwrap();
-        for tag in tags {
-            if tag.0 == type_ma {
-                return Ok(tag.1);
-            }
-        }
-
-        Err(std::io::Error::new(
-            std::io::ErrorKind::InvalidInput,
-            "Invalid",
-        ))
-    }
-
-    fn new_meta(filepath: &String) -> Result<metadata::MediaFileMetadata, std::io::Error> {
-        let path = std::path::Path::new(&filepath);
-        metadata::MediaFileMetadata::new(&path)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_get_title() {
-        let filename = String::from("track01.flac");
-        let dir = String::from("tests/sample_tracks3");
-        let dir_path = std::path::Path::new(&dir);
-        let full_path = dir_path.join(filename);
-
-        println!("Path: {:?}", full_path);
-
-        assert!(full_path.exists(), "Path does not exists {:?}", full_path);
-        let filepath = full_path.display().to_string();
-
-        match meta_nouveaou::get_meta(meta_type::Type::Title, &filepath) {
-            Ok(title) => {
-                let found = title == "Just roll it";
-                assert!(found, "Meta information was not found {:?}", title);
-            }
-            Err(err) => {
-                assert!(false, "Error: {:?}", err);
-            }
-        }
-    }
-}
+pub mod meta;
+pub mod types;

src/meta.rs

@@ -0,0 +1,297 @@
+use lofty::file::AudioFile;
+
+use crate::types;
+
+fn get_type(t: types::Type) -> Result<String, std::io::Error> {
+    match t {
+        types::Type::Title => Ok("TITLE".to_owned()),
+        types::Type::Artist => Ok("ARTIST".to_owned()),
+        types::Type::Album => Ok("ALBUM".to_owned()),
+        types::Type::AlbumArtist => Ok("ALBUMARTIST".to_owned()),
+        types::Type::Genre => Ok("GENRE".to_owned()),
+        types::Type::Date => Ok("DATE".to_owned()),
+        types::Type::Track => Ok("TRACKNUMBER".to_owned()),
+        types::Type::Disc => Ok("DISCNUMBER".to_owned()),
+    }
+}
+
+pub fn get_meta(t: types::Type, filepath: &String) -> Result<String, std::io::Error> {
+    match std::fs::File::open(filepath) {
+        Ok(mut content) => {
+            match lofty::flac::FlacFile::read_from(&mut content, lofty::config::ParseOptions::new())
+            {
+                Ok(flac_file) => match flac_file.vorbis_comments() {
+                    Some(vb) => {
+                        let type_str: String = get_type(t).unwrap();
+                        match vb.get(&type_str) {
+                            Some(val) => Ok(val.to_owned()),
+                            None => Err(std::io::Error::new(
+                                std::io::ErrorKind::InvalidData,
+                                "Could not get tag data",
+                            )),
+                        }
+                    }
+                    None => Err(std::io::Error::new(
+                        std::io::ErrorKind::InvalidData,
+                        "No tags found",
+                    )),
+                },
+                Err(err) => Err(std::io::Error::new(
+                    std::io::ErrorKind::InvalidData,
+                    err.to_string(),
+                )),
+            }
+        }
+        Err(err) => Err(err),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use util::{file_exists, get_full_path};
+
+    use super::*;
+
+    mod util {
+        pub fn get_full_path(
+            directory: &String,
+            filename: &String,
+        ) -> Result<String, std::io::Error> {
+            match path_buf(directory, filename) {
+                Ok(pf) => Ok(pf.display().to_string()),
+                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()),
+                Err(err) => Err(err),
+            }
+        }
+
+        fn path_buf(
+            directory: &String,
+            filename: &String,
+        ) -> Result<std::path::PathBuf, std::io::Error> {
+            let dir_path = std::path::Path::new(&directory);
+            Ok(dir_path.join(filename))
+        }
+
+        pub const TESTFILEDIRECTORY: &str = "tests/sample_tracks3";
+
+        pub fn get_filename(track: i32) -> String {
+            let mut filename = String::from("track");
+
+            if track < 10 {
+                filename += "0";
+                filename += &track.to_string();
+            } else {
+                filename += &track.to_string();
+            }
+
+            filename += ".flac";
+
+            filename
+        }
+    }
+
+    #[test]
+    fn test_get_title() {
+        let filename = util::get_filename(1);
+        let dir = String::from(util::TESTFILEDIRECTORY);
+
+        match file_exists(&dir, &filename) {
+            Ok(_) => {
+                let filepath = get_full_path(&dir, &filename).unwrap();
+
+                match get_meta(types::Type::Title, &filepath) {
+                    Ok(title) => {
+                        let found = title == "Just roll it";
+                        assert!(found, "Meta information was not found {:?}", title);
+                    }
+                    Err(err) => {
+                        assert!(false, "Error: {:?}", err);
+                    }
+                }
+            }
+            Err(err) => {
+                assert!(false, "Error: File does not exist {:?}", err.to_string());
+            }
+        };
+    }
+
+    #[test]
+    fn test_get_artist() {
+        let filename = util::get_filename(1);
+        let dir = String::from(util::TESTFILEDIRECTORY);
+
+        match file_exists(&dir, &filename) {
+            Ok(_) => {
+                let filepath = get_full_path(&dir, &filename).unwrap();
+
+                match get_meta(types::Type::Artist, &filepath) {
+                    Ok(artist) => {
+                        let found = artist == "KD";
+                        assert!(found, "Meta information was not found {:?}", artist);
+                    }
+                    Err(err) => {
+                        assert!(false, "Error: {:?}", err);
+                    }
+                }
+            }
+            Err(err) => {
+                assert!(false, "Error: File does not exist {:?}", err.to_string());
+            }
+        };
+    }
+
+    #[test]
+    fn test_get_album() {
+        let filename = util::get_filename(1);
+        let dir = String::from(util::TESTFILEDIRECTORY);
+
+        match file_exists(&dir, &filename) {
+            Ok(_) => {
+                let filepath = get_full_path(&dir, &filename).unwrap();
+
+                match get_meta(types::Type::Album, &filepath) {
+                    Ok(album) => {
+                        let found = album == "Sample Tracks 3";
+                        assert!(found, "Meta information was not found {:?}", album);
+                    }
+                    Err(err) => {
+                        assert!(false, "Error: {:?}", err);
+                    }
+                }
+            }
+            Err(err) => {
+                assert!(false, "Error: File does not exist {:?}", err.to_string());
+            }
+        };
+    }
+
+    #[test]
+    fn test_get_album_artist() {
+        let filename = util::get_filename(1);
+        let dir = String::from(util::TESTFILEDIRECTORY);
+
+        match file_exists(&dir, &filename) {
+            Ok(_) => {
+                let filepath = get_full_path(&dir, &filename).unwrap();
+
+                match get_meta(types::Type::AlbumArtist, &filepath) {
+                    Ok(album_artist) => {
+                        let found = album_artist == "KD";
+                        assert!(found, "Meta information was not found {:?}", album_artist);
+                    }
+                    Err(err) => {
+                        assert!(false, "Error: {:?}", err);
+                    }
+                }
+            }
+            Err(err) => {
+                assert!(false, "Error: File does not exist {:?}", err.to_string());
+            }
+        };
+    }
+
+    #[test]
+    fn test_get_genre() {
+        let filename = util::get_filename(1);
+        let dir = String::from(util::TESTFILEDIRECTORY);
+
+        match file_exists(&dir, &filename) {
+            Ok(_) => {
+                let filepath = get_full_path(&dir, &filename).unwrap();
+
+                match get_meta(types::Type::Genre, &filepath) {
+                    Ok(genre) => {
+                        let found = genre == "Metal";
+                        assert!(found, "Meta information was not found {:?}", genre);
+                    }
+                    Err(err) => {
+                        assert!(false, "Error: {:?}", err);
+                    }
+                }
+            }
+            Err(err) => {
+                assert!(false, "Error: File does not exist {:?}", err.to_string());
+            }
+        };
+    }
+    #[test]
+    fn test_get_year() {
+        let filename = util::get_filename(1);
+        let dir = String::from(util::TESTFILEDIRECTORY);
+
+        match file_exists(&dir, &filename) {
+            Ok(_) => {
+                let filepath = get_full_path(&dir, &filename).unwrap();
+
+                match get_meta(types::Type::Date, &filepath) {
+                    Ok(date) => {
+                        let found = date == "2025-04-11";
+                        assert!(found, "Meta information was not found {:?}", date);
+                    }
+                    Err(err) => {
+                        assert!(false, "Error: {:?}", err);
+                    }
+                }
+            }
+            Err(err) => {
+                assert!(false, "Error: File does not exist {:?}", err.to_string());
+            }
+        };
+    }
+
+    #[test]
+    fn test_get_track() {
+        let filename = util::get_filename(1);
+        let dir = String::from(util::TESTFILEDIRECTORY);
+
+        match file_exists(&dir, &filename) {
+            Ok(_) => {
+                let filepath = get_full_path(&dir, &filename).unwrap();
+
+                match get_meta(types::Type::Track, &filepath) {
+                    Ok(track) => {
+                        let found = track == "1";
+                        assert!(found, "Meta information was not found {:?}", track);
+                    }
+                    Err(err) => {
+                        assert!(false, "Error: {:?}", err);
+                    }
+                }
+            }
+            Err(err) => {
+                assert!(false, "Error: File does not exist {:?}", err.to_string());
+            }
+        };
+    }
+
+    #[test]
+    fn test_get_disc() {
+        let filename = util::get_filename(1);
+        let dir = String::from(util::TESTFILEDIRECTORY);
+
+        match file_exists(&dir, &filename) {
+            Ok(_) => {
+                let filepath = get_full_path(&dir, &filename).unwrap();
+
+                match get_meta(types::Type::Disc, &filepath) {
+                    Ok(disc) => {
+                        let found = disc == "1";
+                        assert!(found, "Meta information was not found {:?}", disc);
+                    }
+                    Err(err) => {
+                        assert!(false, "Error: {:?}", err);
+                    }
+                }
+            }
+            Err(err) => {
+                assert!(false, "Error: File does not exist {:?}", err.to_string());
+            }
+        };
+    }
+}

src/types.rs

@@ -0,0 +1,10 @@
+pub enum Type {
+    Title,
+    Artist,
+    Album,
+    AlbumArtist,
+    Genre,
+    Date,
+    Track,
+    Disc,
+}