phoenix/songparser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dependency name change #3

Merged
phoenix merged 11 commits from dependency_name_change into main 2026-07-21 15:30:19 -04:00
Conversation 0 Commits 11 Files Changed 16
+40 -49
3 changed files with 40 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b69d3c0067 - Show all commits
Cargo.toml
+1 -1
View File
@@ -13,6 +13,6 @@ serde = { version = "1.0.228", features = ["derive"] }
serde_json = { version = "1.0.150" } serde_json = { version = "1.0.150" }
time = { version = "0.3.53", features = ["macros", "serde"] } time = { version = "0.3.53", features = ["macros", "serde"] }
uuid = { version = "1.23.4", features = ["v4", "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" } 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" } sienvy = { git = "ssh://git@git.kundeng.us/phoenix/sienvy.git", tag = "v0.8.0-main-d06c8fdf49-006" }
src/metadata/mod.rs
+34 -42
View File
@@ -5,101 +5,96 @@ pub async fn apply_metadata(
metadata: &crate::api::get_metadata_queue::response::Metadata, metadata: &crate::api::get_metadata_queue::response::Metadata,
) -> Result<bool, std::io::Error> { ) -> Result<bool, std::io::Error> {
// Apply metadata fields // Apply metadata fields
let types = icarus_meta::types::all_metadata_types(); let types = simeta::types::all_metadata_types();
for t in types { for t in types {
match t { match t {
icarus_meta::types::Type::Album => { simeta::types::Type::Album => {
let meta_type = let meta_type = simeta::types::MetadataType::from_string(metadata.album.clone());
icarus_meta::types::MetadataType::from_string(metadata.album.clone()); match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {} Ok(_) => {}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
} }
} }
icarus_meta::types::Type::AlbumArtist => { simeta::types::Type::AlbumArtist => {
let meta_type = let meta_type =
icarus_meta::types::MetadataType::from_string(metadata.album_artist.clone()); simeta::types::MetadataType::from_string(metadata.album_artist.clone());
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {} Ok(_) => {}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
} }
} }
icarus_meta::types::Type::Artist => { simeta::types::Type::Artist => {
let meta_type = let meta_type = simeta::types::MetadataType::from_string(metadata.artist.clone());
icarus_meta::types::MetadataType::from_string(metadata.artist.clone()); match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {} Ok(_) => {}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
} }
} }
icarus_meta::types::Type::Date => { simeta::types::Type::Date => {
// TODO: Do something about this discrepancy // TODO: Do something about this discrepancy
let meta_type = let meta_type = simeta::types::MetadataType::from_string(metadata.year.to_string());
icarus_meta::types::MetadataType::from_string(metadata.year.to_string()); match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {} Ok(_) => {}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
} }
} }
icarus_meta::types::Type::Disc => { simeta::types::Type::Disc => {
let meta_type = icarus_meta::types::MetadataType::from_int(metadata.disc); let meta_type = simeta::types::MetadataType::from_int(metadata.disc);
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {} Ok(_) => {}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
} }
} }
icarus_meta::types::Type::Genre => { simeta::types::Type::Genre => {
let meta_type = let meta_type = simeta::types::MetadataType::from_string(metadata.genre.clone());
icarus_meta::types::MetadataType::from_string(metadata.genre.clone()); match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {} Ok(_) => {}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
} }
} }
icarus_meta::types::Type::Title => { simeta::types::Type::Title => {
let meta_type = let meta_type = simeta::types::MetadataType::from_string(metadata.title.clone());
icarus_meta::types::MetadataType::from_string(metadata.title.clone()); match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {} Ok(_) => {}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
} }
} }
icarus_meta::types::Type::Track => { simeta::types::Type::Track => {
let meta_type = icarus_meta::types::MetadataType::from_int(metadata.track); let meta_type = simeta::types::MetadataType::from_int(metadata.track);
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {} Ok(_) => {}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
} }
} }
icarus_meta::types::Type::TrackCount => { simeta::types::Type::TrackCount => {
let meta_type = icarus_meta::types::MetadataType::from_int(metadata.track_count); let meta_type = simeta::types::MetadataType::from_int(metadata.track_count);
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {} Ok(_) => {}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
} }
} }
} }
icarus_meta::types::Type::DiscCount => { simeta::types::Type::DiscCount => {
let meta_type = icarus_meta::types::MetadataType::from_int(metadata.disc_count); let meta_type = simeta::types::MetadataType::from_int(metadata.disc_count);
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) { match simeta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {} Ok(_) => {}
Err(_err) => { Err(_err) => {
return Err(_err); return Err(_err);
@@ -110,11 +105,11 @@ pub async fn apply_metadata(
} }
// Apply coverart // Apply coverart
match icarus_meta::meta::coverart::contains_coverart(&queued_song.path) { match simeta::meta::coverart::contains_coverart(&queued_song.path) {
Ok((exists, size)) => { Ok((exists, size)) => {
if exists { if exists {
println!("Coverart exists: {size:?} size"); 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) => {} Ok(_data) => {}
Err(err) => { Err(err) => {
return Err(err); return Err(err);
@@ -122,10 +117,7 @@ pub async fn apply_metadata(
} }
} }
match icarus_meta::meta::coverart::set_coverart( match simeta::meta::coverart::set_coverart(&queued_song.path, &queued_coverart.path) {
&queued_song.path,
&queued_coverart.path,
) {
Ok(_data) => { Ok(_data) => {
if _data.is_empty() { if _data.is_empty() {
println!("There was an issue"); println!("There was an issue");
src/parser/mod.rs
+5 -6
View File
@@ -30,9 +30,8 @@ pub async fn some_work(
println!("Updated queued song"); println!("Updated queued song");
println!("Response: {_inner_response:?}"); println!("Response: {_inner_response:?}");
let song_type = String::from( let song_type =
icarus_meta::detection::song::constants::FLAC_TYPE, String::from(simeta::detection::song::constants::FLAC_TYPE);
);
match crate::api::create_song::create( match crate::api::create_song::create(
app, &metadata, user_id, &song_type, app, &metadata, user_id, &song_type,
@@ -223,11 +222,11 @@ async fn init_queued_coverart(
bytes: Vec<u8>, bytes: Vec<u8>,
) -> crate::queued_item::QueuedCoverArt { ) -> crate::queued_item::QueuedCoverArt {
// TODO: Consider separating song and coverart when saving to the filesystem // 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 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 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 simodels::types::CoverArtType::JpgExtension
} else { } else {
simodels::types::CoverArtType::None simodels::types::CoverArtType::None