Compare commits

...

14 Commits

Author SHA1 Message Date
kdeng00 5ced62ec7a Modify application structure (#19)
Reviewed-on: #19
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-10 21:50:00 +00:00
kdeng00 817ea9fed2 Add env (#18)
Reviewed-on: #18
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-03 00:31:45 +00:00
kdeng00 ce1d522814 Including Cargo.lock in source control (#17)
Reviewed-on: #17
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-03 00:18:18 +00:00
kdeng00 c04c6cdd6c Updated rust version in gitea workflow (#16)
Reviewed-on: #16
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-05-29 00:01:54 +00:00
kdeng00 f1375f5639 Update icarus_models (#15)
Reviewed-on: #15
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-05-28 23:44:20 +00:00
kdeng00 b41933e05e Stamped rust version (#14)
Reviewed-on: #14
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-05-28 23:28:28 +00:00
phoenix d1610d1331 service (#11)
Reviewed-on: #11
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
2025-04-12 17:28:03 +00:00
phoenix 8bc49e781b Correcting action workflow (#12)
Reviewed-on: #12
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
2025-04-05 22:00:41 +00:00
phoenix f68d01d50f Workflow changes (#9)
Reviewed-on: #9
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
2025-04-05 21:26:05 +00:00
phoenix 41001ec926 Updated icarus_models (#8)
Reviewed-on: #8
2025-03-30 17:48:57 +00:00
KD 775a62d9cc Updated icarus_models 2025-03-30 13:42:29 -04:00
phoenix a24dd6aba0 Fixing workflow (#6)
Reviewed-on: #6
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
2025-03-30 02:48:44 +00:00
phoenix 522395f0ad Updated tag release stamp (#5)
Reviewed-on: #5
2025-03-30 02:37:20 +00:00
phoenix 9bfc0a10ea Updated tag release stamp 2025-03-29 22:30:03 -04:00
8 changed files with 1870 additions and 22 deletions
+2
View File
@@ -0,0 +1,2 @@
ROOT_DIRECTORY=/home/songparser/mydata
ICARUS_BASE_API_URL=http://localhost:3000
+2
View File
@@ -0,0 +1,2 @@
ROOT_DIRECTORY=/home/songparser/mydata
ICARUS_BASE_API_URL=http://localhost:3000
+2 -4
View File
@@ -5,8 +5,6 @@ on:
branches:
- main
- devel
tags:
- 'v*' # Trigger on tags matching v*
jobs:
release:
@@ -20,7 +18,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.85.0
toolchain: 1.86.0
components: cargo
- name: Extract Version from Cargo.toml
@@ -31,7 +29,7 @@ jobs:
BRANCH_REF="${GITHUB_REF}"
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
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 "Hash: $PROJECT_COMMIT_HASH"
echo "Branch: $BRANCH_NAME"
+14 -14
View File
@@ -18,10 +18,10 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.85.0
toolchain: 1.86.0
- run: |
mkdir -p ~/.ssh
echo "${{ secreats.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
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)
@@ -36,12 +36,12 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.85.0
toolchain: 1.86.0
- run: |
mkdir -p ~/.ssh
echo "${{ secreats.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.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)
ssh-add -v ~/.ssh/gitlab_deploy_key
cargo test
@@ -54,13 +54,13 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.85.0
toolchain: 1.86.0
- run: rustup component add rustfmt
- run: |
mkdir -p ~/.ssh
echo "${{ secreats.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.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)
ssh-add -v ~/.ssh/gitlab_deploy_key
cargo fmt --all -- --check
@@ -73,13 +73,13 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.85.0
toolchain: 1.86.0
- run: rustup component add clippy
- run: |
mkdir -p ~/.ssh
echo "${{ secreats.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.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)
ssh-add -v ~/.ssh/gitlab_deploy_key
cargo clippy -- -D warnings
@@ -92,12 +92,12 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.85.0
toolchain: 1.86.0
- run: |
mkdir -p ~/.ssh
echo "${{ secreats.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.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)
ssh-add -v ~/.ssh/gitlab_deploy_key
cargo build --release
+1 -1
View File
@@ -1,2 +1,2 @@
/target
Cargo.lock
.env
Generated
+1796
View File
File diff suppressed because it is too large Load Diff
+5 -1
View File
@@ -2,6 +2,10 @@
name = "songparser"
version = "0.1.0"
edition = "2024"
rust-version = "1.86"
[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" }
dotenvy = { version = "0.15.7" }
icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.4.3" }
+48 -2
View File
@@ -1,3 +1,49 @@
fn main() {
println!("Hello, world!");
// use std::error::Error;
// use tokio::io::AsyncReadExt;
// use tokio::net::{TcpListener, TcpStream};
// use tokio::spawn;
#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
let client = reqwest::Client::new();
let app_base_url = get_icarus_url().await;
loop {
println!("Base URL: {}", app_base_url);
// TODO: Update the api/v2/song/queue/next endpoint to only retrieve queued song that is
// ready to be processed. Make necessary changes to other endpoints
let api_url = format!("{}/api/v2/song/queue/next", app_base_url);
match client.get(api_url).send().await {
Ok(response) => {
let body = response.text().await?;
println!("API response: {}", body);
// 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
}
Err(e) => eprintln!("API call failed: {}", e),
}
println!("Sleeping");
tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
}
// Ok(())
}
async fn get_icarus_url() -> String {
dotenvy::dotenv().ok();
std::env::var("ICARUS_BASE_API_URL").expect("Could not find url")
}