From 6727d4449635ca750c0fc76f64e7acde1bca29f6 Mon Sep 17 00:00:00 2001
From: phoenix <kundeng00@pm.me>
Date: Thu, 30 Oct 2025 14:52:27 -0400
Subject: [PATCH] Build fixes and changes

---
 src/api.rs        |  7 ++-----
 src/parser/mod.rs | 26 +++++++++++++++++---------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/api.rs b/src/api.rs
index 01be8b9..777dad2 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -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>,
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index 2a3b3b9..8c3220a 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -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()
     };