Compare commits

..

1 Commits

Author SHA1 Message Date
0dc8c153d2 devel (#3)
All checks were successful
Release Tagging / release (push) Successful in 35s
Rust Build / Check (push) Successful in 31s
Rust Build / Test Suite (push) Successful in 28s
Rust Build / Rustfmt (push) Successful in 25s
Rust Build / Clippy (push) Successful in 33s
Rust Build / build (push) Successful in 29s
Reviewed-on: #3
2025-03-30 18:11:03 +00:00
7 changed files with 17 additions and 120 deletions

View File

@@ -5,6 +5,8 @@ on:
branches: branches:
- main - main
- devel - devel
tags:
- 'v*' # Trigger on tags matching v*
jobs: jobs:
release: release:
@@ -18,7 +20,7 @@ jobs:
- name: Install Rust - name: Install Rust
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
toolchain: 1.86.0 toolchain: 1.85.0
components: cargo components: cargo
- name: Extract Version from Cargo.toml - name: Extract Version from Cargo.toml

View File

@@ -18,7 +18,7 @@ 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.86.0 toolchain: 1.85.0
- 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@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.86.0 toolchain: 1.85.0
- 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@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.86.0 toolchain: 1.85.0
- 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@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.86.0 toolchain: 1.85.0
- 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@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.86.0 toolchain: 1.85.0
- run: | - run: |
mkdir -p ~/.ssh mkdir -p ~/.ssh
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitlab_deploy_key
@@ -101,3 +101,4 @@ jobs:
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

View File

@@ -2,8 +2,7 @@
name = "icarus_meta" name = "icarus_meta"
version = "0.1.0" version = "0.1.0"
edition = "2024" edition = "2024"
rust-version = "1.86"
[dependencies] [dependencies]
metadata = { version = "0.1.10" } taglib = { version = "1.0.0" }
icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.4.3" } icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.2.0" }

View File

@@ -1,93 +1,5 @@
pub mod meta_type { pub fn add(left: u64, right: u64) -> u64 {
pub enum Type { left + right
Title,
Artist,
Album,
Genre,
Year,
Track,
}
}
pub mod meta_nouveaou {
use super::*;
pub fn get_meta(t: meta_type::Type, filepath: &String) -> Result<String, std::io::Error> {
match t {
meta_type::Type::Title => match new_meta(filepath) {
Ok(metaa) => match get_val(t, metaa.tags) {
Ok(val) => Ok(val),
Err(err) => Err(err),
},
Err(err) => Err(err),
},
meta_type::Type::Artist => match new_meta(filepath) {
Ok(metaa) => match get_val(t, metaa.tags) {
Ok(val) => Ok(val),
Err(err) => Err(err),
},
Err(err) => Err(err),
},
meta_type::Type::Album => match new_meta(filepath) {
Ok(metaa) => match get_val(t, metaa.tags) {
Ok(val) => Ok(val),
Err(err) => Err(err),
},
Err(err) => Err(err),
},
meta_type::Type::Genre => match new_meta(filepath) {
Ok(metaa) => match get_val(t, metaa.tags) {
Ok(val) => Ok(val),
Err(err) => Err(err),
},
Err(err) => Err(err),
},
meta_type::Type::Year => match new_meta(filepath) {
Ok(metaa) => match get_val(t, metaa.tags) {
Ok(val) => Ok(val),
Err(err) => Err(err),
},
Err(err) => Err(err),
},
meta_type::Type::Track => match new_meta(filepath) {
Ok(metaa) => match get_val(t, metaa.tags) {
Ok(val) => Ok(val),
Err(err) => Err(err),
},
Err(err) => Err(err),
},
}
}
fn get_type(t: meta_type::Type) -> Result<String, std::io::Error> {
match t {
meta_type::Type::Title => Ok("TITLE".to_string()),
meta_type::Type::Artist => Ok("ARTIST".to_string()),
meta_type::Type::Album => Ok("".to_string()),
meta_type::Type::Genre => Ok("".to_string()),
meta_type::Type::Year => Ok("".to_string()),
meta_type::Type::Track => Ok("".to_string()),
}
}
fn get_val(t: meta_type::Type, tags: Vec<(String, String)>) -> Result<String, std::io::Error> {
let type_ma: String = get_type(t).unwrap();
for tag in tags {
if tag.0 == type_ma {
return Ok(tag.1);
}
}
Err(std::io::Error::new(
std::io::ErrorKind::InvalidInput,
"Invalid",
))
}
fn new_meta(filepath: &String) -> Result<metadata::MediaFileMetadata, std::io::Error> {
let path = std::path::Path::new(&filepath);
metadata::MediaFileMetadata::new(&path)
}
} }
#[cfg(test)] #[cfg(test)]
@@ -95,25 +7,8 @@ mod tests {
use super::*; use super::*;
#[test] #[test]
fn test_get_title() { fn it_works() {
let filename = String::from("track01.flac"); let result = add(2, 2);
let dir = String::from("tests/sample_tracks3"); assert_eq!(result, 4);
let dir_path = std::path::Path::new(&dir);
let full_path = dir_path.join(filename);
println!("Path: {:?}", full_path);
assert!(full_path.exists(), "Path does not exists {:?}", full_path);
let filepath = full_path.display().to_string();
match meta_nouveaou::get_meta(meta_type::Type::Title, &filepath) {
Ok(title) => {
let found = title == "Just roll it";
assert!(found, "Meta information was not found {:?}", title);
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
} }
} }

Binary file not shown.

Binary file not shown.

Binary file not shown.