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

tsk-62: Making changes to queued song and coverart

Browse Source
This commit is contained in:
phoenix
2025-10-22 12:52:59 -04:00
parent 106867e5ee
commit c2e2e1b03a
3 changed files with 63 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/main.rs
View File

@@ -2,6 +2,7 @@ pub mod api;
pub mod auth;
pub mod config;
pub mod metadata;
pub mod queued_item;
pub mod util;
pub const SECONDS_TO_SLEEP: u64 = 5;
@@ -177,22 +178,23 @@ async fn some_work(
user_id: &uuid::Uuid,
) -> Result<
(
icarus_models::song::Song,
icarus_models::coverart::CoverArt,
(uuid::Uuid, String),
(uuid::Uuid, String),
queued_item::QueuedSong,
queued_item::QueuedCoverArt
),
std::io::Error,
> {
match prep_song(app, song_queue_id).await {
Ok((
(song_directory, song_filename),
(coverart_directory, coverart_filename),
// (song_directory, song_filename),
queued_song,
queued_coverart,
// (coverart_directory, coverart_filename),
metadata,
coverart_queue_id,
// coverart_queue_id,
)) => {
println!("Prepping song");
/*
let mut song_queue_path: String = String::new();
let p = std::path::Path::new(&song_directory);
let sp = p.join(&song_filename);
@@ -210,8 +212,7 @@ async fn some_work(
std::process::exit(-1);
}
};
println!("CoverArt path: {coverart_queue_path:?}");
*/
match metadata::apply_metadata(&song_queue_path, &coverart_queue_path, &metadata).await
{
@@ -295,10 +296,12 @@ async fn prep_song(
song_queue_id: &uuid::Uuid,
) -> Result<
(
(String, String),
(String, String),
// (String, String),
queued_item::QueuedSong,
queued_item::QueuedCoverArt,
// (String, String),
api::get_metadata_queue::response::Metadata,
uuid::Uuid,
// uuid::Uuid,
),
reqwest::Error,
> {
@@ -317,14 +320,22 @@ async fn prep_song(
..Default::default()
};
let songpath = song.song_path().unwrap_or_default();
/*
let song_queue_path = match song.save_to_filesystem() {
Ok(_) => std::path::Path::new(&songpath),
Err(_err) => std::path::Path::new(""),
};
*/
println!("Saved at: {song_queue_path:?}");
let queued_song = queued_item::QueuedSong {
id: *song_queue_id,
song,
path: songpath
};
match api::get_metadata_queue::get(app, song_queue_id).await {
println!("Saved at: {:?}", queued_song.path);
match api::get_metadata_queue::get(app, &queued_song.id).await {
Ok(response) => {
match response
.json::<api::get_metadata_queue::response::Response>()
@@ -339,7 +350,7 @@ async fn prep_song(
println!("Created at: {created_at:?}");
println!("Getting coverart queue");
match api::get_coverart_queue::get(app, song_queue_id).await {
match api::get_coverart_queue::get(app, &queued_song.id).await {
Ok(response) => {
match response.json::<api::get_coverart_queue::response::Response>().await {
Ok(response) => {
@@ -367,10 +378,16 @@ async fn prep_song(
std::process::exit(-1);
}
};
let coverart_queue_path = std::path::Path::new(&coverart_queue_fs_path);
println!("Saved coverart queue file at: {coverart_queue_path:?}");
Ok(((song.directory, song.filename), (coverart.directory, coverart.filename), metadata.clone(), coverart_queue_id))
let queued_coverart = queued_item::QueuedCoverArt {
id: coverart_queue_id,
coverart: coverart,
path: coverart_queue_fs_path
};
// let coverart_queue_path = std::path::Path::new(&coverart_queue_fs_path);
println!("Saved coverart queue file at: {:?}", queued_coverart.path);
Ok((queued_song, queued_coverart, metadata.clone()))
}
Err(err) => {
Err(err)