From ce8445867b61099f5d60e453b076befddf1e1a61 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 11 Oct 2025 19:52:26 -0400 Subject: [PATCH 1/5] icarus_models version bump --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f26b708..5dd8bcc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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..0c66e55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" } -- 2.47.3 From a791007a6f532810a0493031c1d3a4a35b33d219 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 11 Oct 2025 19:55:32 -0400 Subject: [PATCH 2/5] icarus_models related changes --- src/managers/commit_manager.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 94d7e12..4d6c2bb 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -373,9 +373,9 @@ 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, @@ -547,7 +547,7 @@ 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) { -- 2.47.3 From 4819bafd93ee389f54205930a7d939ebbc79b61c Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 11 Oct 2025 19:57:03 -0400 Subject: [PATCH 3/5] Warning fixes --- src/managers/commit_manager.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 4d6c2bb..0ce008d 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -375,13 +375,14 @@ impl CommitManager { println!("Path: {:?}", s.song_path()); s.data = icarus_models::song::io::to_data(&s).unwrap(); - cover_art.data = icarus_models::coverart::io::to_data(&cover_art).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 { @@ -554,7 +555,7 @@ impl CommitManager { Ok(album) => { for song in sngs { let members = UploadSongMembers { - song: song, + song, coverart: cover_art.clone(), token: token.clone(), album: album.clone(), -- 2.47.3 From a9b6c470f92906db2a83bfb7bd00c89d2ab2b663 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 11 Oct 2025 19:57:19 -0400 Subject: [PATCH 4/5] Version bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5dd8bcc..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", diff --git a/Cargo.toml b/Cargo.toml index 0c66e55..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" -- 2.47.3 From 724fcd21d94d91b0bd829146953bcde291327006 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 11 Oct 2025 20:01:13 -0400 Subject: [PATCH 5/5] Test fix --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); } -- 2.47.3