tsk-62: Use QueuedSong and QueuedCoverArt to replace references to path of Song and CoverArt #64

Merged
phoenix merged 7 commits from tsk-62 into main 2025-10-22 17:42:01 +00:00
2 changed files with 12 additions and 3 deletions
Showing only changes of commit a08246efd2 - Show all commits

View File

@@ -332,10 +332,19 @@ async fn prep_song(
}; };
*/ */
let queued_song = queued_item::QueuedSong { let queued_song: crate::queued_item::QueuedSong = match song.save_to_filesystem() {
Ok(_) => {
queued_item::QueuedSong {
id: *song_queue_id, id: *song_queue_id,
song, song,
path: songpath path: songpath
}
}
Err(err) => {
eprintln!("Error: {err:?}");
queued_item::QueuedSong{..Default::default()}
}
}; };
println!("Saved at: {:?}", queued_song.path); println!("Saved at: {:?}", queued_song.path);

View File

@@ -1,11 +1,11 @@
#[derive(Clone, Debug)] #[derive(Clone, Debug, Default)]
pub struct QueuedSong { pub struct QueuedSong {
pub id: uuid::Uuid, pub id: uuid::Uuid,
pub song: icarus_models::song::Song, pub song: icarus_models::song::Song,
pub path: String, pub path: String,
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug, Default)]
pub struct QueuedCoverArt { pub struct QueuedCoverArt {
pub id: uuid::Uuid, pub id: uuid::Uuid,
pub coverart: icarus_models::coverart::CoverArt, pub coverart: icarus_models::coverart::CoverArt,