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 +24 -19
4 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@@ -520,8 +520,8 @@ dependencies = [
[[package]]
name = "icarus_models"
version = "0.8.3"
source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.8.3#0a27b8ccb1ac40361df8d3131f567f37f06cdc08"
version = "0.9.2"
source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.9.2#05525618514409101c1d6474dafb201386d14a30"
dependencies = [
"josekit",
"rand",
@@ -1322,7 +1322,7 @@ dependencies = [
[[package]]
name = "songparser"
version = "0.4.10"
version = "0.4.11"
dependencies = [
"futures",
"icarus_envy",

4
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "songparser"
version = "0.4.10"
version = "0.4.11"
edition = "2024"
rust-version = "1.90"
@@ -14,5 +14,5 @@ time = { version = "0.3.44", features = ["macros", "serde"] }
uuid = { version = "1.18.1", features = ["v4", "serde"] }
rand = { version = "0.9.2" }
icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.4.3" }
icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.8.3" }
icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.9.2" }
icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.5.0" }

7
src/api.rs
View File

@@ -1,5 +1,4 @@
pub mod fetch_next_queue_item {
pub async fn fetch_next_queue_item(
app: &crate::config::App,
) -> Result<reqwest::Response, reqwest::Error> {
@@ -12,9 +11,7 @@ pub mod fetch_next_queue_item {
}
pub mod response {
use serde::{Deserialize, Serialize};
#[derive(Debug, Deserialize, Serialize)]
#[derive(Debug, serde::Deserialize, serde::Serialize)]
pub struct QueueItem {
pub id: uuid::Uuid,
pub filename: String,
@@ -22,7 +19,7 @@ pub mod fetch_next_queue_item {
pub user_id: uuid::Uuid,
}
#[derive(Debug, Deserialize, Serialize)]
#[derive(Debug, serde::Deserialize, serde::Serialize)]
pub struct SongQueueItem {
pub message: String,
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 {
directory: icarus_envy::environment::get_root_directory().await.value,
filename: icarus_models::song::generate_filename(
icarus_models::types::MusicTypes::FlacExtension,
icarus_models::types::MusicType::FlacExtension,
true,
),
)
.unwrap(),
data: song_bytes,
..Default::default()
};
@@ -218,17 +219,24 @@ async fn init_queued_coverart(
bytes: Vec<u8>,
) -> crate::queued_item::QueuedCoverArt {
// TODO: Consider separating song and coverart when saving to the filesystem
let covart_type = if file_type == "png" {
icarus_models::types::CoverArtTypes::PngExtension
} else if file_type == "jpeg" {
icarus_models::types::CoverArtTypes::JpegExtension
let covart_type = if file_type == icarus_meta::detection::coverart::constants::PNG_TYPE {
icarus_models::types::CoverArtType::PngExtension
} else if file_type == icarus_meta::detection::coverart::constants::JPEG_TYPE {
icarus_models::types::CoverArtType::JpegExtension
} else if file_type == icarus_meta::detection::coverart::constants::JPG_TYPE {
icarus_models::types::CoverArtType::JpgExtension
} else {
// TODO: This doesn't seem right
icarus_models::types::CoverArtTypes::JpgExtension
icarus_models::types::CoverArtType::None
};
let coverart = icarus_models::coverart::CoverArt {
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,
..Default::default()
};