diff --git a/src/main.rs b/src/main.rs index 29adc70..934eb6d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -208,8 +208,11 @@ pub async fn save_file_to_fs( } // 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 { - +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 { // Apply metadata fields let s_path = match song_queue_path.to_str() { Some(val) => String::from(val), @@ -221,8 +224,7 @@ pub async fn apply_metadata(song_queue_path: &std::path::PathBuf, coverart_queue match t { icarus_meta::types::Type::Album => { match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.album) { - Ok(_) => { - } + Ok(_) => {} 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 => { match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.album_artist) { - Ok(_) => { - } + Ok(_) => {} 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 => { match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.artist) { - Ok(_) => { - } + Ok(_) => {} 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 => { // TODO: Do something about this discrepancy - match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.year.to_string()) { - Ok(_) => { - } + match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.year.to_string()) + { + Ok(_) => {} Err(_err) => { return Err(_err); } } } icarus_meta::types::Type::Disc => { - match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.disc.to_string()) { - Ok(_) => { - } + match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.disc.to_string()) + { + Ok(_) => {} 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 => { match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.genre) { - Ok(_) => { - } + Ok(_) => {} 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 => { match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.title) { - Ok(_) => { - } + Ok(_) => {} Err(_err) => { return Err(_err); } } } icarus_meta::types::Type::Track => { - match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.track.to_string()) { - Ok(_) => { - } + match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.track.to_string()) + { + Ok(_) => {} Err(_err) => { return Err(_err); } } } icarus_meta::types::Type::TrackCount => { - match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.track_count.to_string()) { - Ok(_) => { - } + match icarus_meta::meta::metadata::set_meta( + t, + &s_path, + &metadata.track_count.to_string(), + ) { + Ok(_) => {} Err(_err) => { return Err(_err); } } } icarus_meta::types::Type::DiscCount => { - match icarus_meta::meta::metadata::set_meta(t, &s_path, &metadata.disc_count.to_string()) { - Ok(_) => { - } + match icarus_meta::meta::metadata::set_meta( + t, + &s_path, + &metadata.disc_count.to_string(), + ) { + Ok(_) => {} Err(_err) => { return Err(_err); } @@ -324,8 +328,7 @@ pub async fn apply_metadata(song_queue_path: &std::path::PathBuf, coverart_queue if exists { println!("Coverart exists: {:?} size", size); match icarus_meta::meta::coverart::remove_coverart(&s_path) { - Ok(_data) => { - } + Ok(_data) => {} 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 async fn metadata_types() -> Vec { /* - match t { - types::Type::Album => { - vb.set_album(pre_value); - } - types::Type::AlbumArtist => { - vb.insert(types::access::get_type(t).unwrap(), pre_value); - } - types::Type::Artist => { - vb.set_artist(pre_value); - } - types::Type::Date => { - vb.insert(types::access::get_type(t).unwrap(), pre_value); - } - types::Type::Disc => { - vb.set_disk(pre_value.parse().unwrap()); - } - types::Type::Genre => { - vb.set_genre(pre_value); - } - types::Type::Title => { - vb.set_title(pre_value); - } - 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()); - } - }; - */ + match t { + types::Type::Album => { + vb.set_album(pre_value); + } + types::Type::AlbumArtist => { + vb.insert(types::access::get_type(t).unwrap(), pre_value); + } + types::Type::Artist => { + vb.set_artist(pre_value); + } + types::Type::Date => { + vb.insert(types::access::get_type(t).unwrap(), pre_value); + } + types::Type::Disc => { + vb.set_disk(pre_value.parse().unwrap()); + } + types::Type::Genre => { + vb.set_genre(pre_value); + } + types::Type::Title => { + vb.set_title(pre_value); + } + 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()); + } + }; + */ // TODO: Think about putting this in icarus_meta let mut all_types: Vec = Vec::new(); all_types.push(icarus_meta::types::Type::Album);