Compare commits

...

81 Commits

Author SHA1 Message Date
1c5c0ca70c Adding album tests (#13)
All checks were successful
Release Tagging / release (push) Successful in 28s
Rust Build / Check (push) Successful in 26s
Rust Build / Test Suite (push) Successful in 26s
Rust Build / Rustfmt (push) Successful in 26s
Rust Build / Clippy (push) Successful in 27s
Rust Build / build (push) Successful in 26s
Rust Build / Check (pull_request) Successful in 27s
Rust Build / Test Suite (pull_request) Successful in 27s
Rust Build / Rustfmt (pull_request) Successful in 26s
Rust Build / Clippy (pull_request) Successful in 27s
Rust Build / build (pull_request) Successful in 25s
Reviewed-on: phoenix/icarus-models#13
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
2025-03-22 21:19:07 +00:00
bc3aace070 Added tests (#12)
All checks were successful
Release Tagging / release (push) Successful in 28s
Rust Build / Check (push) Successful in 27s
Rust Build / Test Suite (push) Successful in 33s
Rust Build / Rustfmt (push) Successful in 25s
Rust Build / Clippy (push) Successful in 28s
Rust Build / build (push) Successful in 25s
Rust Build / Check (pull_request) Successful in 26s
Rust Build / Test Suite (pull_request) Successful in 26s
Rust Build / Rustfmt (pull_request) Successful in 25s
Rust Build / Clippy (pull_request) Successful in 26s
Rust Build / build (pull_request) Successful in 25s
Reviewed-on: phoenix/icarus-models#12
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
2025-03-22 20:32:04 +00:00
ae2fd07229 Removing test (#14)
Some checks failed
Rust Build / Rustfmt (push) Waiting to run
Rust Build / Clippy (push) Waiting to run
Rust Build / build (push) Waiting to run
Release Tagging / release (push) Successful in 28s
Rust Build / Check (push) Successful in 26s
Rust Build / Test Suite (push) Has been cancelled
Reviewed-on: phoenix/icarus-models#14
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
2025-03-22 20:31:03 +00:00
e0617b3fb8 Workflow change (#15)
Some checks failed
Rust Build / Rustfmt (push) Waiting to run
Rust Build / Clippy (push) Waiting to run
Rust Build / build (push) Waiting to run
Release Tagging / release (push) Successful in 31s
Rust Build / Check (push) Successful in 25s
Rust Build / Test Suite (push) Has been cancelled
Reviewed-on: phoenix/icarus-models#15
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
2025-03-22 20:30:00 +00:00
KD
351147cb64 Fixed some warnings (#11)
All checks were successful
Release Tagging / release (push) Successful in 28s
Rust Build / Check (push) Successful in 25s
Rust Build / Test Suite (push) Successful in 26s
Rust Build / Rustfmt (push) Successful in 28s
Rust Build / Clippy (push) Successful in 29s
Rust Build / build (push) Successful in 26s
Rust Build / Check (pull_request) Successful in 26s
Rust Build / Test Suite (pull_request) Successful in 27s
Rust Build / Rustfmt (pull_request) Successful in 28s
Rust Build / Clippy (pull_request) Successful in 28s
Rust Build / build (pull_request) Successful in 27s
Reviewed-on: phoenix/icarus-models#11
Co-authored-by: KD <kundeng94@gmail.com>
Co-committed-by: KD <kundeng94@gmail.com>
2025-03-22 18:24:08 +00:00
d0e0d8fa2d Merge pull request 'Renamed branch' (#10) from updated_branch into devel
Some checks failed
Release Tagging / release (push) Successful in 28s
Rust Build / Check (push) Failing after 24s
Rust Build / Test Suite (push) Failing after 25s
Rust Build / Rustfmt (push) Successful in 25s
Rust Build / Clippy (push) Failing after 24s
Rust Build / build (push) Failing after 24s
Reviewed-on: phoenix/icarus-models#10
2025-03-22 01:25:02 +00:00
3f379cf454 Renamed branch
Some checks failed
Rust Build / Check (pull_request) Failing after 28s
Rust Build / Test Suite (pull_request) Failing after 26s
Rust Build / Rustfmt (pull_request) Successful in 26s
Rust Build / Clippy (pull_request) Failing after 26s
Rust Build / build (pull_request) Failing after 25s
2025-03-21 21:21:53 -04:00
64f936bb3c Added workflow (#6)
Some checks failed
Release Tagging / release (push) Successful in 29s
Rust Build / Check (push) Failing after 26s
Rust Build / Test Suite (push) Failing after 29s
Rust Build / Rustfmt (push) Successful in 26s
Rust Build / Clippy (push) Failing after 26s
Rust Build / build (push) Failing after 26s
Reviewed-on: phoenix/icarus-models#6
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
2025-03-22 01:12:29 +00:00
929dac6413 Merge pull request 'Enabled tag release' (#9) from enable_release_tagging into main
All checks were successful
Release Tagging / release (push) Successful in 29s
Reviewed-on: phoenix/icarus-models#9
2025-03-22 01:10:45 +00:00
b91d543097 Enabled tag release 2025-03-21 21:10:02 -04:00
9307f80274 Merge pull request 'Addressing variable in steps' (#8) from stamp into main
All checks were successful
Release Tagging / release (push) Successful in 29s
Reviewed-on: phoenix/icarus-models#8
2025-03-22 01:06:39 +00:00
49c732ef1b Addressing variable in steps 2025-03-21 21:05:59 -04:00
5fe0c4ccb4 Merge pull request 'Added tag release workflow' (#7) from stamp into main
All checks were successful
Release Tagging / release (push) Successful in 27s
Reviewed-on: phoenix/icarus-models#7
2025-03-22 01:02:31 +00:00
7d24ce51cf Added tag release workflow 2025-03-21 21:01:31 -04:00
KD
474391ea44 Merge branch 'dev' into 'main'
v0.1.14

See merge request kdeng00/icarus-models!39
2025-03-21 13:13:28 +00:00
KD
abbb37721f Merge branch 'version_bump' into 'dev'
Version bump to v0.1.14

See merge request kdeng00/icarus-models!41
2025-03-21 00:38:08 +00:00
e366202f24 Version bump to v0.1.14 2025-03-20 20:34:59 -04:00
KD
950a70ccad Merge branch 'coverart' into 'dev'
Added coverart struct

See merge request kdeng00/icarus-models!40
2025-03-21 00:18:38 +00:00
KD
7f8649ee38 Added coverart struct 2025-03-21 00:18:38 +00:00
KD
ab3e519f53 Merge branch 'album_model' into 'dev'
Added Album collection

See merge request kdeng00/icarus-models!38
2025-03-19 00:56:18 +00:00
KD
98c518e149 Added Album collection 2025-03-19 00:56:17 +00:00
KD
9d3098de6b Merge branch 'song_changes' into 'dev'
Song changes

See merge request kdeng00/icarus-models!37
2025-03-19 00:45:56 +00:00
KD
04f1ffb1ce Song changes 2025-03-19 00:45:56 +00:00
KD
47f336d04d Merge branch 'warning-fix' into 'dev'
Making some changes to address warnings

See merge request kdeng00/icarus-models!36
2025-03-16 22:25:19 +00:00
e497ce11e0 Making some changes to address warnings
Constants changed
2025-03-16 15:15:31 -04:00
KD
fac33c7987 Merge branch 'dev' into 'main'
Dev

See merge request kdeng00/icarus-models!30
2025-03-15 21:38:00 +00:00
KD
7f5f546f65 Merge branch 'version_bump' into 'dev'
Updated version

See merge request kdeng00/icarus-models!35
2025-03-15 21:30:10 +00:00
KD
05537a4f6d Merge branch 'enhance_song_model' into 'dev'
Added functions

See merge request kdeng00/icarus-models!34
2025-03-15 21:26:54 +00:00
KD
64402a0626 Added functions 2025-03-15 21:26:54 +00:00
a84d59a5f5 Updated version 2025-03-15 17:25:55 -04:00
KD
d1f63a04e4 Merge branch 'enhance_song' into 'dev'
Added functions to song

See merge request kdeng00/icarus-models!33
2025-03-15 02:30:08 +00:00
KD
842fe6302e Added functions to song 2025-03-15 02:30:08 +00:00
KD
b9c0ba0549 Merge branch 'extend_ver_hash' into 'dev'
Extended the hash

See merge request kdeng00/icarus-models!31
2025-03-15 02:01:42 +00:00
KD
3a02bc6830 Merge branch 'embed_song_model' into 'dev'
Updated song model

See merge request kdeng00/icarus-models!32
2025-03-15 01:58:32 +00:00
KD
01df04b3f9 Updated song model 2025-03-15 01:58:32 +00:00
bef3a376bd Extended the hash 2025-03-14 21:24:58 -04:00
KD
d6a8f865c4 Merge branch 'hash_release' into 'dev'
Added hash

See merge request kdeng00/icarus-models!29
2025-03-15 01:19:04 +00:00
a22a62f922 Added hash 2025-03-14 21:14:25 -04:00
KD
509765f9bd Merge branch 'dev' into 'main'
Added dev branch to the ci/cd tag rule

See merge request kdeng00/icarus-models!28
2025-03-15 01:05:00 +00:00
85494f30ea Added dev branch to the ci/cd tag rule 2025-03-14 20:59:38 -04:00
KD
805ea3a9ae Merge branch 'ci_tag_change' into 'main'
Tweaking tag and release name

See merge request kdeng00/icarus-models!27
2025-03-15 00:53:07 +00:00
db724f4f26 Tweaking tag and release name 2025-03-14 20:50:34 -04:00
KD
1fd2704a9c Merge branch 'tag_init' into 'main'
Added stage to create tags

See merge request kdeng00/icarus-models!26
2025-03-15 00:43:23 +00:00
c8bab6f0e4 Merge branch 'tag_init' of gitlab.com:kdeng00/icarus-models into tag_init 2025-03-14 20:38:33 -04:00
38a5a95bfd Here we go again 2025-03-14 20:37:59 -04:00
2050a9be0e Switch up 2025-03-14 20:28:51 -04:00
KD
7bde1f3918 Update .gitlab-ci.yml file 2025-03-15 00:18:07 +00:00
be2025cc0f Here we go 2025-03-14 20:16:03 -04:00
81d4f5a2cf Making ci/cd changes 2025-03-14 20:11:53 -04:00
554670d705 Saving change 2025-03-14 20:09:48 -04:00
7fdf1e42e9 Added stage to create tags 2025-03-14 20:05:30 -04:00
KD
6854a5e14d Merge branch 'version_bump' into 'main'
Updated version

See merge request kdeng00/icarus-models!25
2025-03-14 01:31:11 +00:00
5d89ccb7c1 Updated version 2025-03-13 21:29:01 -04:00
KD
e429534100 Merge branch 'experimental' into 'main'
Added AccessToken and constant

See merge request kdeng00/icarus-models!24
2025-03-14 01:16:59 +00:00
KD
1881650e9c Added AccessToken and constant 2025-03-14 01:16:58 +00:00
KD
e9ae99520c Merge branch 'version_bump' into 'main'
Version bump

See merge request kdeng00/icarus-models!23
2025-03-14 00:46:01 +00:00
cd0ab2dec6 Version bump 2025-03-13 20:45:28 -04:00
KD
5d20d8576f Merge branch 'constants' into 'main'
Added constants

See merge request kdeng00/icarus-models!22
2025-03-14 00:44:49 +00:00
KD
3979a59665 Added constants 2025-03-14 00:44:49 +00:00
KD
a2371b7bf1 Merge branch 'user_changes' into 'main'
User changes

See merge request kdeng00/icarus-models!21
2025-03-14 00:43:12 +00:00
KD
6bed8590ca User changes 2025-03-14 00:43:12 +00:00
KD
daeb208448 Merge branch 'user_changes' into 'main'
User changes

See merge request kdeng00/icarus-models!20
2025-03-14 00:22:23 +00:00
KD
9ffc1aad05 Merge branch 'refactoring' into 'main'
Refactoring

See merge request kdeng00/icarus-models!19
2025-03-14 00:22:01 +00:00
a08a879f5a Refactoring 2025-03-13 20:19:28 -04:00
d4b415dca3 User changes 2025-03-13 20:18:38 -04:00
KD
55b51db4a0 Merge branch 'version_bump' into 'main'
Version bump

See merge request kdeng00/icarus-models!18
2025-03-13 01:13:36 +00:00
76e28fc626 Version bump 2025-03-12 21:11:21 -04:00
KD
7b5cb41f4a Merge branch 'types' into 'main'
Types

See merge request kdeng00/icarus-models!17
2025-03-13 01:08:54 +00:00
KD
fc362e4e21 Types 2025-03-13 01:08:54 +00:00
KD
689dbaf29a Merge branch 'song_model' into 'main'
Added song.rs file

See merge request kdeng00/icarus-models!16
2025-03-13 01:07:24 +00:00
KD
36ac93414b Added song.rs file 2025-03-13 01:07:24 +00:00
KD
5b92d8857c Merge branch 'access_level' into 'main'
Added functions to access_level

See merge request kdeng00/icarus-models!14
2025-03-09 23:11:43 +00:00
KD
03f5647d53 Merge branch 'ci_variable_checkl' into 'main'
Adding back rule

See merge request kdeng00/icarus-models!15
2025-03-09 21:56:54 +00:00
KD
448c81fd1e Adding back rule 2025-03-09 21:56:54 +00:00
KD
c6d17b4904 Merge branch 'token_model' into 'main'
Added token model

See merge request kdeng00/icarus-models!13
2025-03-09 21:43:23 +00:00
KD
f52f9d65fd Added token model 2025-03-09 21:43:22 +00:00
67aaba4fbf Added functions to access_level 2025-03-09 17:40:23 -04:00
KD
f8662b6020 Merge branch 'ci_variable_checkl' into 'main'
Removing rule for now

See merge request kdeng00/icarus-models!12
2025-03-09 21:26:01 +00:00
KD
e7517f94dc Removing rule for now 2025-03-09 21:26:01 +00:00
KD
98e187056d Merge branch 'enchance_ci' into 'main'
Enhancing ci file

See merge request kdeng00/icarus-models!11
2025-03-09 19:45:42 +00:00
2bd6fd8f85 Enhancing ci file 2025-03-09 15:42:55 -04:00
20 changed files with 894 additions and 29 deletions

View File

@@ -0,0 +1,57 @@
name: Release Tagging
on:
push:
branches:
- main
- devel
tags:
- 'v*' # Trigger on tags matching v*
jobs:
release:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
fetch-depth: 0 # Important for git describe --tags
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.85.0
components: cargo
- name: Extract Version from Cargo.toml
id: version
run: |
VERSION=$(grep '^version = "' Cargo.toml | sed -E 's/version = "([^"]+)"/\1/')
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
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 "Version: $VERSION"
echo "Hash: $PROJECT_COMMIT_HASH"
echo "Branch: $BRANCH_NAME"
echo "Tag Release: $PROJECT_TAG_RELEASE"
- name: Print version
id: Version
run: |
echo "Printing version"
echo "Version: ${{ steps.version.outputs.project_tag_release }}"
- name: Create GitHub Release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ steps.version.outputs.project_tag_release }}
release_name: Release ${{ steps.version.outputs.project_tag_release }}
body: |
Release of version ${{ steps.version.outputs.project_tag_release }}
# draft: false
# prerelease: ${{ startsWith(github.ref, 'v') == false }} # prerelease if not a valid release tag

View File

@@ -0,0 +1,66 @@
name: Rust Build
on:
push:
branches:
- main
- devel
pull_request:
branches:
- main
- devel
jobs:
check:
name: Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.85.0
- run: cargo check
test:
name: Test Suite
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.85.0
- run: cargo test
fmt:
name: Rustfmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.85.0
- run: rustup component add rustfmt
- run: cargo fmt --all -- --check
clippy:
name: Clippy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.85.0
- run: rustup component add clippy
- run: cargo clippy -- -D warnings
build:
name: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.85.0
- run: cargo build

1
.gitignore vendored
View File

@@ -1 +1,2 @@
/target
Cargo.lock

View File

@@ -1,6 +1,7 @@
stages:
- build
- test
- version
- deploy
build:
@@ -8,9 +9,10 @@ build:
image: rust:1.85
script:
- cargo build --release
- ls -R target/release/
artifacts:
paths:
- target/release/icarus-models
- target/release/
expire_in: 1 week
cache:
key: "cargo-cache"
@@ -29,15 +31,53 @@ test:
- target/
- ~/.cargo/
test_variable:
stage: test
image: rust:1.85
script:
- echo "Checking CARGO_LOGIN_TOKEN..."
- if [[ -z "$CARGO_LOGIN_TOKEN" ]]; then echo "CARGO_LOGIN_TOKEN is empty!"; exit 1; else echo "CARGO_LOGIN_TOKEN is set."; fi
- env
rules:
- if: '$CI_COMMIT_TAG'
extract_version:
stage: version
image: alpine:latest
script:
- apk add --no-cache jq
- VERSION=$(grep 'version = "' Cargo.toml | awk -F'"' '{print $2}' | head -n 1)
- VER_HASH=${CI_COMMIT_SHA:0:10}
- VERSION="$VERSION-$VER_HASH"
- if [ $? -ne 0 ]; then echo "Error extracting version"; exit 1; fi
- echo "Extracted version is"
- echo "$VERSION"
- echo "VERSION=$VERSION" > version.env
artifacts:
reports:
dotenv: version.env
tag_release:
stage: deploy
image: registry.gitlab.com/gitlab-org/release-cli:latest
rules:
- if: '($CI_COMMIT_BRANCH == "dev" || $CI_COMMIT_BRANCH == "main") && $CI_PIPELINE_SOURCE == "push"'
dependencies:
- extract_version
script:
- release-cli create --name "Release $CI_COMMIT_BRANCH-v$VERSION" --tag-name "$CI_COMMIT_BRANCH-v$VERSION"
deploy:
stage: deploy
image: rust:1.85
script:
- echo "Printing environment"
- env
- cargo login "$CARGO_LOGIN_TOKEN"
- cargo publish
- echo "Deployment will be configured when this is ready for use"
# - env
# Uncomment when you are ready for this to be published
# - cargo login "$CARGO_LOGIN_TOKEN"
# - cargo publish
dependencies:
- build
rules:
- if: '$CI_COMMIT_TAG'

View File

@@ -1,10 +1,12 @@
[package]
name = "icarus-models"
version = "0.1.14"
edition = "2024"
description = "models used for the icarus project"
license = "MIT"
version = "0.1.0"
edition = "2024"
[dependencies]
serde = { version = "1.0.218", features = ["derive"] }
serde_json = "1.0.139"
serde_json = { version = "1.0.139" }
rand = { version = "0.9" }
tempfile = { version = "3.19.1" }

View File

@@ -19,8 +19,24 @@ impl Default for AccessLevel {
}
}
pub fn default_level() -> AccessLevel {
AccessLevel {
id: -1,
level: String::from("Public"),
song_id: -1,
}
}
pub fn private_level() -> AccessLevel {
AccessLevel {
id: -1,
level: String::from("Private"),
song_id: -1,
}
}
impl AccessLevel {
pub fn _to_json(&self) -> Result<String, serde_json::Error> {
return serde_json::to_string_pretty(&self);
serde_json::to_string_pretty(&self)
}
}

45
src/album.rs Normal file
View File

@@ -0,0 +1,45 @@
pub mod collection {
use serde::{Deserialize, Serialize};
use std::default::Default;
use std::fs::File;
use std::io::BufReader;
fn is_set(num: &i32) -> bool {
*num >= 0
}
pub fn parse_album(filepath: &String) -> Result<Album, serde_json::Error> {
let file = File::open(filepath).expect("Failed to open file");
let reader = BufReader::new(file);
serde_json::from_reader(reader)
}
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct Album {
#[serde(skip_serializing_if = "String::is_empty")]
#[serde(alias = "album")]
pub title: String,
#[serde(skip_serializing_if = "String::is_empty")]
#[serde(alias = "album_artist")]
pub artist: String,
pub genre: String,
pub year: i32,
pub track_count: i32,
#[serde(skip_serializing_if = "is_set")]
pub disc_count: i32,
#[serde(skip_serializing_if = "Vec::is_empty")]
pub tracks: Vec<Track>,
}
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct Track {
pub title: String,
pub artist: String,
pub disc: i32,
pub track: i32,
// In seconds
pub duration: f64,
}
}

5
src/constants.rs Normal file
View File

@@ -0,0 +1,5 @@
pub const DEFAULTMUSICEXTENSION: &str = FLACEXTENSION;
pub const FLACEXTENSION: &str = ".flac";
pub const WAVEXTENSION: &str = ".wav";
pub const MPTHREEEXTENSION: &str = ".mp3";
pub const JPGEXTENSION: &str = ".jpg";

23
src/coverart.rs Normal file
View File

@@ -0,0 +1,23 @@
use std::io::Read;
use serde::{Deserialize, Serialize};
#[derive(Debug, Clone, Deserialize, Serialize)]
pub struct CoverArt {
pub id: i32,
pub title: String,
pub path: String,
pub data: Vec<u8>,
}
impl CoverArt {
pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
let path: &String = &self.path;
let mut file = std::fs::File::open(path)?;
let mut buffer = Vec::new();
match file.read_to_end(&mut buffer) {
Ok(_) => Ok(buffer),
Err(err) => Err(err),
}
}
}

View File

@@ -1,18 +1,9 @@
pub mod access_level;
pub mod album;
pub mod constants;
pub mod coverart;
pub mod login_result;
pub mod song;
pub mod token;
pub mod types;
pub mod user;
pub fn add(left: u64, right: u64) -> u64 {
left + right
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn it_works() {
let result = add(2, 2);
assert_eq!(result, 4);
}
}

View File

@@ -26,6 +26,6 @@ impl Default for LoginResult {
impl LoginResult {
pub fn _to_json(&self) -> Result<String, serde_json::Error> {
return serde_json::to_string_pretty(&self);
serde_json::to_string_pretty(&self)
}
}

315
src/song.rs Normal file
View File

@@ -0,0 +1,315 @@
use std::io::Read;
use crate::constants;
use crate::types;
use rand::Rng;
use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct Song {
#[serde(skip_serializing_if = "is_zero")]
#[serde(alias = "id")]
pub id: i32,
#[serde(skip_serializing_if = "String::is_empty")]
pub title: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub artist: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub album: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub album_artist: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub genre: String,
#[serde(skip_serializing_if = "is_zero")]
pub year: i32,
#[serde(skip_serializing_if = "is_dur_not_set")]
pub duration: i32,
#[serde(skip_serializing_if = "is_zero")]
pub track: i32,
#[serde(skip_serializing_if = "is_zero")]
pub disc: i32,
#[serde(skip_serializing_if = "is_zero")]
pub disc_count: i32,
#[serde(skip_serializing_if = "is_zero")]
pub track_count: i32,
#[serde(skip_serializing_if = "String::is_empty")]
pub audio_type: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub date_created: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub filename: String,
#[serde(skip_serializing_if = "is_zero")]
pub user_id: i32,
#[serde(skip)]
pub data: Vec<u8>,
#[serde(skip)]
pub directory: String,
// #[serde(skip)]
// pub album_id: i32,
// #[serde(skip)]
// pub artist_id: i32,
// #[serde(skip)]
// pub genre_id: i32,
// #[serde(skip)]
// pub coverart_id: i32,
}
fn is_zero(num: &i32) -> bool {
*num == 0
}
fn is_dur_not_set(num: &i32) -> bool {
*num == 0
}
impl Song {
pub fn to_metadata_json(&self, pretty: bool) -> Result<String, serde_json::Error> {
if pretty {
serde_json::to_string_pretty(&self)
} else {
serde_json::to_string(&self)
}
}
pub fn song_path(&self) -> Result<String, std::io::Error> {
if self.directory.is_empty() {
return Err(std::io::Error::new(
std::io::ErrorKind::Other,
"Directory does not exist",
));
}
let directory = &self.directory;
let mut buffer: String = directory.clone();
let last_index = directory.len() - 1;
if let Some(character) = directory.chars().nth(last_index) {
if character != '/' {
buffer += "/";
}
buffer += &self.filename.clone();
Ok(buffer)
} else {
Err(std::io::Error::new(
std::io::ErrorKind::Other,
"Could not access last character of directory",
))
}
}
pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
let path_result = self.song_path();
match path_result {
Ok(path) => {
let mut file = std::fs::File::open(path)?;
let mut buffer: Vec<u8> = Vec::new();
file.read_to_end(&mut buffer)?;
if buffer.is_empty() {
Err(std::io::Error::new(
std::io::ErrorKind::Other,
"File is empty",
))
} else {
Ok(buffer)
}
}
Err(er) => Err(er),
}
}
pub fn generate_filename(&self, typ: types::MusicTypes, randomize: bool) -> String {
let mut filename: String = String::new();
let filename_len = 10;
let file_extension = match typ {
types::MusicTypes::DefaultMusicExtension => {
String::from(constants::DEFAULTMUSICEXTENSION)
}
types::MusicTypes::WavExtension => String::from(constants::WAVEXTENSION),
types::MusicTypes::FlacExtension => String::from(constants::FLACEXTENSION),
types::MusicTypes::MPThreeExtension => String::from(constants::MPTHREEEXTENSION),
};
if randomize {
let some_chars: String = String::from("abcdefghij0123456789");
let mut rng = rand::rng();
for _i in 0..filename_len {
let random_number: i32 = rng.random_range(0..=19);
let index = random_number as usize;
let rando_char = some_chars.chars().nth(index);
if let Some(c) = rando_char {
filename.push(c);
}
}
} else {
filename += "track-output";
}
filename += &file_extension;
filename
}
}
/*
mod embedded {
use std::io::Read;
use serde::{Deserialize, Serialize};
impl Song {
pub fn to_metadata_json(&self, pretty: bool) -> Result<String, serde_json::Error> {
if pretty {
serde_json::to_string_pretty(&self)
} else {
serde_json::to_string(&self)
}
}
pub fn song_path(&self) -> Result<String, std::io::Error> {
if self.directory.is_empty() {
return Err(std::io::Error::new(
std::io::ErrorKind::Other,
"Directory does not exist",
));
}
let directory = &self.directory;
let mut buffer: String = directory.clone();
let last_index = directory.len() - 1;
if let Some(character) = directory.chars().nth(last_index) {
if character != '/' {
buffer += "/";
}
buffer += &self.filename.clone();
Ok(buffer)
} else {
Err(std::io::Error::new(
std::io::ErrorKind::Other,
"Could not access last character of directory",
))
}
}
pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
let path_result = self.song_path();
match path_result {
Ok(path) => {
let mut file = std::fs::File::open(path)?;
let mut buffer: Vec<u8> = Vec::new();
file.read_to_end(&mut buffer)?;
if buffer.is_empty() {
Err(std::io::Error::new(
std::io::ErrorKind::Other,
"File is empty",
))
} else {
Ok(buffer)
}
}
Err(er) => Err(er),
}
}
}
// The song's duration is a floating point in seconds
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct Song {
#[serde(skip_serializing_if = "is_embed_zero")]
#[serde(alias = "id")]
pub id: i32,
#[serde(skip_serializing_if = "String::is_empty")]
pub title: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub artist: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub album: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub album_artist: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub genre: String,
#[serde(skip_serializing_if = "is_embed_zero")]
pub year: i32,
#[serde(skip_serializing_if = "is_embed_dur_not_set")]
pub duration: f64,
#[serde(skip_serializing_if = "is_embed_zero")]
pub track: i32,
#[serde(skip_serializing_if = "is_embed_zero")]
pub disc: i32,
#[serde(skip_serializing_if = "is_embed_zero")]
pub disc_count: i32,
#[serde(skip_serializing_if = "is_embed_zero")]
pub track_count: i32,
#[serde(skip_serializing_if = "String::is_empty")]
pub audio_type: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub date_created: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub filename: String,
#[serde(skip_serializing_if = "is_embed_zero")]
pub user_id: i32,
#[serde(skip)]
pub data: Vec<u8>,
#[serde(skip)]
pub directory: String,
// #[serde(skip)]
// pub album_id: i32,
// #[serde(skip)]
// pub artist_id: i32,
// #[serde(skip)]
// pub genre_id: i32,
// #[serde(skip)]
// pub coverart_id: i32,
}
fn is_embed_zero(num: &i32) -> bool {
*num == 0
}
fn is_embed_dur_not_set(num: &f64) -> bool {
*num == 0.0
}
impl Default for Song {
fn default() -> Self {
Song {
id: 0,
title: String::new(),
artist: String::new(),
album: String::new(),
album_artist: String::new(),
genre: String::new(),
year: 0,
duration: 0.0,
track: 0,
disc: 0,
disc_count: 0,
track_count: 0,
audio_type: String::new(),
date_created: String::new(),
filename: String::new(),
user_id: 0,
data: Vec::new(),
directory: String::new(),
// album_id: 0,
// artist_id: 0,
// genre_id: 0,
// coverart_id: 0,
}
}
}
}
*/

70
src/token.rs Normal file
View File

@@ -0,0 +1,70 @@
use std::default::Default;
use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct Token {
pub scope: String,
pub expiration: i32,
pub audience: String,
pub issuer: String,
pub issued: i32,
}
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct AccessToken {
#[serde(alias = "user_id")]
pub user_id: i32,
#[serde(alias = "username")]
pub username: String,
#[serde(alias = "token")]
pub token: String,
#[serde(alias = "token_type")]
pub token_type: String,
#[serde(alias = "expiration")]
pub expiration: i32,
#[serde(alias = "message")]
pub message: String,
}
impl Default for Token {
fn default() -> Self {
Token {
scope: String::new(),
expiration: -1,
audience: String::new(),
issuer: String::new(),
issued: -1,
}
}
}
impl AccessToken {
pub fn bearer_token(&self) -> String {
let mut token: String = String::from("Bearer ");
token += &self.token.clone();
token
}
}
impl Token {
pub fn _to_json(&self) -> Result<String, serde_json::Error> {
serde_json::to_string_pretty(&self)
}
// TODO: Implement
pub fn token_expired(&self) -> bool {
false
}
// TODO: Implement
pub fn contains_scope(&self, des_scope: &String) -> bool {
let extracted_token: String = String::from("Token");
if extracted_token == *des_scope {
return true;
}
false
}
}

6
src/types.rs Normal file
View File

@@ -0,0 +1,6 @@
pub enum MusicTypes {
DefaultMusicExtension,
WavExtension,
FlacExtension,
MPThreeExtension,
}

View File

@@ -4,19 +4,33 @@ use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct User {
#[serde(skip_serializing_if = "is_id_valid")]
pub id: i32,
#[serde(skip_serializing_if = "String::is_empty")]
pub username: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub password: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub email: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub phone: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub firstname: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub lastname: String,
pub email_verified: bool,
#[serde(skip_serializing_if = "String::is_empty")]
pub date_created: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub status: String,
#[serde(skip_serializing_if = "String::is_empty")]
pub last_login: String,
}
fn is_id_valid(num: &i32) -> bool {
*num > 0
}
impl Default for User {
fn default() -> Self {
User {
@@ -36,7 +50,11 @@ impl Default for User {
}
impl User {
pub fn _to_json(&self) -> Result<String, serde_json::Error> {
return serde_json::to_string_pretty(&self);
pub fn to_json(&self, output_pretty: bool) -> Result<String, serde_json::Error> {
if output_pretty {
serde_json::to_string_pretty(&self)
} else {
serde_json::to_string(&self)
}
}
}

31
tests/album.json Normal file
View File

@@ -0,0 +1,31 @@
{
"album": "Sample Tracks! Yes",
"album_artist": "KD",
"genre": "Country",
"year": 2025,
"track_count": 3,
"disc_count": 1,
"tracks": [
{
"title": "E less",
"artist": "KD",
"disc": 1,
"track": 1,
"duration": 31
},
{
"title": "Aaaaaye",
"artist": "KD",
"disc": 1,
"track": 2,
"duration": 33
},
{
"title": "Check D out",
"artist": "KD",
"disc": 1,
"track": 3,
"duration": 22
}
]
}

179
tests/tests.rs Normal file
View File

@@ -0,0 +1,179 @@
mod utils {
use std::fs;
use std::io::Read;
use std::path::Path;
pub fn get_tests_directory() -> String {
String::from(env!("CARGO_MANIFEST_DIR").to_owned() + "/tests/")
}
pub fn does_directory_exists(directory: &String) -> bool {
let path = Path::new(directory);
if let Ok(dir_i) = fs::metadata(path) {
dir_i.is_dir()
} else {
false
}
}
pub fn extract_data_from_file(filepath: &String) -> Result<Vec<u8>, std::io::Error> {
match std::fs::File::open(filepath) {
Ok(mut file) => {
let mut buffer: Vec<u8> = Vec::new();
let _ = file.read_to_end(&mut buffer);
Ok(buffer)
}
Err(err) => Err(err),
}
}
}
mod song_tests {
use std::fs::File;
use std::io::Write;
use tempfile::tempdir;
use icarus_models::song;
use icarus_models::types;
use crate::utils;
#[test]
fn test_song_to_data() {
println!("Test");
let some_val = true;
println!("Checking if some_val is true");
assert_eq!(true, some_val);
println!("Getting track");
let mut song = song::Song::default();
song.directory = utils::get_tests_directory();
song.filename = String::from("track01.flac");
assert!(
utils::does_directory_exists(&song.directory),
"Directory does not exist"
);
println!("Directory: {}", song.directory);
match song.song_path() {
Ok(filepath) => match utils::extract_data_from_file(&filepath) {
Ok(buffer) => {
assert_eq!(buffer.is_empty(), false);
match song.to_data() {
Ok(song_data) => {
println!("Both files match");
assert_eq!(buffer, song_data);
}
Err(err) => {
assert!(false, "Error producing song data: {:?}", err);
}
};
}
Err(err) => {
assert!(false, "Failed to open file: {:?}", err);
}
},
Err(err) => {
assert!(false, "Could not get song path: {:?}", err);
}
}
}
#[test]
fn test_song_path_check() {
let mut song = song::Song::default();
song.directory = utils::get_tests_directory();
song.filename = String::from("track01.flac");
assert!(
utils::does_directory_exists(&song.directory),
"Directory does not exist"
);
}
#[test]
fn test_song_generate_filename() {
let mut song = song::Song::default();
song.directory = utils::get_tests_directory();
song.filename = String::from("track01.flac");
match song.song_path() {
Ok(songpath) => match utils::extract_data_from_file(&songpath) {
Ok(buffer) => {
let mut song_cpy = song.clone();
let temp_dir = tempdir().expect("Failed to create temp dir");
song_cpy.directory = match temp_dir.path().to_str() {
Some(s) => String::from(s),
None => String::new(),
};
assert_eq!(song.directory.is_empty(), false);
song_cpy.filename =
song.generate_filename(types::MusicTypes::FlacExtension, true);
println!("Directory: {:?}", song_cpy.directory);
println!("File to be created: {:?}", song_cpy.filename);
let path = match song_cpy.song_path() {
Ok(s_path) => s_path,
Err(err) => {
assert!(false, "Error: {:?}", err);
String::new()
}
};
match File::create(path) {
Ok(mut file_cpy) => match file_cpy.write_all(&buffer) {
Ok(success) => {
println!("Success: {:?}", success);
}
Err(err) => {
assert!(false, "Error saving file: {:?}", err);
}
},
Err(err) => {
assert!(false, "Error: {:?}", err);
}
};
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
},
Err(err) => {
assert!(false, "Error extracting song data: {:?}", err);
}
}
}
}
mod album_tests {
use crate::utils;
use icarus_models::album;
#[test]
fn parse_album() {
let test_dir = utils::get_tests_directory();
if utils::does_directory_exists(&test_dir) {
let album_file: String = test_dir + &String::from("album.json");
println!("Album file: {:?}", album_file);
match album::collection::parse_album(&album_file) {
Ok(album) => {
println!("Album title: {}", album.title);
assert_eq!(album.title.is_empty(), false);
assert_eq!(album.artist.is_empty(), false);
assert_eq!(album.tracks.is_empty(), false);
}
Err(err) => {
assert!(false, "Error parsing album json file: {:?}", err);
}
}
}
}
}

BIN
tests/track01.flac Normal file

Binary file not shown.

BIN
tests/track02.flac Normal file

Binary file not shown.

BIN
tests/track03.flac Normal file

Binary file not shown.