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

Using file_type passed when getting the CoverArtQueue

Browse Source
This commit is contained in:
phoenix
2025-10-21 13:14:31 -04:00
parent 3bb7fb1010
commit 2b824a268b
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/api.rs
View File

@@ -158,6 +158,7 @@ pub mod get_coverart_queue {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
pub struct CoverArtQueue { pub struct CoverArtQueue {
pub id: uuid::Uuid, pub id: uuid::Uuid,
pub file_type: String,
pub song_queue_id: uuid::Uuid, pub song_queue_id: uuid::Uuid,
} }

20
src/main.rs
View File

@@ -341,13 +341,14 @@ async fn prep_song(
Ok(response) => { Ok(response) => {
match response.json::<api::get_coverart_queue::response::Response>().await { match response.json::<api::get_coverart_queue::response::Response>().await {
Ok(response) => { Ok(response) => {
let coverart_queue_id = &response.data[0].id; let coverart_queue = &response.data[0];
let coverart_queue_id = coverart_queue.id;
println!("Coverart queue Id: {coverart_queue_id:?}"); println!("Coverart queue Id: {coverart_queue_id:?}");
match api::get_coverart_queue::get_data(app, coverart_queue_id).await { match api::get_coverart_queue::get_data(app, &coverart_queue_id).await {
Ok(response) => match api::parsing::parse_response_into_bytes(response).await { Ok(response) => match api::parsing::parse_response_into_bytes(response).await {
Ok(coverart_queue_bytes) => { Ok(coverart_queue_bytes) => {
let (directory, filename) = generate_coverart_queue_dir_and_filename().await; let (directory, filename) = generate_coverart_queue_dir_and_filename(&coverart_queue.file_type).await;
let coverart = icarus_models::coverart::CoverArt { let coverart = icarus_models::coverart::CoverArt {
directory, directory,
filename, filename,
@@ -367,7 +368,7 @@ async fn prep_song(
let coverart_queue_path = std::path::Path::new(&coverart_queue_fs_path); let coverart_queue_path = std::path::Path::new(&coverart_queue_fs_path);
println!("Saved coverart queue file at: {coverart_queue_path:?}"); println!("Saved coverart queue file at: {coverart_queue_path:?}");
Ok(((song.directory, song.filename), (coverart.directory, coverart.filename), metadata.clone(), *coverart_queue_id)) Ok(((song.directory, song.filename), (coverart.directory, coverart.filename), metadata.clone(), coverart_queue_id))
} }
Err(err) => { Err(err) => {
Err(err) Err(err)
@@ -413,7 +414,7 @@ pub async fn generate_song_queue_dir_and_filename() -> (String, String) {
} }
// TODO: Consider having something like this in icarus_models // TODO: Consider having something like this in icarus_models
pub async fn generate_coverart_queue_dir_and_filename() -> (String, String) { pub async fn generate_coverart_queue_dir_and_filename(file_type: &str) -> (String, String) {
use rand::Rng; use rand::Rng;
let mut filename: String = String::new(); let mut filename: String = String::new();
@@ -432,8 +433,13 @@ pub async fn generate_coverart_queue_dir_and_filename() -> (String, String) {
} }
} }
// TODO: Do not hard code the file extension filename += if file_type == "jpeg" || file_type == "jpg" {
filename += ".jpeg"; ".jpeg"
} else if file_type == "png" {
".png"
} else {
""
};
// TODO: Consider separating song and coverart when saving to the filesystem // TODO: Consider separating song and coverart when saving to the filesystem
let directory = icarus_envy::environment::get_root_directory().await.value; let directory = icarus_envy::environment::get_root_directory().await.value;