diff --git a/Cargo.toml b/Cargo.toml index 2553609..8d2074a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,6 +13,6 @@ serde = { version = "1.0.228", features = ["derive"] } serde_json = { version = "1.0.150" } time = { version = "0.3.53", features = ["macros", "serde"] } uuid = { version = "1.23.4", features = ["v4", "serde"] } -icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.6.1" } +simeta = { git = "ssh://git@git.kundeng.us/phoenix/simeta.git", tag = "v0.6.1-main-b690995806-680" } simodels = { git = "ssh://git@git.kundeng.us/phoenix/simodels.git", tag = "v0.11.3-main-fe9d101bd0-111" } sienvy = { git = "ssh://git@git.kundeng.us/phoenix/sienvy.git", tag = "v0.8.0-main-d06c8fdf49-006" } diff --git a/src/metadata/mod.rs b/src/metadata/mod.rs index 87283d6..2369fae 100644 --- a/src/metadata/mod.rs +++ b/src/metadata/mod.rs @@ -5,101 +5,96 @@ pub async fn apply_metadata( metadata: &crate::api::get_metadata_queue::response::Metadata, ) -> Result { // Apply metadata fields - let types = icarus_meta::types::all_metadata_types(); + let types = simeta::types::all_metadata_types(); for t in types { match t { - icarus_meta::types::Type::Album => { - let meta_type = - icarus_meta::types::MetadataType::from_string(metadata.album.clone()); - match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { + simeta::types::Type::Album => { + let meta_type = simeta::types::MetadataType::from_string(metadata.album.clone()); + match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { Ok(_) => {} Err(_err) => { return Err(_err); } } } - icarus_meta::types::Type::AlbumArtist => { + simeta::types::Type::AlbumArtist => { let meta_type = - icarus_meta::types::MetadataType::from_string(metadata.album_artist.clone()); - match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { + simeta::types::MetadataType::from_string(metadata.album_artist.clone()); + match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { Ok(_) => {} Err(_err) => { return Err(_err); } } } - icarus_meta::types::Type::Artist => { - let meta_type = - icarus_meta::types::MetadataType::from_string(metadata.artist.clone()); - match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { + simeta::types::Type::Artist => { + let meta_type = simeta::types::MetadataType::from_string(metadata.artist.clone()); + match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { Ok(_) => {} Err(_err) => { return Err(_err); } } } - icarus_meta::types::Type::Date => { + simeta::types::Type::Date => { // TODO: Do something about this discrepancy - let meta_type = - icarus_meta::types::MetadataType::from_string(metadata.year.to_string()); - match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { + let meta_type = simeta::types::MetadataType::from_string(metadata.year.to_string()); + match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { Ok(_) => {} Err(_err) => { return Err(_err); } } } - icarus_meta::types::Type::Disc => { - let meta_type = icarus_meta::types::MetadataType::from_int(metadata.disc); - match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { + simeta::types::Type::Disc => { + let meta_type = simeta::types::MetadataType::from_int(metadata.disc); + match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { Ok(_) => {} Err(_err) => { return Err(_err); } } } - icarus_meta::types::Type::Genre => { - let meta_type = - icarus_meta::types::MetadataType::from_string(metadata.genre.clone()); - match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { + simeta::types::Type::Genre => { + let meta_type = simeta::types::MetadataType::from_string(metadata.genre.clone()); + match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { Ok(_) => {} Err(_err) => { return Err(_err); } } } - icarus_meta::types::Type::Title => { - let meta_type = - icarus_meta::types::MetadataType::from_string(metadata.title.clone()); - match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { + simeta::types::Type::Title => { + let meta_type = simeta::types::MetadataType::from_string(metadata.title.clone()); + match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { Ok(_) => {} Err(_err) => { return Err(_err); } } } - icarus_meta::types::Type::Track => { - let meta_type = icarus_meta::types::MetadataType::from_int(metadata.track); - match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { + simeta::types::Type::Track => { + let meta_type = simeta::types::MetadataType::from_int(metadata.track); + match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { Ok(_) => {} Err(_err) => { return Err(_err); } } } - icarus_meta::types::Type::TrackCount => { - let meta_type = icarus_meta::types::MetadataType::from_int(metadata.track_count); - match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { + simeta::types::Type::TrackCount => { + let meta_type = simeta::types::MetadataType::from_int(metadata.track_count); + match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { Ok(_) => {} Err(_err) => { return Err(_err); } } } - icarus_meta::types::Type::DiscCount => { - let meta_type = icarus_meta::types::MetadataType::from_int(metadata.disc_count); - match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { + simeta::types::Type::DiscCount => { + let meta_type = simeta::types::MetadataType::from_int(metadata.disc_count); + match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { Ok(_) => {} Err(_err) => { return Err(_err); @@ -110,11 +105,11 @@ pub async fn apply_metadata( } // Apply coverart - match icarus_meta::meta::coverart::contains_coverart(&queued_song.path) { + match simeta::meta::coverart::contains_coverart(&queued_song.path) { Ok((exists, size)) => { if exists { println!("Coverart exists: {size:?} size"); - match icarus_meta::meta::coverart::remove_coverart(&queued_song.path) { + match simeta::meta::coverart::remove_coverart(&queued_song.path) { Ok(_data) => {} Err(err) => { return Err(err); @@ -122,10 +117,7 @@ pub async fn apply_metadata( } } - match icarus_meta::meta::coverart::set_coverart( - &queued_song.path, - &queued_coverart.path, - ) { + match simeta::meta::coverart::set_coverart(&queued_song.path, &queued_coverart.path) { Ok(_data) => { if _data.is_empty() { println!("There was an issue"); diff --git a/src/parser/mod.rs b/src/parser/mod.rs index bed8a47..84f5978 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -30,9 +30,8 @@ pub async fn some_work( println!("Updated queued song"); println!("Response: {_inner_response:?}"); - let song_type = String::from( - icarus_meta::detection::song::constants::FLAC_TYPE, - ); + let song_type = + String::from(simeta::detection::song::constants::FLAC_TYPE); match crate::api::create_song::create( app, &metadata, user_id, &song_type, @@ -223,11 +222,11 @@ async fn init_queued_coverart( bytes: Vec, ) -> crate::queued_item::QueuedCoverArt { // TODO: Consider separating song and coverart when saving to the filesystem - let covart_type = if file_type == icarus_meta::detection::coverart::constants::PNG_TYPE { + let covart_type = if file_type == simeta::detection::coverart::constants::PNG_TYPE { simodels::types::CoverArtType::PngExtension - } else if file_type == icarus_meta::detection::coverart::constants::JPEG_TYPE { + } else if file_type == simeta::detection::coverart::constants::JPEG_TYPE { simodels::types::CoverArtType::JpegExtension - } else if file_type == icarus_meta::detection::coverart::constants::JPG_TYPE { + } else if file_type == simeta::detection::coverart::constants::JPG_TYPE { simodels::types::CoverArtType::JpgExtension } else { simodels::types::CoverArtType::None