Update (#2)

Reviewed-on: #2

.gitea/workflows/workflow.yml

@@ -8,6 +8,10 @@ on:
     branches:
       - main 
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check:
     name: Check
@@ -27,25 +31,6 @@ 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.toml

@@ -1,18 +1,18 @@
 [package]
 name = "songparser"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2024"
 rust-version = "1.95"
 
 [dependencies]
-tokio = { version = "1.52.2", features = ["full"] }
+tokio = { version = "1.52.3", features = ["full"] }
 futures = { version = "0.3.32" }
-reqwest = { version = "0.13.3", features = ["json", "stream", "multipart"] }
+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.149" }
+serde_json = { version = "1.0.150" }
-time = { version = "0.3.47", features = ["macros", "serde"] }
+time = { version = "0.3.53", features = ["macros", "serde"] }
-uuid = { version = "1.23.1", features = ["v4", "serde"] }
+uuid = { version = "1.23.4", features = ["v4", "serde"] }
-rand = { version = "0.10.1" }
+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.0" }
+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.1" }
+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().await.value,
+        "passphrase": icarus_envy::environment::get_service_passphrase().value,
     });
 
     match client.post(api_url).json(&payload).send().await {

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()
+        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()
     }
 }

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) => {