Compare commits

..

3 Commits

Author SHA1 Message Date
8f55b28fbe Added function to set value for metadata for known types (#29)
All checks were successful
Release Tagging / release (push) Successful in 28s
Rust Build / Check (push) Successful in 28s
Rust Build / Check (pull_request) Successful in 25s
Rust Build / Test Suite (push) Successful in 27s
Rust Build / Rustfmt (push) Successful in 23s
Rust Build / Clippy (push) Successful in 27s
Rust Build / build (push) Successful in 32s
Rust Build / Test Suite (pull_request) Successful in 28s
Rust Build / Rustfmt (pull_request) Successful in 23s
Rust Build / Clippy (pull_request) Successful in 27s
Rust Build / build (pull_request) Successful in 31s
Reviewed-on: #29
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-06-21 20:40:15 +00:00
859003fc65 Set meta bug fix (#27)
All checks were successful
Release Tagging / release (push) Successful in 28s
Rust Build / Check (push) Successful in 27s
Rust Build / Test Suite (push) Successful in 27s
Rust Build / Rustfmt (push) Successful in 24s
Rust Build / Clippy (push) Successful in 27s
Rust Build / build (push) Successful in 34s
Rust Build / Check (pull_request) Successful in 25s
Rust Build / Test Suite (pull_request) Successful in 25s
Rust Build / Rustfmt (pull_request) Successful in 22s
Rust Build / Clippy (pull_request) Successful in 27s
Rust Build / build (pull_request) Successful in 30s
Reviewed-on: #27
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-06-21 01:01:53 +00:00
000639b0f8 added_types (#26)
All checks were successful
Release Tagging / release (push) Successful in 32s
Rust Build / Check (push) Successful in 44s
Rust Build / Test Suite (push) Successful in 59s
Rust Build / Rustfmt (push) Successful in 32s
Rust Build / Clippy (push) Successful in 35s
Rust Build / build (push) Successful in 43s
Rust Build / Check (pull_request) Successful in 23s
Rust Build / Test Suite (pull_request) Successful in 25s
Rust Build / Rustfmt (pull_request) Successful in 21s
Rust Build / Clippy (pull_request) Successful in 26s
Rust Build / build (pull_request) Successful in 29s
Reviewed-on: #26
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-04-19 21:19:01 +00:00
3 changed files with 224 additions and 3 deletions

View File

@@ -1,6 +1,6 @@
[package]
name = "icarus_meta"
version = "0.1.20"
version = "0.1.30"
edition = "2024"
rust-version = "1.86"

View File

@@ -135,9 +135,11 @@ pub mod coverart {
}
pub mod metadata {
// TODO: Move this at the end after the non-std crates
use crate::types;
use lofty::file::AudioFile;
use lofty::tag::Accessor;
use lofty::tag::TagExt;
pub fn get_meta(t: types::Type, filepath: &String) -> Result<String, std::io::Error> {
match std::fs::File::open(filepath) {
@@ -211,9 +213,22 @@ pub mod metadata {
types::Type::Track => {
vb.set_track(pre_value.parse().unwrap());
}
types::Type::TrackCount => {
vb.set_track_total(pre_value.parse().unwrap());
}
types::Type::DiscCount => {
vb.set_disk_total(pre_value.parse().unwrap());
}
};
Ok(value.to_owned())
match vb.save_to_path(filepath, lofty::config::WriteOptions::default())
{
Ok(_) => Ok(value.to_owned()),
Err(err) => Err(std::io::Error::new(
std::io::ErrorKind::InvalidData,
err.to_string(),
)),
}
}
None => Err(std::io::Error::new(
std::io::ErrorKind::InvalidData,
@@ -229,6 +244,23 @@ pub mod metadata {
Err(err) => Err(err),
}
}
pub fn parse_value(value: types::MetadataType) -> String {
match value {
types::MetadataType::String(val) => val,
types::MetadataType::Int(val) => val.to_string(),
}
}
pub fn set_meta_value(
t: types::Type,
filepath: &String,
value: types::MetadataType,
) -> Result<String, std::io::Error> {
let parsed_val = parse_value(value);
set_meta(t, filepath, &parsed_val)
}
}
#[cfg(test)]
@@ -510,6 +542,56 @@ mod tests {
}
};
}
#[test]
fn test_get_track_total() {
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::TrackCount, &filepath) {
Ok(track_total) => {
let found = track_total == "3";
assert!(found, "Meta information was not found {:?}", track_total);
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: File does not exist {:?}", err.to_string());
}
};
}
#[test]
fn test_get_disc_total() {
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::DiscCount, &filepath) {
Ok(disc_total) => {
let found = disc_total == "1";
assert!(found, "Meta information was not found {:?}", disc_total);
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: File does not exist {:?}", err.to_string());
}
};
}
}
mod set {
@@ -879,6 +961,121 @@ mod tests {
}
};
}
#[test]
fn test_set_track_total() {
let filename = util::get_filename(1);
let dir = String::from(util::TESTFILEDIRECTORY);
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 new_filepath = test_dir + "/" + &test_filename;
match file_exists(&dir, &filename) {
Ok(_) => {
let filepath = get_full_path(&dir, &filename).unwrap();
match util::copy_file(&filepath, &new_filepath) {
Ok(_o) => match get_meta(types::Type::TrackCount, &filepath) {
Ok(track_total) => {
let found = track_total == "3";
assert!(found, "Meta information was not found {:?}", track_total);
let new_track_total = String::from("5");
match set_meta(
types::Type::TrackCount,
&new_filepath,
&new_track_total,
) {
Ok(m) => {
assert_eq!(
new_track_total, m,
"New track does not match {:?}",
m
);
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
},
Err(err) => {
assert!(
false,
"Error: {:?} source {:?} destination {:?}",
err, filepath, new_filepath
);
}
};
}
Err(err) => {
assert!(false, "Error: File does not exist {:?}", err.to_string());
}
};
}
#[test]
fn test_set_disc_total() {
let filename = util::get_filename(1);
let dir = String::from(util::TESTFILEDIRECTORY);
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 new_filepath = test_dir + "/" + &test_filename;
match file_exists(&dir, &filename) {
Ok(_) => {
let filepath = get_full_path(&dir, &filename).unwrap();
match util::copy_file(&filepath, &new_filepath) {
Ok(_o) => match get_meta(types::Type::DiscCount, &filepath) {
Ok(disc_total) => {
let found = disc_total == "1";
assert!(found, "Meta information was not found {:?}", disc_total);
let new_disc_total = String::from("2");
match set_meta(
types::Type::DiscCount,
&new_filepath,
&new_disc_total,
) {
Ok(m) => {
assert_eq!(
new_disc_total, m,
"New disc_total does not match {:?}",
m
);
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
},
Err(err) => {
assert!(
false,
"Error: {:?} source {:?} destination {:?}",
err, filepath, new_filepath
);
}
};
}
Err(err) => {
assert!(false, "Error: File does not exist {:?}", err.to_string());
}
};
}
#[test]
fn test_set_genre() {
let filename = util::get_filename(1);

View File

@@ -1,3 +1,4 @@
// TODO: Have this derive Debug
pub enum Type {
Title,
Artist,
@@ -7,10 +8,31 @@ pub enum Type {
Date,
Track,
Disc,
TrackCount,
DiscCount,
}
#[derive(Debug)]
pub enum MetadataType {
String(String),
Int(i32),
}
impl MetadataType {
pub fn from_std_str(s: &str) -> Self {
MetadataType::String(s.to_string())
}
pub fn from_string(s: String) -> Self {
MetadataType::String(s)
}
pub fn from_int(i: i32) -> Self {
MetadataType::Int(i)
}
}
pub mod access {
pub fn get_type(t: super::Type) -> Result<String, std::io::Error> {
match t {
super::Type::Title => Ok("TITLE".to_owned()),
@@ -21,6 +43,8 @@ pub mod access {
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()),
}
}
}