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

icarus_models version bump #69

Merged
phoenix merged 4 commits from icarus_models_bump into main 2025-10-30 19:36:06 +00:00
Conversation 0 Commits 4 Files Changed 4 +19 -14
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6727d44496 - Show all commits

7
src/api.rs
View File

@@ -1,5 +1,4 @@
pub mod fetch_next_queue_item { pub mod fetch_next_queue_item {
pub async fn fetch_next_queue_item( pub async fn fetch_next_queue_item(
app: &crate::config::App, app: &crate::config::App,
) -> Result<reqwest::Response, reqwest::Error> { ) -> Result<reqwest::Response, reqwest::Error> {
@@ -12,9 +11,7 @@ pub mod fetch_next_queue_item {
} }
pub mod response { pub mod response {
use serde::{Deserialize, Serialize}; #[derive(Debug, serde::Deserialize, serde::Serialize)]
#[derive(Debug, Deserialize, Serialize)]
pub struct QueueItem { pub struct QueueItem {
pub id: uuid::Uuid, pub id: uuid::Uuid,
pub filename: String, pub filename: String,
@@ -22,7 +19,7 @@ pub mod fetch_next_queue_item {
pub user_id: uuid::Uuid, pub user_id: uuid::Uuid,
} }
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, serde::Deserialize, serde::Serialize)]
pub struct SongQueueItem { pub struct SongQueueItem {
pub message: String, pub message: String,
pub data: Vec<QueueItem>, pub data: Vec<QueueItem>,

26
src/parser/mod.rs
View File

@@ -107,9 +107,10 @@ pub async fn prep_song(
let song = icarus_models::song::Song { let song = icarus_models::song::Song {
directory: icarus_envy::environment::get_root_directory().await.value, directory: icarus_envy::environment::get_root_directory().await.value,
filename: icarus_models::song::generate_filename( filename: icarus_models::song::generate_filename(
icarus_models::types::MusicTypes::FlacExtension, icarus_models::types::MusicType::FlacExtension,
true, true,
), )
.unwrap(),
data: song_bytes, data: song_bytes,
..Default::default() ..Default::default()
}; };
@@ -218,17 +219,24 @@ async fn init_queued_coverart(
bytes: Vec<u8>, bytes: Vec<u8>,
) -> crate::queued_item::QueuedCoverArt { ) -> 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 == icarus_meta::detection::coverart::constants::PNG_TYPE {
icarus_models::types::CoverArtTypes::PngExtension icarus_models::types::CoverArtType::PngExtension
} else if file_type == "jpeg" { } else if file_type == icarus_meta::detection::coverart::constants::JPEG_TYPE {
icarus_models::types::CoverArtTypes::JpegExtension icarus_models::types::CoverArtType::JpegExtension
} else if file_type == icarus_meta::detection::coverart::constants::JPG_TYPE {
icarus_models::types::CoverArtType::JpgExtension
} else { } else {
// TODO: This doesn't seem right icarus_models::types::CoverArtType::None
icarus_models::types::CoverArtTypes::JpgExtension
}; };
let coverart = icarus_models::coverart::CoverArt { let coverart = icarus_models::coverart::CoverArt {
directory: icarus_envy::environment::get_root_directory().await.value, directory: icarus_envy::environment::get_root_directory().await.value,
filename: icarus_models::coverart::generate_filename(covart_type, true), filename: match icarus_models::coverart::generate_filename(covart_type, true) {
Ok(filename) => filename,
Err(err) => {
eprintln!("Error generating CoverArt filename: {err:?}");
panic!("Error initializing queued CoverArt");
}
},
data: bytes, data: bytes,
..Default::default() ..Default::default()
}; };