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

tsk-52: Cleanup bug #53

Merged
phoenix merged 16 commits from tsk-52 into main 2025-10-14 03:11:29 +00:00
Conversation 0 Commits 16 Files Changed 7 +17 -10
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c37ecaa8dc - Show all commits

27
src/main.rs
View File

@@ -59,7 +59,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let song_queue_id = song_queue_item.data[0].id;
let user_id = song_queue_item.data[0].user_id;
// TODO: Do something with the result later
match some_work(&app, &song_queue_id, &user_id).await {
Ok((
song,
@@ -255,7 +254,12 @@ async fn some_work(
std::io::Error,
> {
match prep_song(app, song_queue_id).await {
Ok((song_queue_path, coverart_queue_path, metadata, coverart_queue_id)) => {
Ok(((song_directory, song_filename), coverart_queue_path, metadata, coverart_queue_id)) => {
let mut song_queue_path: String = String::new();
let p = std::path::Path::new(&song_directory);
let sp = p.join(&song_filename);
song_queue_path.push_str(sp.to_str().unwrap_or_default());
match apply_metadata(&song_queue_path, &coverart_queue_path, &metadata).await {
Ok(_applied) => {
match update_queued_song::update_queued_song(
@@ -285,10 +289,12 @@ async fn some_work(
.json::<the_rest::create_song::response::Response>()
.await
{
Ok(resp) => {
Ok(mut resp) => {
println!("Response: {resp:?}");
let song = &resp.data[0];
let song = &mut resp.data[0];
song.directory = song_directory;
song.filename = song_filename;
match the_rest::create_coverart::create(app, &song.id, &coverart_queue_id).await {
Ok(response) => match response.json::<the_rest::create_coverart::response::Response>().await {
Ok(resp) => {
@@ -329,7 +335,7 @@ async fn prep_song(
song_queue_id: &uuid::Uuid,
) -> Result<
(
String,
(String, String),
String,
api::get_metadata_queue::response::Metadata,
uuid::Uuid,
@@ -341,10 +347,11 @@ async fn prep_song(
// Process data here...
match api::parsing::parse_response_into_bytes(response).await {
Ok(song_bytes) => {
let (directory, filename) = generate_song_queue_dir_and_filename().await;
let (song_directory, song_filename) =
generate_song_queue_dir_and_filename().await;
let song = icarus_models::song::Song {
directory,
filename,
directory: song_directory,
filename: song_filename,
data: song_bytes,
..Default::default()
};
@@ -392,8 +399,8 @@ async fn prep_song(
println!("Saved coverart queue file at: {coverart_queue_path:?}");
let c_path = util::path_buf_to_string(coverart_queue_path);
let s_path = util::path_buf_to_string(song_queue_path);
Ok((s_path, c_path, metadata.clone(), *coverart_queue_id))
// let s_path = util::path_buf_to_string(song_queue_path);
Ok(((song.directory, song.filename), c_path, metadata.clone(), *coverart_queue_id))
}
Err(err) => {
Err(err)