tsk-213: Identify audio file type in initial step when queueing (#225)

* tsk-213: Adding song check when queueing songs

* tsk-213: Added check for updating queued song

* tsk-213: Removed todo

* tsk-213: Code cleanup

* tsk-213: Warning fix

* tsk-213: Version bump

* tsk-213: Minor status code changes

Cargo.lock

@@ -834,7 +834,7 @@ dependencies = [
 
 [[package]]
 name = "icarus"
-version = "0.3.9"
+version = "0.3.10"
 dependencies = [
  "axum",
  "axum-extra",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "icarus"
-version = "0.3.9"
+version = "0.3.10"
 edition = "2024"
 rust-version = "1.90"
 

src/callers/queue/song.rs

@@ -96,6 +96,19 @@ pub mod response {
     }
 }
 
+pub async fn is_song_valid(data: &[u8]) -> Result<bool, std::io::Error> {
+    match icarus_meta::detection::song::file_type_from_data(data) {
+        Ok(file_type) => {
+            if file_type.file_type == icarus_meta::detection::song::constants::FLAC_TYPE {
+                Ok(true)
+            } else {
+                Ok(false)
+            }
+        }
+        Err(err) => Err(err),
+    }
+}
+
 pub mod endpoint {
     use axum::response::IntoResponse;
 
@@ -139,6 +152,9 @@ pub mod endpoint {
             );
 
             let raw_data: Vec<u8> = data.to_vec();
+            match super::is_song_valid(&raw_data).await {
+                Ok(valid) => {
+                    if valid {
                         let queue_repo = repo::song::insert(
                             &pool,
                             &raw_data,
@@ -148,13 +164,26 @@ pub mod endpoint {
                         .await
                         .unwrap();
                         results.push(queue_repo);
+                    } else {
+                        response.message = String::from("Invalid song type");
+                        return (axum::http::StatusCode::BAD_REQUEST, axum::Json(response));
+                    }
+                }
+                Err(err) => {
+                    response.message = err.to_string();
+                    return (
+                        axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                        axum::Json(response),
+                    );
+                }
+            }
         }
 
         response.data = results;
         response.message = if response.data.is_empty() {
             String::from("Error")
         } else {
-            String::from("Success")
+            String::from(super::super::super::response::SUCCESSFUL)
         };
 
         (axum::http::StatusCode::OK, axum::Json(response))
@@ -234,7 +263,6 @@ pub mod endpoint {
         }
     }
 
-    // TODO: Rename
     /// Endpoint to download the queued song
     #[utoipa::path(
         get,
@@ -383,17 +411,37 @@ pub mod endpoint {
             );
 
             let raw_data: Vec<u8> = data.to_vec();
+            match super::is_song_valid(&raw_data).await {
+                Ok(valid) => {
+                    if valid {
                         match repo::song::update(&pool, &raw_data, &id).await {
                             Ok(_) => {
-                    response.message = String::from("Successful");
+                                response.message =
+                                    String::from(super::super::super::response::SUCCESSFUL);
                                 response.data.push(id);
                                 (axum::http::StatusCode::OK, axum::Json(response))
                             }
                             Err(err) => {
                                 response.message = err.to_string();
+                                (
+                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                    axum::Json(response),
+                                )
+                            }
+                        }
+                    } else {
+                        response.message = String::from("Invalid song type");
                         (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
                     }
                 }
+                Err(err) => {
+                    response.message = err.to_string();
+                    (
+                        axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                        axum::Json(response),
+                    )
+                }
+            }
         } else {
             response.message = String::from("No data provided");
             (axum::http::StatusCode::NOT_FOUND, axum::Json(response))