Cleanup
All checks were successful
Rust Build / Check (pull_request) Successful in 33s
Rust Build / Test Suite (pull_request) Successful in 35s
Rust Build / Rustfmt (pull_request) Successful in 29s
Rust Build / Clippy (pull_request) Successful in 1m17s
Rust Build / build (pull_request) Successful in 1m55s

This commit is contained in:
2025-10-11 19:09:49 -04:00
parent dc9e624d49
commit d78b131760

View File

@@ -343,16 +343,12 @@ async fn prep_song(
Ok(song_bytes) => { Ok(song_bytes) => {
let (directory, filename) = generate_song_queue_dir_and_filename().await; let (directory, filename) = generate_song_queue_dir_and_filename().await;
let song = icarus_models::song::Song { let song = icarus_models::song::Song {
directory: directory, directory,
filename: filename, filename,
data: song_bytes, data: song_bytes,
..Default::default() ..Default::default()
}; };
let songpath = match song.song_path() { let songpath = song.song_path().unwrap_or_default();
Ok(songpath) => songpath,
Err(_err) => String::new(),
};
let song_queue_path = match song.save_to_filesystem() { let song_queue_path = match song.save_to_filesystem() {
Ok(_) => std::path::Path::new(&songpath), Ok(_) => std::path::Path::new(&songpath),
Err(_err) => std::path::Path::new(""), Err(_err) => std::path::Path::new(""),
@@ -395,8 +391,8 @@ async fn prep_song(
let coverart_queue_path = std::path::Path::new(&coverart.path); let coverart_queue_path = std::path::Path::new(&coverart.path);
println!("Saved coverart queue file at: {coverart_queue_path:?}"); println!("Saved coverart queue file at: {coverart_queue_path:?}");
let c_path = util::path_buf_to_string(&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); let s_path = util::path_buf_to_string(song_queue_path);
Ok((s_path, c_path, metadata.clone(), *coverart_queue_id)) Ok((s_path, c_path, metadata.clone(), *coverart_queue_id))
} }
Err(err) => { Err(err) => {