Compare commits
15 Commits
v0.5.0
...
0494d2b1e5
| Author | SHA1 | Date | |
|---|---|---|---|
|
0494d2b1e5
|
|||
|
c0fe0b07bb
|
|||
|
101ce15af7
|
|||
|
9f4003e1be
|
|||
|
42c839cfe3
|
|||
|
31cd6c40b4
|
|||
|
79d3c77316
|
|||
|
ff331d6f20
|
|||
|
98d23ba9ab
|
|||
|
c8338be49d
|
|||
|
f43e221e2a
|
|||
|
1991747712
|
|||
|
f2eccb9594
|
|||
|
b34fad0cf0
|
|||
|
5c59468b62
|
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
ROOT_DIRECTORY=/usr/local/bin
|
ROOT_DIRECTORY=/usr/local/bin
|
||||||
ICARUS_BASE_API_URL=http://api:3000
|
ICARUS_BASE_API_URL=http://api:8000
|
||||||
ICARUS_AUTH_BASE_API_URL=http://auth_api:3000
|
ICARUS_AUTH_BASE_API_URL=http://auth_api:8001
|
||||||
SERVICE_PASSPHRASE=iUOo1fxshf3y1tUGn1yU8l9raPApHCdinW0VdCHdRFEjqhR3Bf02aZzsKbLtaDFH
|
SERVICE_PASSPHRASE=iUOo1fxshf3y1tUGn1yU8l9raPApHCdinW0VdCHdRFEjqhR3Bf02aZzsKbLtaDFH
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
ROOT_DIRECTORY=/tmp
|
||||||
|
ICARUS_BASE_API_URL=http://localhost:8000
|
||||||
|
ICARUS_AUTH_BASE_API_URL=http://localhost:8001
|
||||||
|
SERVICE_PASSPHRASE=iUOo1fxshf3y1tUGn1yU8l9raPApHCdinW0VdCHdRFEjqhR3Bf02aZzsKbLtaDFH
|
||||||
@@ -17,7 +17,7 @@ jobs:
|
|||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
uses: actions-rs/toolchain@v1
|
uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.94
|
toolchain: 1.95
|
||||||
components: cargo
|
components: cargo
|
||||||
|
|
||||||
- name: Extract Version from Cargo.toml
|
- name: Extract Version from Cargo.toml
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v5
|
- uses: actions/checkout@v5
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.94
|
toolchain: 1.95
|
||||||
- run: |
|
- run: |
|
||||||
mkdir -p ~/.ssh
|
mkdir -p ~/.ssh
|
||||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
|
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
|
||||||
@@ -36,7 +36,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v5
|
- uses: actions/checkout@v5
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.94
|
toolchain: 1.95
|
||||||
- run: |
|
- run: |
|
||||||
mkdir -p ~/.ssh
|
mkdir -p ~/.ssh
|
||||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
|
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
|
||||||
@@ -54,7 +54,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v5
|
- uses: actions/checkout@v5
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.94
|
toolchain: 1.95
|
||||||
- run: rustup component add rustfmt
|
- run: rustup component add rustfmt
|
||||||
- run: |
|
- run: |
|
||||||
mkdir -p ~/.ssh
|
mkdir -p ~/.ssh
|
||||||
@@ -73,7 +73,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v5
|
- uses: actions/checkout@v5
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.94
|
toolchain: 1.95
|
||||||
- run: rustup component add clippy
|
- run: rustup component add clippy
|
||||||
- run: |
|
- run: |
|
||||||
mkdir -p ~/.ssh
|
mkdir -p ~/.ssh
|
||||||
@@ -92,7 +92,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v5
|
- uses: actions/checkout@v5
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.94
|
toolchain: 1.95
|
||||||
- run: |
|
- run: |
|
||||||
mkdir -p ~/.ssh
|
mkdir -p ~/.ssh
|
||||||
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
|
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
|
||||||
|
|||||||
Generated
+514
-208
File diff suppressed because it is too large
Load Diff
+9
-9
@@ -1,18 +1,18 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "songparser"
|
name = "songparser"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
rust-version = "1.94"
|
rust-version = "1.95"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tokio = { version = "1.51", features = ["full"] }
|
tokio = { version = "1.52.2", features = ["full"] }
|
||||||
futures = { version = "0.3.32" }
|
futures = { version = "0.3.32" }
|
||||||
reqwest = { version = "0.12.28", features = ["json", "stream", "multipart"] }
|
reqwest = { version = "0.13.3", features = ["json", "stream", "multipart"] }
|
||||||
serde = { version = "1.0.228", features = ["derive"] }
|
serde = { version = "1.0.228", features = ["derive"] }
|
||||||
serde_json = { version = "1.0.149" }
|
serde_json = { version = "1.0.149" }
|
||||||
time = { version = "0.3.47", features = ["macros", "serde"] }
|
time = { version = "0.3.47", features = ["macros", "serde"] }
|
||||||
uuid = { version = "1.23", features = ["v4", "serde"] }
|
uuid = { version = "1.23.1", features = ["v4", "serde"] }
|
||||||
rand = { version = "0.10.0" }
|
rand = { version = "0.10.1" }
|
||||||
icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.5.0" }
|
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.10.0" }
|
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.6.0" }
|
icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.7.0" }
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
# Stage 1: Build the application
|
# Stage 1: Build the application
|
||||||
# Use a specific Rust version for reproducibility. Choose one that matches your development environment.
|
# Use a specific Rust version for reproducibility. Choose one that matches your development environment.
|
||||||
# Using slim variant for smaller base image
|
# Using slim variant for smaller base image
|
||||||
FROM rust:1.94 as builder
|
FROM rust:1.95 as builder
|
||||||
|
|
||||||
# Set the working directory inside the container
|
# Set the working directory inside the container
|
||||||
WORKDIR /usr/src/app
|
WORKDIR /usr/src/app
|
||||||
|
|||||||
+4
-14
@@ -75,14 +75,9 @@ pub mod get_metadata_queue {
|
|||||||
) -> Result<reqwest::Response, reqwest::Error> {
|
) -> Result<reqwest::Response, reqwest::Error> {
|
||||||
let client = reqwest::Client::new();
|
let client = reqwest::Client::new();
|
||||||
let endpoint = String::from("api/v2/song/metadata/queue");
|
let endpoint = String::from("api/v2/song/metadata/queue");
|
||||||
let api_url = format!("{}/{endpoint}", app.uri);
|
let api_url = format!("{}/{endpoint}?song_queue_id={song_queue_id}", app.uri);
|
||||||
let (key, header) = super::auth_header(app).await;
|
let (key, header) = super::auth_header(app).await;
|
||||||
client
|
client.get(api_url).header(key, header).send().await
|
||||||
.get(api_url)
|
|
||||||
.query(&[("song_queue_id", song_queue_id)])
|
|
||||||
.header(key, header)
|
|
||||||
.send()
|
|
||||||
.await
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub mod response {
|
pub mod response {
|
||||||
@@ -128,14 +123,9 @@ pub mod get_coverart_queue {
|
|||||||
) -> Result<reqwest::Response, reqwest::Error> {
|
) -> Result<reqwest::Response, reqwest::Error> {
|
||||||
let client = reqwest::Client::new();
|
let client = reqwest::Client::new();
|
||||||
let endpoint = String::from("api/v2/coverart/queue");
|
let endpoint = String::from("api/v2/coverart/queue");
|
||||||
let api_url = format!("{}/{endpoint}", app.uri);
|
let api_url = format!("{}/{endpoint}?song_queue_id={song_queue_id}", app.uri);
|
||||||
let (key, header) = super::auth_header(app).await;
|
let (key, header) = super::auth_header(app).await;
|
||||||
client
|
client.get(api_url).header(key, header).send().await
|
||||||
.get(api_url)
|
|
||||||
.query(&[("song_queue_id", song_queue_id)])
|
|
||||||
.header(key, header)
|
|
||||||
.send()
|
|
||||||
.await
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_data(
|
pub async fn get_data(
|
||||||
|
|||||||
Reference in New Issue
Block a user