Compare commits

...

36 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
20 changed files with 738 additions and 102 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

@@ -47,7 +47,7 @@ extract_version:
script:
- apk add --no-cache jq
- VERSION=$(grep 'version = "' Cargo.toml | awk -F'"' '{print $2}' | head -n 1)
- VER_HASH=${CI_COMMIT_SHA:0:5}
- 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"

View File

@@ -1,10 +1,12 @@
[package]
name = "icarus-models"
version = "0.1.7"
version = "0.1.14"
edition = "2024"
description = "models used for the icarus project"
license = "MIT"
[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

@@ -20,23 +20,23 @@ impl Default for AccessLevel {
}
pub fn default_level() -> AccessLevel {
return AccessLevel {
AccessLevel {
id: -1,
level: String::from("Public"),
song_id: -1,
};
}
}
pub fn private_level() -> AccessLevel {
return 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,
}
}

View File

@@ -1,5 +1,5 @@
pub const DEFAULT_MUSIC_EXTENSION: &str = FLAC_EXTENSION;
pub const FLAC_EXTENSION: &str = ".flac";
pub const WAV_EXTENSION: &str = ".wav";
pub const MPTHREE_EXTENSION: &str = ".mp3";
pub const JPG_EXTENSION: &str = ".jpg";
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,22 +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)
}
}

View File

@@ -1,73 +1,315 @@
use std::default::Default;
use std::io::Read;
use crate::constants;
use crate::types;
use rand::Rng;
use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, Deserialize, Serialize)]
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct Song {
#[serde(skip_serializing_if = "is_zero")]
#[serde(alias = "id")]
pub id: Option<i32>,
pub title: Option<String>,
pub artist: Option<String>,
pub album: Option<String>,
pub album_artist: Option<String>,
pub genre: Option<String>,
pub year: Option<i32>,
pub duration: Option<i32>,
pub track: Option<i32>,
pub disc: Option<i32>,
pub disc_count: Option<i32>,
pub track_count: Option<i32>,
pub audio_type: Option<String>,
pub date_created: Option<String>,
pub filename: Option<String>,
pub user_id: Option<i32>,
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: Option<Vec<u8>>,
pub data: Vec<u8>,
#[serde(skip)]
pub directory: Option<String>,
#[serde(skip)]
pub album_id: Option<i32>,
#[serde(skip)]
pub artist_id: Option<i32>,
#[serde(skip)]
pub genre_id: Option<i32>,
#[serde(skip)]
pub coverart_id: Option<i32>,
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,
}
impl Default for Song {
fn default() -> Self {
Song {
id: None,
title: None,
artist: None,
album: None,
album_artist: None,
genre: None,
year: None,
duration: None,
track: None,
disc: None,
disc_count: None,
track_count: None,
audio_type: None,
date_created: None,
filename: None,
user_id: None,
data: None,
directory: None,
album_id: None,
artist_id: None,
genre_id: None,
coverart_id: None,
}
}
fn is_zero(num: &i32) -> bool {
*num == 0
}
fn is_dur_not_set(num: &i32) -> bool {
*num == 0
}
impl Song {
// TODO: Implement
pub fn to_metadata_json(&self) -> Result<String, serde_json::Error> {
return serde_json::to_string_pretty(&self);
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,
}
}
}
}
*/

View File

@@ -43,22 +43,28 @@ impl AccessToken {
pub fn bearer_token(&self) -> String {
let mut token: String = String::from("Bearer ");
token += &self.token.clone();
return token;
token
}
}
impl Token {
pub fn _to_json(&self) -> Result<String, serde_json::Error> {
return serde_json::to_string_pretty(&self);
serde_json::to_string_pretty(&self)
}
// TODO: Implement
pub fn token_expired(&self) -> bool {
return false;
false
}
// TODO: Implement
pub fn contains_scope(&self, des_scope: String) -> bool {
return false;
pub fn contains_scope(&self, des_scope: &String) -> bool {
let extracted_token: String = String::from("Token");
if extracted_token == *des_scope {
return true;
}
false
}
}

View File

@@ -1,9 +1,6 @@
use std::default::Default;
mod types {
pub enum Types {
WAV_EXTENSION,
FLAC_EXTENSION,
MP_EXTENSION,
}
pub enum MusicTypes {
DefaultMusicExtension,
WavExtension,
FlacExtension,
MPThreeExtension,
}

View File

@@ -52,9 +52,9 @@ impl Default for User {
impl User {
pub fn to_json(&self, output_pretty: bool) -> Result<String, serde_json::Error> {
if output_pretty {
return serde_json::to_string_pretty(&self);
serde_json::to_string_pretty(&self)
} else {
return serde_json::to_string(&self);
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.