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

Refactoring #67

Merged
phoenix merged 9 commits from refactoring into main 2025-10-26 19:49:31 +00:00
Conversation 0 Commits 9 Files Changed 4 +76 -66
1 changed files with 76 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit be18ba8254 - Show all commits

52
src/parser/mod.rs
View File

@@ -141,12 +141,8 @@ pub async fn prep_song(
Ok(response) => { Ok(response) => {
let bod = &response.data[0]; let bod = &response.data[0];
match process_coverart(app, &queued_song.id, bod).await { match process_coverart(app, &queued_song.id, bod).await {
Ok(qc) => { Ok(qc) => Ok((queued_song, qc, bod.metadata.clone())),
Ok((queued_song, qc, bod.metadata.clone())) Err(err) => Err(err),
}
Err(err) => {
Err(err)
}
} }
} }
Err(err) => Err(err), Err(err) => Err(err),
@@ -165,11 +161,8 @@ pub async fn prep_song(
pub async fn process_coverart( pub async fn process_coverart(
app: &crate::config::App, app: &crate::config::App,
queued_song_id: &uuid::Uuid, queued_song_id: &uuid::Uuid,
queued_item: &crate::api::get_metadata_queue::response::QueueItem queued_item: &crate::api::get_metadata_queue::response::QueueItem,
) -> Result< ) -> Result<crate::queued_item::QueuedCoverArt, reqwest::Error> {
crate::queued_item::QueuedCoverArt
, reqwest::Error> {
let id = queued_item.id; let id = queued_item.id;
let created_at = queued_item.created_at; let created_at = queued_item.created_at;
let metadata = &queued_item.metadata; let metadata = &queued_item.metadata;
@@ -180,33 +173,50 @@ pub async fn process_coverart(
println!("Getting coverart queue"); println!("Getting coverart queue");
match crate::api::get_coverart_queue::get(app, queued_song_id).await { match crate::api::get_coverart_queue::get(app, queued_song_id).await {
Ok(response) => { Ok(response) => {
match response.json::<crate::api::get_coverart_queue::response::Response>().await { match response
.json::<crate::api::get_coverart_queue::response::Response>()
.await
{
Ok(response) => { Ok(response) => {
let coverart_queue = &response.data[0]; let coverart_queue = &response.data[0];
let coverart_queue_id = coverart_queue.id; let coverart_queue_id = coverart_queue.id;
println!("Coverart queue Id: {coverart_queue_id:?}"); println!("Coverart queue Id: {coverart_queue_id:?}");
match crate::api::get_coverart_queue::get_data(app, &coverart_queue_id).await { match crate::api::get_coverart_queue::get_data(app, &coverart_queue_id).await {
Ok(response) => match crate::api::parsing::parse_response_into_bytes(response).await { Ok(response) => {
match crate::api::parsing::parse_response_into_bytes(response).await {
Ok(coverart_queue_bytes) => { Ok(coverart_queue_bytes) => {
let queued_coverart = init_queued_coverart(&coverart_queue_id, &coverart_queue.file_type, coverart_queue_bytes).await; let queued_coverart = init_queued_coverart(
println!("Saved coverart queue file at: {:?}", queued_coverart.path); &coverart_queue_id,
&coverart_queue.file_type,
coverart_queue_bytes,
)
.await;
println!(
"Saved coverart queue file at: {:?}",
queued_coverart.path
);
Ok(queued_coverart) Ok(queued_coverart)
} }
Err(err) => Err(err) Err(err) => Err(err),
}
Err(err) => Err(err)
} }
} }
Err(err) => Err(err) Err(err) => Err(err),
}
}
Err(err) => Err(err),
} }
} }
Err(err) => Err(err), Err(err) => Err(err),
} }
} }
async fn init_queued_coverart(coverart_queue_id: &uuid::Uuid, file_type: &str, bytes: Vec<u8>) -> crate::queued_item::QueuedCoverArt { async fn init_queued_coverart(
coverart_queue_id: &uuid::Uuid,
file_type: &str,
bytes: Vec<u8>,
) -> crate::queued_item::QueuedCoverArt {
// TODO: Consider separating song and coverart when saving to the filesystem // TODO: Consider separating song and coverart when saving to the filesystem
let covart_type = if file_type == "png" { let covart_type = if file_type == "png" {
icarus_models::types::CoverArtTypes::PngExtension icarus_models::types::CoverArtTypes::PngExtension
@@ -227,7 +237,7 @@ async fn init_queued_coverart(coverart_queue_id: &uuid::Uuid, file_type: &str, b
let queued_coverart = crate::queued_item::QueuedCoverArt { let queued_coverart = crate::queued_item::QueuedCoverArt {
id: *coverart_queue_id, id: *coverart_queue_id,
coverart, coverart,
path: coverart_queue_fs_path path: coverart_queue_fs_path,
}; };
queued_coverart queued_coverart