Compare commits
16 Commits
v0.1.0-dev
...
v0.1.0-dev
Author | SHA1 | Date | |
---|---|---|---|
2f11ff9e89 | |||
5ced62ec7a | |||
817ea9fed2 | |||
ce1d522814 | |||
c04c6cdd6c | |||
f1375f5639 | |||
b41933e05e | |||
d1610d1331 | |||
8bc49e781b | |||
f68d01d50f | |||
41001ec926 | |||
775a62d9cc | |||
a24dd6aba0 | |||
522395f0ad | |||
9bfc0a10ea | |||
cbb286790c |
2
.env.docker.sample
Normal file
2
.env.docker.sample
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
ROOT_DIRECTORY=/home/songparser/mydata
|
||||||
|
ICARUS_BASE_API_URL=http://localhost:3000
|
2
.env.sample
Normal file
2
.env.sample
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
ROOT_DIRECTORY=/home/songparser/mydata
|
||||||
|
ICARUS_BASE_API_URL=http://localhost:3000
|
@@ -5,8 +5,6 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- devel
|
- devel
|
||||||
tags:
|
|
||||||
- 'v*' # Trigger on tags matching v*
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release:
|
release:
|
||||||
@@ -20,7 +18,7 @@ jobs:
|
|||||||
- name: Install Rust
|
- name: Install Rust
|
||||||
uses: actions-rs/toolchain@v1
|
uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.85.0
|
toolchain: 1.86.0
|
||||||
components: cargo
|
components: cargo
|
||||||
|
|
||||||
- name: Extract Version from Cargo.toml
|
- name: Extract Version from Cargo.toml
|
||||||
@@ -31,7 +29,7 @@ jobs:
|
|||||||
BRANCH_REF="${GITHUB_REF}"
|
BRANCH_REF="${GITHUB_REF}"
|
||||||
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
|
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
|
||||||
PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH"
|
PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH"
|
||||||
echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-111"
|
echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-372"
|
||||||
echo "Version: $VERSION"
|
echo "Version: $VERSION"
|
||||||
echo "Hash: $PROJECT_COMMIT_HASH"
|
echo "Hash: $PROJECT_COMMIT_HASH"
|
||||||
echo "Branch: $BRANCH_NAME"
|
echo "Branch: $BRANCH_NAME"
|
||||||
|
@@ -18,58 +18,87 @@ jobs:
|
|||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.85.0
|
toolchain: 1.86.0
|
||||||
- run: cargo check
|
- 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 check
|
||||||
|
|
||||||
test:
|
test:
|
||||||
name: Test Suite
|
name: Test Suite
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
|
needs: setup_ssh
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.85.0
|
toolchain: 1.86.0
|
||||||
- run: cargo test
|
- 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
|
||||||
|
needs: setup_ssh
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.85.0
|
toolchain: 1.86.0
|
||||||
- run: rustup component add rustfmt
|
- run: rustup component add rustfmt
|
||||||
- run: cargo fmt --all -- --check
|
- 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 fmt --all -- --check
|
||||||
|
|
||||||
clippy:
|
clippy:
|
||||||
name: Clippy
|
name: Clippy
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
|
needs: setup_ssh
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.85.0
|
toolchain: 1.86.0
|
||||||
- run: rustup component add clippy
|
- run: rustup component add clippy
|
||||||
- run: cargo clippy -- -D warnings
|
- 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 clippy -- -D warnings
|
||||||
|
|
||||||
build:
|
build:
|
||||||
name: build
|
name: build
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
|
needs: setup_ssh
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: 1.85.0
|
toolchain: 1.86.0
|
||||||
- run: |
|
- run: |
|
||||||
mkdir -p ~/.ssh
|
mkdir -p ~/.ssh
|
||||||
echo "$EXTREPO_KEY" > ~/.ssh/gitlab_deploy_key
|
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
|
||||||
chmod 600 ~/.ssh/gitlab_deploy_key
|
chmod 600 ~/.ssh/gitlab_deploy_key
|
||||||
ssh-keyscan git.kundeng.us ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLl/OZiKVDxwnyvMxa+rjKvDpKqTxH1GWuGuDPLmENGQMbTVulajZWr9x8Q1cotoJiHZkt7DA5vczcjB/4lwgWA= >> ~/.ssh/known_hosts
|
ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
|
||||||
eval $(ssh-agent -s)
|
eval $(ssh-agent -s)
|
||||||
ssh-add -v ~/.ssh/gitlab_deploy_key
|
ssh-add -v ~/.ssh/gitlab_deploy_key
|
||||||
|
|
||||||
cargo build --release
|
cargo build --release
|
||||||
env:
|
|
||||||
EXTREPO_KEY: ${{ secrets.MYREPO_TOKEN }}
|
|
||||||
|
|
||||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,2 +1,2 @@
|
|||||||
/target
|
/target
|
||||||
Cargo.lock
|
.env
|
||||||
|
1799
Cargo.lock
generated
Normal file
1799
Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -2,6 +2,13 @@
|
|||||||
name = "songparser"
|
name = "songparser"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
rust-version = "1.86"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
icarus-models = { git = "ssh://git@git.kundeng.us/phoenix/icarus-models.git", tag = "v0.1.14" }
|
tokio = { version = "1.44.1", features = ["full"] }
|
||||||
|
reqwest = { version = "0.12.19", features = ["json"] }
|
||||||
|
serde = { version = "1.0.218", features = ["derive"] }
|
||||||
|
serde_json = { version = "1.0.139" }
|
||||||
|
uuid = { version = "1.16.0", features = ["v4", "serde"] }
|
||||||
|
dotenvy = { version = "0.15.7" }
|
||||||
|
icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.4.3" }
|
||||||
|
82
src/main.rs
82
src/main.rs
@@ -1,3 +1,81 @@
|
|||||||
fn main() {
|
#[tokio::main]
|
||||||
println!("Hello, world!");
|
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
|
let app_base_url = get_icarus_url().await;
|
||||||
|
|
||||||
|
loop {
|
||||||
|
println!("Base URL: {}", app_base_url);
|
||||||
|
|
||||||
|
match api::fetch_next_queue_item(&app_base_url).await {
|
||||||
|
Ok(response) => {
|
||||||
|
match response
|
||||||
|
.json::<responses::fetch_next_queue_item::SongQueueItem>()
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
Ok(song_queue_item) => {
|
||||||
|
if !song_queue_item.data.is_empty() {
|
||||||
|
println!("Song queue item: {:?}", song_queue_item);
|
||||||
|
|
||||||
|
// Process data here...
|
||||||
|
|
||||||
|
// TODO: Parse the response body to a struct
|
||||||
|
// TODO: Get queued song data
|
||||||
|
// TODO: Get queued song's metadata
|
||||||
|
// TODO: Get queued coverart
|
||||||
|
// TODO: Get queued coverart's data
|
||||||
|
// TODO: Apply metadata to the queued song
|
||||||
|
// TODO: Update the queued song with the updated queued song
|
||||||
|
// TODO: Create song
|
||||||
|
// TODO: Create coverart
|
||||||
|
// TODO: Wipe data from queued song
|
||||||
|
// TODO: Wipe data from queued coverart
|
||||||
|
} else {
|
||||||
|
println!("No data to fetch");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(err) => {
|
||||||
|
eprintln!("Error: {:?}", err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => eprintln!("API call failed: {}", e),
|
||||||
|
}
|
||||||
|
|
||||||
|
println!("Sleeping");
|
||||||
|
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mod responses {
|
||||||
|
pub mod fetch_next_queue_item {
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize)]
|
||||||
|
pub struct QueueItem {
|
||||||
|
pub id: uuid::Uuid,
|
||||||
|
pub filename: String,
|
||||||
|
pub status: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Deserialize, Serialize)]
|
||||||
|
pub struct SongQueueItem {
|
||||||
|
pub message: String,
|
||||||
|
pub data: Vec<QueueItem>,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mod api {
|
||||||
|
pub async fn fetch_next_queue_item(
|
||||||
|
base_url: &String,
|
||||||
|
) -> Result<reqwest::Response, reqwest::Error> {
|
||||||
|
let client = reqwest::Client::new();
|
||||||
|
let fetch_endpoint = String::from("api/v2/song/queue/next");
|
||||||
|
let api_url = format!("{}/{}", base_url, fetch_endpoint);
|
||||||
|
client.get(api_url).send().await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn get_icarus_url() -> String {
|
||||||
|
dotenvy::dotenv().ok();
|
||||||
|
std::env::var("ICARUS_BASE_API_URL").expect("Could not find url")
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user