From b2f702c24c043464e768a10a4aa3bbb7430d539a Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 10 Oct 2025 19:35:40 +0000 Subject: [PATCH] icarus_envy version bump (#48) Reviewed-on: https://git.kundeng.us/phoenix/songparser/pulls/48 Co-authored-by: phoenix Co-committed-by: phoenix --- Cargo.lock | 6 +++--- Cargo.toml | 4 ++-- src/main.rs | 14 +++++++++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c7e55d6..f9483a7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -516,8 +516,8 @@ dependencies = [ [[package]] name = "icarus_envy" -version = "0.3.2" -source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.3.2#d84a8144aedf02e1b459d67c4023a7e0833f89fd" +version = "0.4.1" +source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.4.1-main-8f0d123db5-006#8f0d123db51b18e9cc4ab5bd39a474ba99bd39c3" dependencies = [ "const_format", "dotenvy", @@ -1320,7 +1320,7 @@ dependencies = [ [[package]] name = "songparser" -version = "0.3.0" +version = "0.3.1" dependencies = [ "futures", "icarus_envy", diff --git a/Cargo.toml b/Cargo.toml index 43d6682..5079145 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "songparser" -version = "0.3.0" +version = "0.3.1" edition = "2024" rust-version = "1.88" @@ -15,4 +15,4 @@ uuid = { version = "1.17.0", features = ["v4", "serde"] } rand = { version = "0.9.1" } icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.3.0" } icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.5.6" } -icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.3.2" } +icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.4.1-main-8f0d123db5-006" } diff --git a/src/main.rs b/src/main.rs index 7dac71c..815c343 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,8 +12,12 @@ pub const SECONDS_TO_SLEEP: u64 = 5; #[tokio::main] async fn main() -> Result<(), Box> { let mut app = config::App { - uri: icarus_envy::environment::get_icarus_base_api_url().await, - auth_uri: icarus_envy::environment::get_icarus_auth_base_api_url().await, + uri: icarus_envy::environment::get_icarus_base_api_url() + .await + .value, + auth_uri: icarus_envy::environment::get_icarus_auth_base_api_url() + .await + .value, ..Default::default() }; println!("Base URL: {:?}", app.uri); @@ -110,7 +114,7 @@ mod auth { let api_url = format!("{}/{endpoint}", app.auth_uri); let payload = serde_json::json!({ - "passphrase": icarus_envy::environment::get_service_passphrase().await, + "passphrase": icarus_envy::environment::get_service_passphrase().await.value, }); match client.post(api_url).json(&payload).send().await { @@ -415,7 +419,7 @@ pub async fn generate_song_queue_dir_and_filename() -> (String, String) { let mut song = icarus_models::song::Song::default(); song.filename = song.generate_filename(icarus_models::types::MusicTypes::FlacExtension, true); - song.directory = icarus_envy::environment::get_root_directory().await; + song.directory = icarus_envy::environment::get_root_directory().await.value; (song.directory, song.filename) } @@ -444,7 +448,7 @@ pub async fn generate_coverart_queue_dir_and_filename() -> (String, String) { filename += ".jpeg"; // TODO: Consider separating song and coverart when saving to the filesystem - let directory = icarus_envy::environment::get_root_directory().await; + let directory = icarus_envy::environment::get_root_directory().await.value; (directory, filename) }