Next release (#14)

Reviewed-on: #14

Cargo.toml

@@ -1,9 +1,12 @@
 [package]
 name = "icarus_meta"
-version = "0.1.0"
+version = "0.1.30"
 edition = "2024"
 rust-version = "1.86"
 
 [dependencies]
 lofty = { version = "0.22.3" }
 icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.4.3" }
+
+[dev-dependencies]
+tempfile = { version = "3.19.1" }

src/lib.rs

@@ -1,123 +1,2 @@
-pub mod meta_type {
+pub mod meta;
-    pub enum Type {
+pub mod types;
-        Title,
-        Artist,
-        Album,
-        Genre,
-        Year,
-        Track,
-    }
-}
-
-pub mod meta_next {
-    use lofty::file::AudioFile;
-
-    use super::*;
-
-    fn get_type(t: meta_type::Type) -> Result<String, std::io::Error> {
-        match t {
-            meta_type::Type::Title => Ok("TITLE".to_owned()),
-            meta_type::Type::Artist => Ok("ARTIST".to_owned()),
-            meta_type::Type::Album => Ok("ALBUM".to_owned()),
-            meta_type::Type::Genre => Ok("GENRE".to_owned()),
-            meta_type::Type::Year => Ok("YEAR".to_owned()),
-            meta_type::Type::Track => Ok("TRACK".to_owned()),
-        }
-    }
-
-    pub fn get_meta(t: meta_type::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 fn test_file_directory() -> String {
-            String::from("tests/sample_tracks3")
-        }
-    }
-
-    #[test]
-    fn test_get_title() {
-        let filename = String::from("track01.flac");
-        let dir = util::test_file_directory();
-
-        match file_exists(&dir, &filename) {
-            Ok(_) => {
-                let filepath = get_full_path(&dir, &filename).unwrap();
-
-                match meta_next::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);
-                    }
-                }
-            }
-            Err(err) => {
-                assert!(false, "Error: File does not exist {:?}", err.to_string());
-            }
-        };
-    }
-}

src/types.rs

@@ -0,0 +1,30 @@
+pub enum Type {
+    Title,
+    Artist,
+    Album,
+    AlbumArtist,
+    Genre,
+    Date,
+    Track,
+    Disc,
+    TrackCount,
+    DiscCount,
+}
+
+pub mod access {
+
+    pub fn get_type(t: super::Type) -> Result<String, std::io::Error> {
+        match t {
+            super::Type::Title => Ok("TITLE".to_owned()),
+            super::Type::Artist => Ok("ARTIST".to_owned()),
+            super::Type::Album => Ok("ALBUM".to_owned()),
+            super::Type::AlbumArtist => Ok("ALBUMARTIST".to_owned()),
+            super::Type::Genre => Ok("GENRE".to_owned()),
+            super::Type::Date => Ok("DATE".to_owned()),
+            super::Type::Track => Ok("TRACKNUMBER".to_owned()),
+            super::Type::Disc => Ok("DISCNUMBER".to_owned()),
+            super::Type::TrackCount => Ok("TRACKCOUNT".to_owned()),
+            super::Type::DiscCount => Ok("DISCCOUNT".to_owned()),
+        }
+    }
+}