From c2a2ca049d391468a71fe2c2a97a2e8d152ac8f0 Mon Sep 17 00:00:00 2001
From: KD <kundeng00@pm.me>
Date: Sat, 11 Oct 2025 20:05:34 -0400
Subject: [PATCH] icarus_models version bump (#71)

* icarus_models version bump

* icarus_models related changes

* Warning fixes

* Version bump

* Test fix
---
 Cargo.lock                     |  6 +++---
 Cargo.toml                     |  4 ++--
 src/main.rs                    |  2 +-
 src/managers/commit_manager.rs | 13 +++++++------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f26b708..58205ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -479,7 +479,7 @@ dependencies = [
 
 [[package]]
 name = "icarus-dm"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "futures",
  "http",
@@ -494,8 +494,8 @@ dependencies = [
 
 [[package]]
 name = "icarus_models"
-version = "0.5.6"
-source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.5.6#2d6b550ae6721b41ecc3039799f6a5e873869077"
+version = "0.6.6"
+source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.6.6-65-eac7562b80-111#eac7562b80b9f82d21ab737d1e84ba4f12e472dd"
 dependencies = [
  "josekit",
  "rand",
diff --git a/Cargo.toml b/Cargo.toml
index aa53508..cb9d09a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "icarus-dm"
-version = "0.7.0"
+version = "0.7.1"
 rust-version = "1.88"
 edition = "2024"
 
@@ -14,4 +14,4 @@ serde_json = "1.0.140"
 tokio = { version = "1.45.1", features = ["full"] }
 tokio-util = { version = "0.7.15", features = ["codec"] }
 uuid = { version = "1.17.0", features = ["v4", "serde"] }
-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" }
diff --git a/src/main.rs b/src/main.rs
index 98eb30d..46dfc9b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -63,7 +63,7 @@ mod tests {
                     match managers::commit_manager::retrieve_song(
                         &album, track, disc, &directory, &filename,
                     ) {
-                        Ok(song) => match song.to_data() {
+                        Ok(song) => match icarus_models::song::io::to_data(&song) {
                             Ok(_) => {
                                 print!("Success");
                             }
diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs
index 94d7e12..0ce008d 100644
--- a/src/managers/commit_manager.rs
+++ b/src/managers/commit_manager.rs
@@ -373,15 +373,16 @@ impl CommitManager {
                             println!("Directory: {:?}", s.directory);
                             println!("Filename: {:?}", s.filename);
                             println!("Path: {:?}", s.song_path());
-                            s.data = s.to_data().unwrap();
+                            s.data = icarus_models::song::io::to_data(&s).unwrap();
 
-                            cover_art.data = cover_art.to_data().unwrap();
+                            cover_art.data =
+                                icarus_models::coverart::io::to_data(&cover_art).unwrap();
 
                             let members = UploadSongMembers {
                                 song: s,
                                 coverart: cover_art,
-                                token: token,
-                                album: album,
+                                token,
+                                album,
                             };
 
                             match self.upload_song_process(&members).await {
@@ -547,14 +548,14 @@ impl CommitManager {
         let host = self.ica_action.retrieve_flag_value(&String::from("-h"));
         up.set_api(&host);
 
-        cover_art.data = cover_art.to_data().unwrap();
+        cover_art.data = icarus_models::coverart::io::to_data(&cover_art).unwrap();
 
         match self.get_songs(&metadatapath, sourcepath) {
             Ok(sngs) => match icarus_models::album::collection::parse_album(&metadatapath) {
                 Ok(album) => {
                     for song in sngs {
                         let members = UploadSongMembers {
-                            song: song,
+                            song,
                             coverart: cover_art.clone(),
                             token: token.clone(),
                             album: album.clone(),