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

tsk-62: Use QueuedSong and QueuedCoverArt to replace references to path of Song and CoverArt (#64)
All checks were successful
Rust Build / Check (push) Successful in 37s
Details
Rust Build / Test Suite (push) Successful in 43s
Details
Rust Build / Rustfmt (push) Successful in 37s
Details
Rust Build / Clippy (push) Successful in 40s
Details
Rust Build / build (push) Successful in 47s
Details

Browse Source 
Closes #62

Reviewed-on: #64
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
This commit was merged in pull request #64.
This commit is contained in:
phoenix
2025-10-22 17:42:00 +00:00
committed by phoenix
parent 106867e5ee
commit bd351b1157
6 changed files with 93 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/metadata/mod.rs
View File

@@ -1,6 +1,7 @@
/// Applies metadata to the queued song
pub async fn apply_metadata(
song_queue_path: &String,
coverart_queue_path: &String,
queued_song: &crate::queued_item::QueuedSong,
queued_coverart: &crate::queued_item::QueuedCoverArt,
metadata: &crate::api::get_metadata_queue::response::Metadata,
) -> Result<bool, std::io::Error> {
// Apply metadata fields
@@ -11,7 +12,7 @@ pub async fn apply_metadata(
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, song_queue_path, meta_type) {
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
@@ -21,7 +22,7 @@ pub async fn apply_metadata(
icarus_meta::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, song_queue_path, meta_type) {
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
@@ -31,7 +32,7 @@ pub async fn apply_metadata(
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, song_queue_path, meta_type) {
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
@@ -42,7 +43,7 @@ pub async fn apply_metadata(
// 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, song_queue_path, meta_type) {
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
@@ -51,7 +52,7 @@ pub async fn apply_metadata(
}
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, song_queue_path, meta_type) {
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
@@ -61,7 +62,7 @@ pub async fn apply_metadata(
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, song_queue_path, meta_type) {
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
@@ -71,7 +72,7 @@ pub async fn apply_metadata(
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, song_queue_path, meta_type) {
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
@@ -80,7 +81,7 @@ pub async fn apply_metadata(
}
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, song_queue_path, meta_type) {
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
@@ -89,7 +90,7 @@ pub async fn apply_metadata(
}
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, song_queue_path, meta_type) {
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
@@ -98,7 +99,7 @@ pub async fn apply_metadata(
}
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, song_queue_path, meta_type) {
match icarus_meta::meta::metadata::set_meta_value(t, &queued_song.path, meta_type) {
Ok(_) => {}
Err(_err) => {
return Err(_err);
@@ -109,11 +110,11 @@ pub async fn apply_metadata(
}
// Apply coverart
match icarus_meta::meta::coverart::contains_coverart(song_queue_path) {
match icarus_meta::meta::coverart::contains_coverart(&queued_song.path) {
Ok((exists, size)) => {
if exists {
println!("Coverart exists: {size:?} size");
match icarus_meta::meta::coverart::remove_coverart(song_queue_path) {
match icarus_meta::meta::coverart::remove_coverart(&queued_song.path) {
Ok(_data) => {}
Err(err) => {
return Err(err);
@@ -121,7 +122,10 @@ pub async fn apply_metadata(
}
}
match icarus_meta::meta::coverart::set_coverart(song_queue_path, coverart_queue_path) {
match icarus_meta::meta::coverart::set_coverart(
&queued_song.path,
&queued_coverart.path,
) {
Ok(_data) => {
if _data.is_empty() {
println!("There was an issue");