bump: icarus_models

.gitea/workflows/workflow.yml

@@ -31,6 +31,25 @@ jobs:
           ssh-add -v ~/.ssh/gitlab_deploy_key
           cargo check
 
+  test:
+    name: Test Suite
+    runs-on: ubuntu-24.04
+    needs: setup_ssh
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.96.1
+      - uses: Swatinem/rust-cache@v2
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
+          chmod 600 ~/.ssh/gitlab_deploy_key
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/gitlab_deploy_key
+          cargo test
+
   fmt:
     name: Rustfmt
     runs-on: ubuntu-24.04

Cargo.lock

@@ -569,8 +569,8 @@ dependencies = [
 
 [[package]]
 name = "icarus_envy"
-version = "0.8.0"
+version = "0.7.0"
-source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.8.0#349056db6e6254c2eb778fdcdd1d64de339f1309"
+source = "git+ssh://git@git.kundeng.us/phoenix/icarus_envy.git?tag=v0.7.0#ab91c3fa4ff40680c6996eaea30be8cb04db0b31"
 dependencies = [
  "const_format",
  "dotenvy",
@@ -999,15 +999,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
-[[package]]
-name = "openssl-src"
-version = "300.6.1+3.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46eb8fb9fb3b61ce1c0f8a026c4c1a0714d3a9e138e7fbde78753ce2babc3846"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "openssl-sys"
 version = "0.9.117"
@@ -1016,7 +1007,6 @@ checksum = "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695"
 dependencies = [
  "cc",
  "libc",
- "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -1541,13 +1531,12 @@ dependencies = [
 
 [[package]]
 name = "songparser"
-version = "0.6.1"
+version = "0.6.0"
 dependencies = [
  "futures",
  "icarus_envy",
  "icarus_meta",
  "icarus_models",
- "openssl",
  "reqwest",
  "serde",
  "serde_json",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "songparser"
-version = "0.6.1"
+version = "0.6.0"
 edition = "2024"
 rust-version = "1.95"
 
@@ -8,11 +8,10 @@ rust-version = "1.95"
 tokio = { version = "1.52.3", features = ["full"] }
 futures = { version = "0.3.32" }
 reqwest = { version = "0.13.4", features = ["json", "stream", "multipart"] }
-openssl = { version = "0.10.81", features = ["vendored"] }
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { version = "1.0.150" }
 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.8.0" }
+icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.7.0" }

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().value,
+        "passphrase": icarus_envy::environment::get_service_passphrase().await.value,
     });
 
     match client.post(api_url).json(&payload).send().await {

src/config.rs

@@ -15,9 +15,13 @@ impl App {
 
 pub async fn initialize_app_config() -> App {
     App {
-        uri: icarus_envy::environment::get_icarus_base_api_url().value,
+        uri: icarus_envy::environment::get_icarus_base_api_url()
-        auth_uri: icarus_envy::environment::get_icarus_auth_base_api_url().value,
+            .await
-        root_directory: icarus_envy::environment::get_root_directory().value,
+            .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()
     }
 }

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().value,
+                        directory: icarus_envy::environment::get_root_directory().await.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().value,
+        directory: icarus_envy::environment::get_root_directory().await.value,
         filename: match icarus_models::coverart::generate_filename(covart_type, true) {
             Ok(filename) => filename,
             Err(err) => {