Compare commits
3 Commits
v0.3.0
...
bd54139867
Author | SHA1 | Date | |
---|---|---|---|
bd54139867
|
|||
74a01d0c38
|
|||
ea6f65a206
|
4
Cargo.lock
generated
4
Cargo.lock
generated
@@ -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",
|
||||
|
@@ -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" }
|
||||
|
14
src/main.rs
14
src/main.rs
@@ -12,8 +12,12 @@ pub const SECONDS_TO_SLEEP: u64 = 5;
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
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)
|
||||
}
|
||||
|
Reference in New Issue
Block a user