Compare commits
16 Commits
v0.1.14-de
...
v0.4.0-dev
Author | SHA1 | Date | |
---|---|---|---|
c555110367 | |||
4b6f6cb67d | |||
e9d73c391e | |||
d476b128cb | |||
255aff414a | |||
6a0135c6fa | |||
8fbd92620e | |||
61ad88a258 | |||
a64d35d153 | |||
f6fdb717e9 | |||
e5c1eabe8c | |||
a8ffe80297 | |||
56384fb371 | |||
bf5808a06a | |||
1c5c0ca70c | |||
bc3aace070 |
@@ -3,14 +3,13 @@ name: Release Tagging
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
|
||||||
- devel
|
- devel
|
||||||
tags:
|
tags:
|
||||||
- 'v*' # Trigger on tags matching v*
|
- 'v*' # Trigger on tags matching v*
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release:
|
release:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
@@ -20,7 +19,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
|
||||||
|
@@ -13,54 +13,54 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
check:
|
check:
|
||||||
name: Check
|
name: Check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
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 check
|
- run: cargo check
|
||||||
|
|
||||||
test:
|
test:
|
||||||
name: Test Suite
|
name: Test Suite
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
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: cargo test
|
||||||
|
|
||||||
fmt:
|
fmt:
|
||||||
name: Rustfmt
|
name: Rustfmt
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
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: cargo fmt --all -- --check
|
||||||
|
|
||||||
clippy:
|
clippy:
|
||||||
name: Clippy
|
name: Clippy
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
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: cargo clippy -- -D warnings
|
||||||
|
|
||||||
build:
|
build:
|
||||||
name: build
|
name: build
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
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 build
|
- run: cargo build
|
||||||
|
|
||||||
|
|
||||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1 +1,2 @@
|
|||||||
/target
|
/target
|
||||||
|
Cargo.lock
|
||||||
|
@@ -1,7 +1,8 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "icarus-models"
|
name = "icarus_models"
|
||||||
version = "0.1.14"
|
version = "0.4.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
rust-version = "1.86"
|
||||||
description = "models used for the icarus project"
|
description = "models used for the icarus project"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|
||||||
@@ -9,3 +10,7 @@ license = "MIT"
|
|||||||
serde = { version = "1.0.218", features = ["derive"] }
|
serde = { version = "1.0.218", features = ["derive"] }
|
||||||
serde_json = { version = "1.0.139" }
|
serde_json = { version = "1.0.139" }
|
||||||
rand = { version = "0.9" }
|
rand = { version = "0.9" }
|
||||||
|
time = { version = "0.3.41", features = ["formatting", "macros", "parsing", "serde"] }
|
||||||
|
uuid = { version = "1.16.0", features = ["v4", "serde"] }
|
||||||
|
[dev-dependencies]
|
||||||
|
tempfile = { version = "3.19.1" }
|
||||||
|
@@ -4,34 +4,34 @@ use serde::{Deserialize, Serialize};
|
|||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
||||||
pub struct AccessLevel {
|
pub struct AccessLevel {
|
||||||
pub id: i32,
|
pub id: uuid::Uuid,
|
||||||
pub level: String,
|
pub level: String,
|
||||||
pub song_id: i32,
|
pub song_id: uuid::Uuid,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for AccessLevel {
|
impl Default for AccessLevel {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
AccessLevel {
|
AccessLevel {
|
||||||
id: -1,
|
id: uuid::Uuid::nil(),
|
||||||
level: String::new(),
|
level: String::new(),
|
||||||
song_id: -1,
|
song_id: uuid::Uuid::new_v4(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn default_level() -> AccessLevel {
|
pub fn default_level() -> AccessLevel {
|
||||||
AccessLevel {
|
AccessLevel {
|
||||||
id: -1,
|
id: uuid::Uuid::nil(),
|
||||||
level: String::from("Public"),
|
level: String::from("Public"),
|
||||||
song_id: -1,
|
song_id: uuid::Uuid::new_v4(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn private_level() -> AccessLevel {
|
pub fn private_level() -> AccessLevel {
|
||||||
AccessLevel {
|
AccessLevel {
|
||||||
id: -1,
|
id: uuid::Uuid::new_v4(),
|
||||||
level: String::from("Private"),
|
level: String::from("Private"),
|
||||||
song_id: -1,
|
song_id: uuid::Uuid::new_v4(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
22
src/album.rs
22
src/album.rs
@@ -1,25 +1,37 @@
|
|||||||
pub mod collection {
|
pub mod collection {
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
use std::default::Default;
|
||||||
|
|
||||||
fn is_set(num: &i32) -> bool {
|
use std::fs::File;
|
||||||
*num >= 0
|
use std::io::BufReader;
|
||||||
|
|
||||||
|
use crate::init;
|
||||||
|
|
||||||
|
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, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
|
||||||
pub struct Album {
|
pub struct Album {
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
#[serde(alias = "album")]
|
#[serde(alias = "album")]
|
||||||
pub title: String,
|
pub title: String,
|
||||||
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
|
#[serde(alias = "album_artist")]
|
||||||
|
pub artist: String,
|
||||||
pub genre: String,
|
pub genre: String,
|
||||||
pub year: i32,
|
pub year: i32,
|
||||||
pub track_count: i32,
|
pub track_count: i32,
|
||||||
#[serde(skip_serializing_if = "is_set")]
|
#[serde(skip_serializing_if = "init::is_set")]
|
||||||
pub disc_count: i32,
|
pub disc_count: i32,
|
||||||
#[serde(skip_serializing_if = "Vec::is_empty")]
|
#[serde(skip_serializing_if = "Vec::is_empty")]
|
||||||
pub tracks: Vec<Track>,
|
pub tracks: Vec<Track>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
|
||||||
pub struct Track {
|
pub struct Track {
|
||||||
pub title: String,
|
pub title: String,
|
||||||
pub artist: String,
|
pub artist: String,
|
||||||
|
@@ -1,5 +1,14 @@
|
|||||||
|
pub mod file_extensions {
|
||||||
|
pub mod audio {
|
||||||
pub const DEFAULTMUSICEXTENSION: &str = FLACEXTENSION;
|
pub const DEFAULTMUSICEXTENSION: &str = FLACEXTENSION;
|
||||||
pub const FLACEXTENSION: &str = ".flac";
|
pub const FLACEXTENSION: &str = ".flac";
|
||||||
pub const WAVEXTENSION: &str = ".wav";
|
pub const WAVEXTENSION: &str = ".wav";
|
||||||
pub const MPTHREEEXTENSION: &str = ".mp3";
|
pub const MPTHREEEXTENSION: &str = ".mp3";
|
||||||
|
}
|
||||||
|
|
||||||
|
pub mod image {
|
||||||
pub const JPGEXTENSION: &str = ".jpg";
|
pub const JPGEXTENSION: &str = ".jpg";
|
||||||
|
pub const JPEGEXTENSION: &str = ".jpeg";
|
||||||
|
pub const PNGEXTENSION: &str = ".png";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -2,14 +2,27 @@ use std::io::Read;
|
|||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
|
||||||
pub struct CoverArt {
|
pub struct CoverArt {
|
||||||
pub id: i32,
|
pub id: uuid::Uuid,
|
||||||
pub title: String,
|
pub title: String,
|
||||||
pub path: String,
|
pub path: String,
|
||||||
pub data: Vec<u8>,
|
pub data: Vec<u8>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub mod init {
|
||||||
|
use crate::coverart::CoverArt;
|
||||||
|
|
||||||
|
pub fn init_coverart_only_path(path: String) -> CoverArt {
|
||||||
|
CoverArt {
|
||||||
|
id: uuid::Uuid::nil(),
|
||||||
|
title: String::new(),
|
||||||
|
path: path.clone(),
|
||||||
|
data: Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl CoverArt {
|
impl CoverArt {
|
||||||
pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
|
pub fn to_data(&self) -> Result<Vec<u8>, std::io::Error> {
|
||||||
let path: &String = &self.path;
|
let path: &String = &self.path;
|
||||||
@@ -21,3 +34,16 @@ impl CoverArt {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use crate::coverart;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_cover_art_image() {
|
||||||
|
let path: String = String::from("somepath");
|
||||||
|
let coverart = coverart::init::init_coverart_only_path(path.clone());
|
||||||
|
|
||||||
|
assert_eq!(path, coverart.path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
22
src/lib.rs
22
src/lib.rs
@@ -7,3 +7,25 @@ pub mod song;
|
|||||||
pub mod token;
|
pub mod token;
|
||||||
pub mod types;
|
pub mod types;
|
||||||
pub mod user;
|
pub mod user;
|
||||||
|
|
||||||
|
pub mod init {
|
||||||
|
pub fn is_id_valid(num: &i32) -> bool {
|
||||||
|
*num > 0
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_uuid_nil(uuid: &uuid::Uuid) -> bool {
|
||||||
|
uuid.is_nil()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_zero(num: &i32) -> bool {
|
||||||
|
*num == 0
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_dur_not_set(num: &i32) -> bool {
|
||||||
|
*num == 0
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_set(num: &i32) -> bool {
|
||||||
|
*num >= 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
|
|||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
||||||
pub struct LoginResult {
|
pub struct LoginResult {
|
||||||
pub id: i32,
|
pub id: uuid::Uuid,
|
||||||
pub username: String,
|
pub username: String,
|
||||||
pub token: String,
|
pub token: String,
|
||||||
#[serde(alias = "token_type")]
|
#[serde(alias = "token_type")]
|
||||||
@@ -15,7 +15,7 @@ pub struct LoginResult {
|
|||||||
impl Default for LoginResult {
|
impl Default for LoginResult {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
LoginResult {
|
LoginResult {
|
||||||
id: -1,
|
id: uuid::Uuid::nil(),
|
||||||
username: String::new(),
|
username: String::new(),
|
||||||
token: String::new(),
|
token: String::new(),
|
||||||
token_type: String::new(),
|
token_type: String::new(),
|
||||||
|
104
src/song.rs
104
src/song.rs
@@ -1,17 +1,17 @@
|
|||||||
// use std::default::Default;
|
|
||||||
use std::io::Read;
|
use std::io::Read;
|
||||||
|
|
||||||
use crate::constants;
|
use crate::constants;
|
||||||
|
use crate::init;
|
||||||
use crate::types;
|
use crate::types;
|
||||||
|
|
||||||
use rand::Rng;
|
use rand::Rng;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
|
||||||
pub struct Song {
|
pub struct Song {
|
||||||
#[serde(skip_serializing_if = "is_zero")]
|
#[serde(skip_serializing_if = "init::is_uuid_nil")]
|
||||||
#[serde(alias = "id")]
|
#[serde(alias = "id")]
|
||||||
pub id: i32,
|
pub id: uuid::Uuid,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
pub title: String,
|
pub title: String,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
@@ -22,17 +22,17 @@ pub struct Song {
|
|||||||
pub album_artist: String,
|
pub album_artist: String,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
pub genre: String,
|
pub genre: String,
|
||||||
#[serde(skip_serializing_if = "is_zero")]
|
#[serde(skip_serializing_if = "init::is_zero")]
|
||||||
pub year: i32,
|
pub year: i32,
|
||||||
#[serde(skip_serializing_if = "is_dur_not_set")]
|
#[serde(skip_serializing_if = "init::is_dur_not_set")]
|
||||||
pub duration: i32,
|
pub duration: i32,
|
||||||
#[serde(skip_serializing_if = "is_zero")]
|
#[serde(skip_serializing_if = "init::is_zero")]
|
||||||
pub track: i32,
|
pub track: i32,
|
||||||
#[serde(skip_serializing_if = "is_zero")]
|
#[serde(skip_serializing_if = "init::is_zero")]
|
||||||
pub disc: i32,
|
pub disc: i32,
|
||||||
#[serde(skip_serializing_if = "is_zero")]
|
#[serde(skip_serializing_if = "init::is_zero")]
|
||||||
pub disc_count: i32,
|
pub disc_count: i32,
|
||||||
#[serde(skip_serializing_if = "is_zero")]
|
#[serde(skip_serializing_if = "init::is_zero")]
|
||||||
pub track_count: i32,
|
pub track_count: i32,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
pub audio_type: String,
|
pub audio_type: String,
|
||||||
@@ -40,8 +40,8 @@ pub struct Song {
|
|||||||
pub date_created: String,
|
pub date_created: String,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
pub filename: String,
|
pub filename: String,
|
||||||
#[serde(skip_serializing_if = "is_zero")]
|
#[serde(skip_serializing_if = "init::is_uuid_nil")]
|
||||||
pub user_id: i32,
|
pub user_id: uuid::Uuid,
|
||||||
#[serde(skip)]
|
#[serde(skip)]
|
||||||
pub data: Vec<u8>,
|
pub data: Vec<u8>,
|
||||||
#[serde(skip)]
|
#[serde(skip)]
|
||||||
@@ -56,45 +56,6 @@ pub struct Song {
|
|||||||
// pub coverart_id: i32,
|
// pub coverart_id: i32,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn is_zero(num: &i32) -> bool {
|
|
||||||
*num == 0
|
|
||||||
}
|
|
||||||
|
|
||||||
fn is_dur_not_set(num: &i32) -> bool {
|
|
||||||
*num == 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,
|
|
||||||
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,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
impl Song {
|
impl Song {
|
||||||
pub fn to_metadata_json(&self, pretty: bool) -> Result<String, serde_json::Error> {
|
pub fn to_metadata_json(&self, pretty: bool) -> Result<String, serde_json::Error> {
|
||||||
if pretty {
|
if pretty {
|
||||||
@@ -160,12 +121,18 @@ impl Song {
|
|||||||
|
|
||||||
let file_extension = match typ {
|
let file_extension = match typ {
|
||||||
types::MusicTypes::DefaultMusicExtension => {
|
types::MusicTypes::DefaultMusicExtension => {
|
||||||
String::from(constants::DEFAULTMUSICEXTENSION)
|
String::from(constants::file_extensions::audio::DEFAULTMUSICEXTENSION)
|
||||||
}
|
}
|
||||||
|
|
||||||
types::MusicTypes::WavExtension => String::from(constants::WAVEXTENSION),
|
types::MusicTypes::WavExtension => {
|
||||||
types::MusicTypes::FlacExtension => String::from(constants::FLACEXTENSION),
|
String::from(constants::file_extensions::audio::WAVEXTENSION)
|
||||||
types::MusicTypes::MPThreeExtension => String::from(constants::MPTHREEEXTENSION),
|
}
|
||||||
|
types::MusicTypes::FlacExtension => {
|
||||||
|
String::from(constants::file_extensions::audio::FLACEXTENSION)
|
||||||
|
}
|
||||||
|
types::MusicTypes::MPThreeExtension => {
|
||||||
|
String::from(constants::file_extensions::audio::MPTHREEEXTENSION)
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if randomize {
|
if randomize {
|
||||||
@@ -260,9 +227,9 @@ mod embedded {
|
|||||||
// The song's duration is a floating point in seconds
|
// The song's duration is a floating point in seconds
|
||||||
#[derive(Clone, Debug, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
||||||
pub struct Song {
|
pub struct Song {
|
||||||
#[serde(skip_serializing_if = "is_embed_zero")]
|
#[serde(skip_serializing_if = "init::is_uuid_nil")]
|
||||||
#[serde(alias = "id")]
|
#[serde(alias = "id")]
|
||||||
pub id: i32,
|
pub id: uuid::Uuid,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
pub title: String,
|
pub title: String,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
@@ -273,17 +240,17 @@ mod embedded {
|
|||||||
pub album_artist: String,
|
pub album_artist: String,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
pub genre: String,
|
pub genre: String,
|
||||||
#[serde(skip_serializing_if = "is_embed_zero")]
|
#[serde(skip_serializing_if = "init::is_embed_zero")]
|
||||||
pub year: i32,
|
pub year: i32,
|
||||||
#[serde(skip_serializing_if = "is_embed_dur_not_set")]
|
#[serde(skip_serializing_if = "init::is_embed_dur_not_set")]
|
||||||
pub duration: f64,
|
pub duration: f64,
|
||||||
#[serde(skip_serializing_if = "is_embed_zero")]
|
#[serde(skip_serializing_if = "init::is_embed_zero")]
|
||||||
pub track: i32,
|
pub track: i32,
|
||||||
#[serde(skip_serializing_if = "is_embed_zero")]
|
#[serde(skip_serializing_if = "init::is_embed_zero")]
|
||||||
pub disc: i32,
|
pub disc: i32,
|
||||||
#[serde(skip_serializing_if = "is_embed_zero")]
|
#[serde(skip_serializing_if = "init::is_embed_zero")]
|
||||||
pub disc_count: i32,
|
pub disc_count: i32,
|
||||||
#[serde(skip_serializing_if = "is_embed_zero")]
|
#[serde(skip_serializing_if = "init::is_embed_zero")]
|
||||||
pub track_count: i32,
|
pub track_count: i32,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
pub audio_type: String,
|
pub audio_type: String,
|
||||||
@@ -291,7 +258,7 @@ mod embedded {
|
|||||||
pub date_created: String,
|
pub date_created: String,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
pub filename: String,
|
pub filename: String,
|
||||||
#[serde(skip_serializing_if = "is_embed_zero")]
|
#[serde(skip_serializing_if = "init::is_embed_zero")]
|
||||||
pub user_id: i32,
|
pub user_id: i32,
|
||||||
#[serde(skip)]
|
#[serde(skip)]
|
||||||
pub data: Vec<u8>,
|
pub data: Vec<u8>,
|
||||||
@@ -307,18 +274,11 @@ mod embedded {
|
|||||||
// pub coverart_id: i32,
|
// 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 {
|
impl Default for Song {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Song {
|
Song {
|
||||||
id: 0,
|
id: uuid::Uuid::nil(),
|
||||||
title: String::new(),
|
title: String::new(),
|
||||||
artist: String::new(),
|
artist: String::new(),
|
||||||
album: String::new(),
|
album: String::new(),
|
||||||
|
@@ -13,8 +13,8 @@ pub struct Token {
|
|||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
||||||
pub struct AccessToken {
|
pub struct AccessToken {
|
||||||
#[serde(alias = "user_id")]
|
#[serde(alias = "init::is_uuid_nil")]
|
||||||
pub user_id: i32,
|
pub user_id: uuid::Uuid,
|
||||||
#[serde(alias = "username")]
|
#[serde(alias = "username")]
|
||||||
pub username: String,
|
pub username: String,
|
||||||
#[serde(alias = "token")]
|
#[serde(alias = "token")]
|
||||||
|
53
src/user.rs
53
src/user.rs
@@ -1,11 +1,13 @@
|
|||||||
use std::default::Default;
|
use std::default::Default;
|
||||||
|
|
||||||
|
use crate::init;
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
||||||
pub struct User {
|
pub struct User {
|
||||||
#[serde(skip_serializing_if = "is_id_valid")]
|
#[serde(skip_serializing_if = "init::is_uuid_nil")]
|
||||||
pub id: i32,
|
pub id: uuid::Uuid,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
pub username: String,
|
pub username: String,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
@@ -19,22 +21,20 @@ pub struct User {
|
|||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
pub lastname: String,
|
pub lastname: String,
|
||||||
pub email_verified: bool,
|
pub email_verified: bool,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(with = "time::serde::rfc3339::option")]
|
||||||
pub date_created: String,
|
pub date_created: Option<time::OffsetDateTime>,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
pub status: String,
|
pub status: String,
|
||||||
#[serde(skip_serializing_if = "String::is_empty")]
|
#[serde(with = "time::serde::rfc3339::option")]
|
||||||
pub last_login: String,
|
pub last_login: Option<time::OffsetDateTime>,
|
||||||
}
|
#[serde(skip_serializing_if = "init::is_uuid_nil")]
|
||||||
|
pub salt_id: uuid::Uuid,
|
||||||
fn is_id_valid(num: &i32) -> bool {
|
|
||||||
*num > 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for User {
|
impl Default for User {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
User {
|
User {
|
||||||
id: -1,
|
id: uuid::Uuid::new_v4(),
|
||||||
username: String::new(),
|
username: String::new(),
|
||||||
password: String::new(),
|
password: String::new(),
|
||||||
email: String::new(),
|
email: String::new(),
|
||||||
@@ -42,9 +42,10 @@ impl Default for User {
|
|||||||
firstname: String::new(),
|
firstname: String::new(),
|
||||||
lastname: String::new(),
|
lastname: String::new(),
|
||||||
email_verified: false,
|
email_verified: false,
|
||||||
date_created: String::new(),
|
date_created: None,
|
||||||
status: String::new(),
|
status: String::new(),
|
||||||
last_login: String::new(),
|
last_login: None,
|
||||||
|
salt_id: uuid::Uuid::nil(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -58,3 +59,29 @@ impl User {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub mod salt {
|
||||||
|
use std::default::Default;
|
||||||
|
|
||||||
|
use crate::init;
|
||||||
|
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
|
||||||
|
pub struct Salt {
|
||||||
|
#[serde(skip_serializing_if = "init::is_uuid_nil")]
|
||||||
|
pub id: uuid::Uuid,
|
||||||
|
#[serde(skip_serializing_if = "String::is_empty")]
|
||||||
|
pub salt: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Salt {
|
||||||
|
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
31
tests/album.json
Normal 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
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
181
tests/tests.rs
Normal file
181
tests/tests.rs
Normal file
@@ -0,0 +1,181 @@
|
|||||||
|
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),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
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
BIN
tests/track01.flac
Normal file
Binary file not shown.
BIN
tests/track02.flac
Normal file
BIN
tests/track02.flac
Normal file
Binary file not shown.
BIN
tests/track03.flac
Normal file
BIN
tests/track03.flac
Normal file
Binary file not shown.
Reference in New Issue
Block a user