Update #2

Merged
phoenix merged 16 commits from update into main 2026-07-07 22:49:08 -04:00
5 changed files with 9 additions and 13 deletions
Showing only changes of commit a9ad40dd90 - Show all commits
Generated
+2 -2
View File
@@ -569,8 +569,8 @@ dependencies = [
[[package]] [[package]]
name = "icarus_envy" name = "icarus_envy"
version = "0.7.0" version = "0.8.0"
source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.7.0#ab91c3fa4ff40680c6996eaea30be8cb04db0b31" source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.8.0#349056db6e6254c2eb778fdcdd1d64de339f1309"
dependencies = [ dependencies = [
"const_format", "const_format",
"dotenvy", "dotenvy",
+1 -1
View File
@@ -14,4 +14,4 @@ time = { version = "0.3.53", features = ["macros", "serde"] }
uuid = { version = "1.23.4", features = ["v4", "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_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_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" }
+1 -1
View File
@@ -6,7 +6,7 @@ pub async fn get_token(
let api_url = format!("{}/{endpoint}", app.auth_uri); let api_url = format!("{}/{endpoint}", app.auth_uri);
let payload = serde_json::json!({ 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 { match client.post(api_url).json(&payload).send().await {
+3 -7
View File
@@ -15,13 +15,9 @@ impl App {
pub async fn initialize_app_config() -> App { pub async fn initialize_app_config() -> App {
App { App {
uri: icarus_envy::environment::get_icarus_base_api_url() uri: icarus_envy::environment::get_icarus_base_api_url().value,
.await auth_uri: icarus_envy::environment::get_icarus_auth_base_api_url().value,
.value, root_directory: icarus_envy::environment::get_root_directory().value,
auth_uri: icarus_envy::environment::get_icarus_auth_base_api_url()
.await
.value,
root_directory: icarus_envy::environment::get_root_directory().await.value,
..Default::default() ..Default::default()
} }
} }
+2 -2
View File
@@ -105,7 +105,7 @@ pub async fn prep_song(
match crate::api::parsing::parse_response_into_bytes(response).await { match crate::api::parsing::parse_response_into_bytes(response).await {
Ok(song_bytes) => { Ok(song_bytes) => {
let song = icarus_models::song::Song { 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( filename: icarus_models::song::generate_filename(
icarus_models::types::MusicType::FlacExtension, icarus_models::types::MusicType::FlacExtension,
true, true,
@@ -233,7 +233,7 @@ async fn init_queued_coverart(
icarus_models::types::CoverArtType::None icarus_models::types::CoverArtType::None
}; };
let coverart = icarus_models::coverart::CoverArt { 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) { filename: match icarus_models::coverart::generate_filename(covart_type, true) {
Ok(filename) => filename, Ok(filename) => filename,
Err(err) => { Err(err) => {