Formatting
Some checks failed
Rust Build / Check (pull_request) Successful in 41s
Rust Build / Test Suite (pull_request) Successful in 46s
Rust Build / Rustfmt (pull_request) Successful in 23s
Rust Build / Clippy (pull_request) Failing after 37s
Rust Build / build (pull_request) Successful in 1m10s

This commit is contained in:
2025-06-18 22:05:44 -04:00
parent 0cc086b157
commit 493408d6d9

View File

@@ -208,8 +208,11 @@ pub async fn save_file_to_fs(
} }
// TODO: Implement // TODO: Implement
pub async fn apply_metadata(song_queue_path: &std::path::PathBuf, coverart_queue_path: &std::path::PathBuf, metadata: &api::get_metadata_queue::response::Metadata) -> Result<bool, std::io::Error> { pub async fn apply_metadata(
song_queue_path: &std::path::PathBuf,
coverart_queue_path: &std::path::PathBuf,
metadata: &api::get_metadata_queue::response::Metadata,
) -> Result<bool, std::io::Error> {
// Apply metadata fields // Apply metadata fields
let s_path = match song_queue_path.to_str() { let s_path = match song_queue_path.to_str() {
Some(val) => String::from(val), Some(val) => String::from(val),
@@ -221,8 +224,7 @@ pub async fn apply_metadata(song_queue_path: &std::path::PathBuf, coverart_queue
match t { match t {
icarus_meta::types::Type::Album => { icarus_meta::types::Type::Album => {
match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.album) { match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.album) {
Ok(_) => { Ok(_) => {}
}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
@@ -230,8 +232,7 @@ pub async fn apply_metadata(song_queue_path: &std::path::PathBuf, coverart_queue
} }
icarus_meta::types::Type::AlbumArtist => { icarus_meta::types::Type::AlbumArtist => {
match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.album_artist) { match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.album_artist) {
Ok(_) => { Ok(_) => {}
}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
@@ -239,8 +240,7 @@ pub async fn apply_metadata(song_queue_path: &std::path::PathBuf, coverart_queue
} }
icarus_meta::types::Type::Artist => { icarus_meta::types::Type::Artist => {
match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.artist) { match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.artist) {
Ok(_) => { Ok(_) => {}
}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
@@ -248,18 +248,18 @@ pub async fn apply_metadata(song_queue_path: &std::path::PathBuf, coverart_queue
} }
icarus_meta::types::Type::Date => { icarus_meta::types::Type::Date => {
// TODO: Do something about this discrepancy // TODO: Do something about this discrepancy
match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.year.to_string()) { match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.year.to_string())
Ok(_) => { {
} Ok(_) => {}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
} }
} }
icarus_meta::types::Type::Disc => { icarus_meta::types::Type::Disc => {
match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.disc.to_string()) { match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.disc.to_string())
Ok(_) => { {
} Ok(_) => {}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
@@ -267,8 +267,7 @@ pub async fn apply_metadata(song_queue_path: &std::path::PathBuf, coverart_queue
} }
icarus_meta::types::Type::Genre => { icarus_meta::types::Type::Genre => {
match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.genre) { match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.genre) {
Ok(_) => { Ok(_) => {}
}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
@@ -276,35 +275,40 @@ pub async fn apply_metadata(song_queue_path: &std::path::PathBuf, coverart_queue
} }
icarus_meta::types::Type::Title => { icarus_meta::types::Type::Title => {
match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.title) { match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.title) {
Ok(_) => { Ok(_) => {}
}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
} }
} }
icarus_meta::types::Type::Track => { icarus_meta::types::Type::Track => {
match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.track.to_string()) { match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.track.to_string())
Ok(_) => { {
} Ok(_) => {}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
} }
} }
icarus_meta::types::Type::TrackCount => { icarus_meta::types::Type::TrackCount => {
match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.track_count.to_string()) { match icarus_meta::meta::metadata::set_meta(
Ok(_) => { t,
} &s_path,
&metadata.track_count.to_string(),
) {
Ok(_) => {}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
} }
} }
icarus_meta::types::Type::DiscCount => { icarus_meta::types::Type::DiscCount => {
match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.disc_count.to_string()) { match icarus_meta::meta::metadata::set_meta(
Ok(_) => { t,
} &s_path,
&metadata.disc_count.to_string(),
) {
Ok(_) => {}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
@@ -324,8 +328,7 @@ pub async fn apply_metadata(song_queue_path: &std::path::PathBuf, coverart_queue
if exists { if exists {
println!("Coverart exists: {:?} size", size); println!("Coverart exists: {:?} size", size);
match icarus_meta::meta::coverart::remove_coverart(&s_path) { match icarus_meta::meta::coverart::remove_coverart(&s_path) {
Ok(_data) => { Ok(_data) => {}
}
Err(err) => { Err(err) => {
return Err(err); return Err(err);
} }
@@ -354,39 +357,39 @@ pub async fn apply_metadata(song_queue_path: &std::path::PathBuf, coverart_queue
pub mod song_io { pub mod song_io {
pub async fn metadata_types() -> Vec<icarus_meta::types::Type> { pub async fn metadata_types() -> Vec<icarus_meta::types::Type> {
/* /*
match t { match t {
types::Type::Album => { types::Type::Album => {
vb.set_album(pre_value); vb.set_album(pre_value);
} }
types::Type::AlbumArtist => { types::Type::AlbumArtist => {
vb.insert(types::access::get_type(t).unwrap(), pre_value); vb.insert(types::access::get_type(t).unwrap(), pre_value);
} }
types::Type::Artist => { types::Type::Artist => {
vb.set_artist(pre_value); vb.set_artist(pre_value);
} }
types::Type::Date => { types::Type::Date => {
vb.insert(types::access::get_type(t).unwrap(), pre_value); vb.insert(types::access::get_type(t).unwrap(), pre_value);
} }
types::Type::Disc => { types::Type::Disc => {
vb.set_disk(pre_value.parse().unwrap()); vb.set_disk(pre_value.parse().unwrap());
} }
types::Type::Genre => { types::Type::Genre => {
vb.set_genre(pre_value); vb.set_genre(pre_value);
} }
types::Type::Title => { types::Type::Title => {
vb.set_title(pre_value); vb.set_title(pre_value);
} }
types::Type::Track => { types::Type::Track => {
vb.set_track(pre_value.parse().unwrap()); vb.set_track(pre_value.parse().unwrap());
} }
types::Type::TrackCount => { types::Type::TrackCount => {
vb.set_track_total(pre_value.parse().unwrap()); vb.set_track_total(pre_value.parse().unwrap());
} }
types::Type::DiscCount => { types::Type::DiscCount => {
vb.set_disk_total(pre_value.parse().unwrap()); vb.set_disk_total(pre_value.parse().unwrap());
} }
}; };
*/ */
// TODO: Think about putting this in icarus_meta // TODO: Think about putting this in icarus_meta
let mut all_types: Vec<icarus_meta::types::Type> = Vec::new(); let mut all_types: Vec<icarus_meta::types::Type> = Vec::new();
all_types.push(icarus_meta::types::Type::Album); all_types.push(icarus_meta::types::Type::Album);