Compare commits

..
6 Commits
Author SHA1 Message Date
phoenix adb00c951d bump: tokio
songparser / Check (pull_request) Successful in 2m14s
songparser / Clippy (pull_request) Successful in 1m18s
songparser / Rustfmt (pull_request) Successful in 1m21s
songparser / Test Suite (pull_request) Successful in 1m26s
songparser / build (pull_request) Successful in 1m39s
2026-07-07 22:27:13 -04:00
phoenix 33d30ae1b3 Removing rand dependency. Unused 2026-07-07 22:25:58 -04:00
phoenix f782605c77 Adding workflow canceling 2026-07-07 22:24:19 -04:00
phoenix 63cda56ba2 Updated workflows
songparser / Rustfmt (pull_request) Successful in 39s
songparser / build (pull_request) Successful in 1m41s
songparser / Clippy (pull_request) Successful in 2m32s
songparser / Test Suite (pull_request) Successful in 3m15s
songparser / Check (pull_request) Successful in 1m3s
2026-07-07 22:22:00 -04:00
phoenix f0191becbd Forgot this file 2026-07-07 22:18:30 -04:00
phoenix 5045016ece bump: rust docker 2026-07-07 22:18:16 -04:00
6 changed files with 526 additions and 182 deletions
+19
View File
@@ -31,6 +31,25 @@ jobs:
ssh-add -v ~/.ssh/gitlab_deploy_key ssh-add -v ~/.ssh/gitlab_deploy_key
cargo check 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: fmt:
name: Rustfmt name: Rustfmt
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
Generated
+489 -167
View File
File diff suppressed because it is too large Load Diff
+8 -9
View File
@@ -1,18 +1,17 @@
[package] [package]
name = "songparser" name = "songparser"
version = "0.6.1" version = "0.6.0"
edition = "2024" edition = "2024"
rust-version = "1.95" rust-version = "1.95"
[dependencies] [dependencies]
tokio = { version = "1.52.3", features = ["full"] } tokio = { version = "1.52.3", features = ["full"] }
futures = { version = "0.3.32" } futures = { version = "0.3.32" }
reqwest = { version = "0.13.4", features = ["json", "stream", "multipart"] } reqwest = { version = "0.13.3", features = ["json", "stream", "multipart"] }
openssl = { version = "0.10.81", features = ["vendored"] }
serde = { version = "1.0.228", features = ["derive"] } serde = { version = "1.0.228", features = ["derive"] }
serde_json = { version = "1.0.150" } serde_json = { version = "1.0.149" }
time = { version = "0.3.53", features = ["macros", "serde"] } time = { version = "0.3.47", features = ["macros", "serde"] }
uuid = { version = "1.23.4", features = ["v4", "serde"] } uuid = { version = "1.23.1", 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.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" }
+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().value, "passphrase": icarus_envy::environment::get_service_passphrase().await.value,
}); });
match client.post(api_url).json(&payload).send().await { match client.post(api_url).json(&payload).send().await {
+7 -3
View File
@@ -15,9 +15,13 @@ 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().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() ..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().value, directory: icarus_envy::environment::get_root_directory().await.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().value, directory: icarus_envy::environment::get_root_directory().await.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) => {