Cargo.lock

@@ -840,7 +840,7 @@ dependencies = [
 
 [[package]]
 name = "icarus"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "axum",
  "axum-extra",
@@ -889,8 +889,8 @@ dependencies = [
 
 [[package]]
 name = "icarus_models"
-version = "0.5.6"
+version = "0.6.6"
-source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.5.6#2d6b550ae6721b41ecc3039799f6a5e873869077"
+source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.6.6-65-eac7562b80-111#eac7562b80b9f82d21ab737d1e84ba4f12e472dd"
 dependencies = [
  "josekit",
  "rand 0.9.1",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "icarus"
-version = "0.2.2"
+version = "0.2.3"
 edition = "2024"
 rust-version = "1.88"
 
@@ -26,7 +26,7 @@ josekit = { version = "0.10.1" }
 utoipa = { version = "5.4.0", features = ["axum_extras"] }
 utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
 icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.3.0" }
-icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.5.6" }
+icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.6.6-65-eac7562b80-111" }
 icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.4.1-main-8f0d123db5-006" }
 
 [dev-dependencies]

src/callers/coverart.rs

@@ -473,8 +473,6 @@ pub mod cov_db {
 }
 
 pub mod endpoint {
-    use std::io::Write;
-
     use axum::response::IntoResponse;
 
     /// Endpoint to queue cover art
@@ -714,12 +712,11 @@ pub mod endpoint {
                         coverart.title = song.album.clone();
                         coverart.data = data;
 
-                        let mut file = std::fs::File::create(&save_path).unwrap();
+                        match coverart.save_to_filesystem() {
-                        file.write_all(&coverart.data).unwrap();
+                            Ok(_) => {
-
                                 match super::cov_db::create(&pool, &coverart, &song.id).await {
                                     Ok(id) => {
-                                // TODO: Populate song_id
+                                        coverart.song_id = song_id;
                                         coverart.id = id;
                                         println!("Cover Art created");
 
@@ -734,6 +731,15 @@ pub mod endpoint {
                                     }
                                 }
                             }
+                            Err(err) => {
+                                response.message = err.to_string();
+                                (
+                                    axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                                    axum::Json(response),
+                                )
+                            }
+                        }
+                    }
                     Err(err) => {
                         response.message = err.to_string();
                         (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
@@ -848,7 +854,7 @@ pub mod endpoint {
         axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
     ) -> (axum::http::StatusCode, axum::response::Response) {
         match super::cov_db::get_coverart(&pool, &id).await {
-            Ok(coverart) => match coverart.to_data() {
+            Ok(coverart) => match icarus_models::coverart::io::to_data(&coverart) {
                 Ok(data) => {
                     let bytes = axum::body::Bytes::from(data);
                     let mut response = bytes.into_response();

src/callers/song.rs

@@ -1207,8 +1207,10 @@ pub mod endpoint {
 
         if payload.is_valid() {
             let mut song = payload.to_song();
-            song.filename =
+            song.filename = icarus_models::song::generate_filename(
-                song.generate_filename(icarus_models::types::MusicTypes::FlacExtension, true);
+                icarus_models::types::MusicTypes::FlacExtension,
+                true,
+            );
             song.directory = icarus_envy::environment::get_root_directory().await.value;
 
             match song_queue::get_data(&pool, &payload.song_queue_id).await {
@@ -1227,13 +1229,7 @@ pub mod endpoint {
                         }
                     }
 
-                    let save_path = dir.join(&song.filename);
+                    match song.save_to_filesystem() {
-
-                    match std::fs::File::create(&save_path) {
-                        Ok(mut file) => {
-                            file.write_all(&song.data).unwrap();
-
-                            match song.song_path() {
                         Ok(_) => match super::song_db::insert(&pool, &song).await {
                             Ok((date_created, id)) => {
                                 song.id = id;
@@ -1244,23 +1240,12 @@ pub mod endpoint {
                                 (axum::http::StatusCode::OK, axum::Json(response))
                             }
                             Err(err) => {
-                                        response.message =
+                                response.message = format!("{:?} song {:?}", err.to_string(), song);
-                                            format!("{:?} song {:?}", err.to_string(), song);
                                 (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
                             }
                         },
                         Err(err) => {
                             response.message = err.to_string();
-                                    (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
-                                }
-                            }
-                        }
-                        Err(err) => {
-                            let song_path = song.song_path();
-                            response.message = format!(
-                                "{err:?} Song directory: {} Filename: {} Save Path: {:?} Song Path: {:?}",
-                                song.directory, song.filename, save_path, song_path
-                            );
                             (
                                 axum::http::StatusCode::INTERNAL_SERVER_ERROR,
                                 axum::Json(response),
@@ -1466,7 +1451,7 @@ pub mod endpoint {
         axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
     ) -> (axum::http::StatusCode, axum::response::Response) {
         match super::song_db::get_song(&pool, &id).await {
-            Ok(song) => match song.to_data() {
+            Ok(song) => match icarus_models::song::io::to_data(&song) {
                 Ok(data) => {
                     let bytes = axum::body::Bytes::from(data);
                     let mut response = bytes.into_response();