phoenix/icarus_models
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 53 Wiki Activity

More changes
Some checks failed
Rust Build / Check (pull_request) Successful in 33s
Details
Rust Build / Test Suite (pull_request) Failing after 29s
Details
Rust Build / Rustfmt (pull_request) Successful in 28s
Details
Rust Build / Clippy (pull_request) Successful in 32s
Details
Rust Build / build (pull_request) Successful in 31s
Details

Browse Source
This commit is contained in:
phoenix
2025-04-03 22:11:59 -04:00
parent caae91dad5
commit 3858a10a23
4 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/access_level.rs
View File

@@ -12,7 +12,7 @@ pub struct AccessLevel {
impl Default for AccessLevel { impl Default for AccessLevel {
fn default() -> Self { fn default() -> Self {
AccessLevel { AccessLevel {
id: uuid::Uuid::new_v4(), id: uuid::Uuid::nil(),
level: String::new(), level: String::new(),
song_id: uuid::Uuid::new_v4(), song_id: uuid::Uuid::new_v4(),
} }
@@ -21,7 +21,7 @@ impl Default for AccessLevel {
pub fn default_level() -> AccessLevel { pub fn default_level() -> AccessLevel {
AccessLevel { AccessLevel {
id: uuid::Uuid::new_v4(), id: uuid::Uuid::nil(),
level: String::from("Public"), level: String::from("Public"),
song_id: uuid::Uuid::new_v4(), song_id: uuid::Uuid::new_v4(),
} }

2
src/coverart.rs
View File

@@ -15,7 +15,7 @@ pub mod init {
pub fn init_coverart_only_path(path: String) -> CoverArt { pub fn init_coverart_only_path(path: String) -> CoverArt {
CoverArt { CoverArt {
id: uuid::Uuid::new_v4(), id: uuid::Uuid::nil(),
title: String::new(), title: String::new(),
path: path.clone(), path: path.clone(),
data: Vec::new(), data: Vec::new(),

2
src/login_result.rs
View File

@@ -15,7 +15,7 @@ pub struct LoginResult {
impl Default for LoginResult { impl Default for LoginResult {
fn default() -> Self { fn default() -> Self {
LoginResult { LoginResult {
id: uuid::Uuid::new_v4(), id: uuid::Uuid::nil(),
username: String::new(), username: String::new(),
token: String::new(), token: String::new(),
token_type: String::new(), token_type: String::new(),

27
src/song.rs
View File

@@ -227,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")]
@@ -240,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,
@@ -258,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>,
@@ -274,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(),