diff --git a/Cargo.lock b/Cargo.lock index 26e4cda..7f32f46 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -569,8 +569,8 @@ dependencies = [ [[package]] name = "icarus_envy" -version = "0.7.0" -source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.7.0#ab91c3fa4ff40680c6996eaea30be8cb04db0b31" +version = "0.8.0" +source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.8.0#349056db6e6254c2eb778fdcdd1d64de339f1309" dependencies = [ "const_format", "dotenvy", diff --git a/Cargo.toml b/Cargo.toml index e29f16a..96c10ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,4 +14,4 @@ time = { version = "0.3.53", features = ["macros", "serde"] } uuid = { version = "1.23.4", features = ["v4", "serde"] } icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.6.1" } icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.11.3" } -icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.7.0" } +icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.8.0" } diff --git a/src/auth/mod.rs b/src/auth/mod.rs index 49ec86d..15153cb 100644 --- a/src/auth/mod.rs +++ b/src/auth/mod.rs @@ -6,7 +6,7 @@ pub async fn get_token( let api_url = format!("{}/{endpoint}", app.auth_uri); let payload = serde_json::json!({ - "passphrase": icarus_envy::environment::get_service_passphrase().await.value, + "passphrase": icarus_envy::environment::get_service_passphrase().value, }); match client.post(api_url).json(&payload).send().await { diff --git a/src/config.rs b/src/config.rs index 760d951..ed66cd1 100644 --- a/src/config.rs +++ b/src/config.rs @@ -15,13 +15,9 @@ impl App { pub async fn initialize_app_config() -> App { App { - uri: icarus_envy::environment::get_icarus_base_api_url() - .await - .value, - auth_uri: icarus_envy::environment::get_icarus_auth_base_api_url() - .await - .value, - root_directory: icarus_envy::environment::get_root_directory().await.value, + uri: icarus_envy::environment::get_icarus_base_api_url().value, + auth_uri: icarus_envy::environment::get_icarus_auth_base_api_url().value, + root_directory: icarus_envy::environment::get_root_directory().value, ..Default::default() } } diff --git a/src/parser/mod.rs b/src/parser/mod.rs index 153d524..7b8ad8d 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -105,7 +105,7 @@ pub async fn prep_song( match crate::api::parsing::parse_response_into_bytes(response).await { Ok(song_bytes) => { let song = icarus_models::song::Song { - directory: icarus_envy::environment::get_root_directory().await.value, + directory: icarus_envy::environment::get_root_directory().value, filename: icarus_models::song::generate_filename( icarus_models::types::MusicType::FlacExtension, true, @@ -233,7 +233,7 @@ async fn init_queued_coverart( icarus_models::types::CoverArtType::None }; let coverart = icarus_models::coverart::CoverArt { - directory: icarus_envy::environment::get_root_directory().await.value, + directory: icarus_envy::environment::get_root_directory().value, filename: match icarus_models::coverart::generate_filename(covart_type, true) { Ok(filename) => filename, Err(err) => {