From e3fc08af632653765538837206a7bda0b929686a Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Fri, 24 Oct 2025 13:18:20 -0400 Subject: [PATCH 1/5] tsk-81: Using method in Song to save to filesystem --- src/managers/commit_manager.rs | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index c0781d7..6f36dc1 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -192,7 +192,7 @@ impl CommitManager { let api = prsr.retrieve_api(parsers::api_parser::APIType::Main); let mut dwn_loader = syncers::download::Download { api: api.clone() }; - let song = icarus_models::song::Song { + let mut song = icarus_models::song::Song { id: song_id, ..Default::default() }; @@ -200,12 +200,24 @@ impl CommitManager { match dwn_loader.download_song(&token, &song).await { Ok(o) => { println!("Success"); - let filename = String::from("audio") - + icarus_models::constants::file_extensions::audio::DEFAULTMUSICEXTENSION; - let data = o.as_bytes(); + // let filename = String::from("audio") + // + icarus_models::constants::file_extensions::audio::DEFAULTMUSICEXTENSION; + song.data = o.as_bytes().to_vec(); + song.directory = String::from("."); + song.filename = icarus_models::song::generate_filename(icarus_models::types::MusicTypes::FlacExtension, true); + match song.save_to_filesystem() { + Ok(_) => { + println!("Song saved"); + } + Err(err) => { + eprintln!("Error: {err:?}"); + } + } + /* let mut file = std::fs::File::create(filename).expect("Failed to save"); file.write_all(data) .expect("Failed to save downloaded song"); + */ } Err(er) => { println!("Error {er:?}"); -- 2.47.3 From a8b7c8c374cb4a5187fcbd63be614259cf054dc1 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Fri, 24 Oct 2025 13:22:43 -0400 Subject: [PATCH 2/5] tsk-81: icaurs_models version bump --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- src/managers/commit_manager.rs | 10 ++-------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 061ddc0..44066f9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -466,8 +466,8 @@ dependencies = [ [[package]] name = "icarus_models" -version = "0.8.0" -source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.8.0#860d684e7b340b05d43d1fc3e6bd36b7cc45d81b" +version = "0.8.3" +source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.8.3-main-0a27b8ccb1-111#0a27b8ccb1ac40361df8d3131f567f37f06cdc08" dependencies = [ "josekit", "rand", diff --git a/Cargo.toml b/Cargo.toml index 9c098c2..5e91cc2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,4 +14,4 @@ serde_json = "1.0.145" tokio = { version = "1.47.1", features = ["full"] } tokio-util = { version = "0.7.16", features = ["codec"] } uuid = { version = "1.18.1", features = ["v4", "serde"] } -icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.8.0" } +icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.8.3-main-0a27b8ccb1-111" } diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 6f36dc1..0e2e96b 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -200,8 +200,7 @@ impl CommitManager { match dwn_loader.download_song(&token, &song).await { Ok(o) => { println!("Success"); - // let filename = String::from("audio") - // + icarus_models::constants::file_extensions::audio::DEFAULTMUSICEXTENSION; + song.data = o.as_bytes().to_vec(); song.directory = String::from("."); song.filename = icarus_models::song::generate_filename(icarus_models::types::MusicTypes::FlacExtension, true); @@ -210,14 +209,9 @@ impl CommitManager { println!("Song saved"); } Err(err) => { - eprintln!("Error: {err:?}"); + eprintln!("Error saving song: {err:?}"); } } - /* - let mut file = std::fs::File::create(filename).expect("Failed to save"); - file.write_all(data) - .expect("Failed to save downloaded song"); - */ } Err(er) => { println!("Error {er:?}"); -- 2.47.3 From 46782164cd243744b7f0292d351245bd57027854 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Fri, 24 Oct 2025 13:24:24 -0400 Subject: [PATCH 3/5] tsk-81: Code formatting --- src/managers/commit_manager.rs | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 0e2e96b..4e3decb 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -201,17 +201,20 @@ impl CommitManager { Ok(o) => { println!("Success"); - song.data = o.as_bytes().to_vec(); - song.directory = String::from("."); - song.filename = icarus_models::song::generate_filename(icarus_models::types::MusicTypes::FlacExtension, true); - match song.save_to_filesystem() { - Ok(_) => { - println!("Song saved"); - } - Err(err) => { - eprintln!("Error saving song: {err:?}"); - } - } + song.data = o.as_bytes().to_vec(); + song.directory = String::from("."); + song.filename = icarus_models::song::generate_filename( + icarus_models::types::MusicTypes::FlacExtension, + true, + ); + match song.save_to_filesystem() { + Ok(_) => { + println!("Song saved"); + } + Err(err) => { + eprintln!("Error saving song: {err:?}"); + } + } } Err(er) => { println!("Error {er:?}"); -- 2.47.3 From 5e4bbef55ffbec1e6311f1b38b1a09893f4ee829 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Fri, 24 Oct 2025 13:29:31 -0400 Subject: [PATCH 4/5] tsk-81: icarus_models version bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 44066f9..e697d89 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -467,7 +467,7 @@ dependencies = [ [[package]] name = "icarus_models" version = "0.8.3" -source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.8.3-main-0a27b8ccb1-111#0a27b8ccb1ac40361df8d3131f567f37f06cdc08" +source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.8.3#0a27b8ccb1ac40361df8d3131f567f37f06cdc08" dependencies = [ "josekit", "rand", diff --git a/Cargo.toml b/Cargo.toml index 5e91cc2..2e24d9a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,4 +14,4 @@ serde_json = "1.0.145" tokio = { version = "1.47.1", features = ["full"] } tokio-util = { version = "0.7.16", features = ["codec"] } uuid = { version = "1.18.1", features = ["v4", "serde"] } -icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.8.3-main-0a27b8ccb1-111" } +icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.8.3" } -- 2.47.3 From 3464db3aa12bec4772045247e1d7f6f19075c328 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Fri, 24 Oct 2025 13:29:51 -0400 Subject: [PATCH 5/5] tsk-81: Version bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e697d89..2d5e77e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -451,7 +451,7 @@ dependencies = [ [[package]] name = "icarus-dm" -version = "0.8.6" +version = "0.8.7" dependencies = [ "futures", "http", diff --git a/Cargo.toml b/Cargo.toml index 2e24d9a..546106e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus-dm" -version = "0.8.6" +version = "0.8.7" rust-version = "1.90" edition = "2024" -- 2.47.3