icarus_models changes

src/callers/coverart.rs

@@ -848,7 +848,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 {
@@ -1466,7 +1468,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();