phoenix/icarus_dm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

icarus_models version bump #71

Merged
kdeng00 merged 5 commits from icarus_models-ver_bump into master 2025-10-11 20:05:35 -04:00
Conversation 0 Commits 5 Files Changed 4
+13 -12
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+3 -3
View File
@@ -479,7 +479,7 @@ dependencies = [
[[package]] [[package]]
name = "icarus-dm" name = "icarus-dm"
version = "0.7.0" version = "0.7.1"
dependencies = [ dependencies = [
"futures", "futures",
"http", "http",
@@ -494,8 +494,8 @@ dependencies = [
[[package]] [[package]]
name = "icarus_models" 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 = [ dependencies = [
"josekit", "josekit",
"rand", "rand",
Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "icarus-dm" name = "icarus-dm"
version = "0.7.0" version = "0.7.1"
rust-version = "1.88" rust-version = "1.88"
edition = "2024" edition = "2024"
@@ -14,4 +14,4 @@ serde_json = "1.0.140"
tokio = { version = "1.45.1", features = ["full"] } tokio = { version = "1.45.1", features = ["full"] }
tokio-util = { version = "0.7.15", features = ["codec"] } tokio-util = { version = "0.7.15", features = ["codec"] }
uuid = { version = "1.17.0", features = ["v4", "serde"] } 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" }
src/main.rs
+1 -1
View File
@@ -63,7 +63,7 @@ mod tests {
match managers::commit_manager::retrieve_song( match managers::commit_manager::retrieve_song(
&album, track, disc, &directory, &filename, &album, track, disc, &directory, &filename,
) { ) {
Ok(song) => match song.to_data() { Ok(song) => match icarus_models::song::io::to_data(&song) {
Ok(_) => { Ok(_) => {
print!("Success"); print!("Success");
} }
src/managers/commit_manager.rs
+7 -6
View File
@@ -373,15 +373,16 @@ impl CommitManager {
println!("Directory: {:?}", s.directory); println!("Directory: {:?}", s.directory);
println!("Filename: {:?}", s.filename); println!("Filename: {:?}", s.filename);
println!("Path: {:?}", s.song_path()); 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 { let members = UploadSongMembers {
song: s, song: s,
coverart: cover_art, coverart: cover_art,
token: token, token,
album: album, album,
}; };
match self.upload_song_process(&members).await { match self.upload_song_process(&members).await {
@@ -547,14 +548,14 @@ impl CommitManager {
let host = self.ica_action.retrieve_flag_value(&String::from("-h")); let host = self.ica_action.retrieve_flag_value(&String::from("-h"));
up.set_api(&host); 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) { match self.get_songs(&metadatapath, sourcepath) {
Ok(sngs) => match icarus_models::album::collection::parse_album(&metadatapath) { Ok(sngs) => match icarus_models::album::collection::parse_album(&metadatapath) {
Ok(album) => { Ok(album) => {
for song in sngs { for song in sngs {
let members = UploadSongMembers { let members = UploadSongMembers {
song: song, song,
coverart: cover_art.clone(), coverart: cover_art.clone(),
token: token.clone(), token: token.clone(),
album: album.clone(), album: album.clone(),