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

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
Conversation 0 Commits 7 Files Changed 6 +3 -13
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0603fd3eb0 - Show all commits

16
src/main.rs
View File

@@ -60,13 +60,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let user_id = song_queue_item.data[0].user_id; let user_id = song_queue_item.data[0].user_id;
match some_work(&app, &song_queue_id, &user_id).await { match some_work(&app, &song_queue_id, &user_id).await {
Ok(( Ok((song, coverart, _metadata, queued_song, queued_coverart)) => {
song,
coverart,
_metadata,
queued_song,
queued_coverart,
)) => {
match wipe_data_from_queues(&app, &queued_song, &queued_coverart).await match wipe_data_from_queues(&app, &queued_song, &queued_coverart).await
{ {
Ok(_) => match cleanup(&song, &coverart).await { Ok(_) => match cleanup(&song, &coverart).await {
@@ -187,11 +181,7 @@ async fn some_work(
std::io::Error, std::io::Error,
> { > {
match prep_song(app, song_queue_id).await { match prep_song(app, song_queue_id).await {
Ok(( Ok((queued_song, queued_coverart, metadata)) => {
queued_song,
queued_coverart,
metadata,
)) => {
println!("Prepping song"); println!("Prepping song");
match metadata::apply_metadata(&queued_song, &queued_coverart, &metadata).await { match metadata::apply_metadata(&queued_song, &queued_coverart, &metadata).await {
@@ -354,7 +344,7 @@ async fn prep_song(
let queued_coverart = queued_item::QueuedCoverArt { let queued_coverart = queued_item::QueuedCoverArt {
id: coverart_queue_id, id: coverart_queue_id,
coverart coverart,
path: coverart_queue_fs_path path: coverart_queue_fs_path
}; };