Refactor
Some checks failed
Rust Build / Check (pull_request) Failing after 42s
Rust Build / Test Suite (pull_request) Failing after 43s
Rust Build / Rustfmt (pull_request) Successful in 32s
Rust Build / Clippy (pull_request) Failing after 38s
Rust Build / build (pull_request) Failing after 45s

This commit is contained in:
2025-04-12 13:18:43 -04:00
parent f2cd96c50c
commit a1d250a049

View File

@@ -12,80 +12,50 @@ mod meta_type {
mod meta_nouveaou { mod meta_nouveaou {
use super::*; use super::*;
use metadata;
pub fn get_meta(t: meta_type::Type, filepath: &String) -> Result<String, std::io::Error> { pub fn get_meta(t: meta_type::Type, filepath: &String) -> Result<String, std::io::Error> {
match t { match t {
meta_type::Type::Title => match new_meta(&filepath) { meta_type::Type::Title => match new_meta(filepath) {
Ok(metaa) => match get_val(t, metaa.tags) { Ok(metaa) => match get_val(t, metaa.tags) {
Ok(val) => { Ok(val) => Ok(val),
return Ok(val); Err(err) => Err(err),
}
Err(err) => {
return Err(err);
}
}, },
Err(err) => Err(err), Err(err) => Err(err),
}, },
meta_type::Type::Artist => match new_meta(&filepath) { meta_type::Type::Artist => match new_meta(filepath) {
Ok(metaa) => match get_val(t, metaa.tags) { Ok(metaa) => match get_val(t, metaa.tags) {
Ok(val) => { Ok(val) => Ok(val),
return Ok(val); Err(err) => Err(err),
}
Err(err) => {
return Err(err);
}
}, },
Err(err) => Err(err), Err(err) => Err(err),
}, },
meta_type::Type::Album => match new_meta(&filepath) { meta_type::Type::Album => match new_meta(filepath) {
Ok(metaa) => match get_val(t, metaa.tags) { Ok(metaa) => match get_val(t, metaa.tags) {
Ok(val) => { Ok(val) => Ok(val),
return Ok(val); Err(err) => Err(err),
}
Err(err) => {
return Err(err);
}
}, },
Err(err) => Err(err), Err(err) => Err(err),
}, },
meta_type::Type::Genre => match new_meta(&filepath) { meta_type::Type::Genre => match new_meta(filepath) {
Ok(metaa) => match get_val(t, metaa.tags) { Ok(metaa) => match get_val(t, metaa.tags) {
Ok(val) => { Ok(val) => Ok(val),
return Ok(val); Err(err) => Err(err),
}
Err(err) => {
return Err(err);
}
}, },
Err(err) => Err(err), Err(err) => Err(err),
}, },
meta_type::Type::Year => match new_meta(&filepath) { meta_type::Type::Year => match new_meta(filepath) {
Ok(metaa) => match get_val(t, metaa.tags) { Ok(metaa) => match get_val(t, metaa.tags) {
Ok(val) => { Ok(val) => Ok(val),
return Ok(val); Err(err) => Err(err),
}
Err(err) => {
return Err(err);
}
}, },
Err(err) => Err(err), Err(err) => Err(err),
}, },
meta_type::Type::Track => match new_meta(&filepath) { meta_type::Type::Track => match new_meta(filepath) {
Ok(metaa) => match get_val(t, metaa.tags) { Ok(metaa) => match get_val(t, metaa.tags) {
Ok(val) => { Ok(val) => Ok(val),
return Ok(val); Err(err) => Err(err),
}
Err(err) => {
return Err(err);
}
}, },
Err(err) => Err(err), Err(err) => Err(err),
}, },
_ => Err(std::io::Error::new(
std::io::ErrorKind::InvalidInput,
"Invalid",
)),
} }
} }
@@ -100,10 +70,7 @@ mod meta_nouveaou {
} }
} }
fn get_val( fn get_val(t: meta_type::Type, tags: Vec<(String, String)>) -> Result<String, std::io::Error> {
t: meta_type::Type,
tags: Vec<((String, String))>,
) -> Result<String, std::io::Error> {
let type_ma: String = get_type(t).unwrap(); let type_ma: String = get_type(t).unwrap();
for tag in tags { for tag in tags {
if tag.0 == type_ma { if tag.0 == type_ma {
@@ -111,10 +78,10 @@ mod meta_nouveaou {
} }
} }
return Err(std::io::Error::new( Err(std::io::Error::new(
std::io::ErrorKind::InvalidInput, std::io::ErrorKind::InvalidInput,
"Invalid", "Invalid",
)); ))
} }
fn new_meta(filepath: &String) -> Result<metadata::MediaFileMetadata, std::io::Error> { fn new_meta(filepath: &String) -> Result<metadata::MediaFileMetadata, std::io::Error> {