From b2fc00e70fcc8641b2f0acccbbdcdf9de40ad009 Mon Sep 17 00:00:00 2001 From: phoenix Date: Thu, 3 Apr 2025 21:40:23 -0400 Subject: [PATCH] Added more id changes --- src/access_level.rs | 16 ++++++++-------- src/album.rs | 6 ++---- src/coverart.rs | 2 +- src/lib.rs | 12 ++++++++++++ src/login_result.rs | 4 ++-- src/song.rs | 27 ++++++++++----------------- src/token.rs | 4 ++-- 7 files changed, 37 insertions(+), 34 deletions(-) diff --git a/src/access_level.rs b/src/access_level.rs index c41d81f..a51dcef 100644 --- a/src/access_level.rs +++ b/src/access_level.rs @@ -4,34 +4,34 @@ use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, Deserialize, Serialize)] pub struct AccessLevel { - pub id: i32, + pub id: uuid::Uuid, pub level: String, - pub song_id: i32, + pub song_id: uuid::Uuid, } impl Default for AccessLevel { fn default() -> Self { AccessLevel { - id: -1, + id: uuid::Uuid::new_v4(), level: String::new(), - song_id: -1, + song_id: uuid::Uuid::new_v4(), } } } pub fn default_level() -> AccessLevel { AccessLevel { - id: -1, + id: uuid::Uuid::new_v4(), level: String::from("Public"), - song_id: -1, + song_id: uuid::Uuid::new_v4(), } } pub fn private_level() -> AccessLevel { AccessLevel { - id: -1, + id: uuid::Uuid::new_v4(), level: String::from("Private"), - song_id: -1, + song_id: uuid::Uuid::new_v4(), } } diff --git a/src/album.rs b/src/album.rs index 356d23b..bd17c75 100644 --- a/src/album.rs +++ b/src/album.rs @@ -5,9 +5,7 @@ pub mod collection { use std::fs::File; use std::io::BufReader; - fn is_set(num: &i32) -> bool { - *num >= 0 - } + use crate::init; pub fn parse_album(filepath: &String) -> Result { let file = File::open(filepath).expect("Failed to open file"); @@ -27,7 +25,7 @@ pub mod collection { pub genre: String, pub year: i32, pub track_count: i32, - #[serde(skip_serializing_if = "is_set")] + #[serde(skip_serializing_if = "init::is_set")] pub disc_count: i32, #[serde(skip_serializing_if = "Vec::is_empty")] pub tracks: Vec, diff --git a/src/coverart.rs b/src/coverart.rs index 16ffdf8..ebbf013 100644 --- a/src/coverart.rs +++ b/src/coverart.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, Default, Deserialize, Serialize)] pub struct CoverArt { - pub id: i32, + pub id: uuid::Uuid, pub title: String, pub path: String, pub data: Vec, diff --git a/src/lib.rs b/src/lib.rs index 7ae0952..e328cf2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -16,4 +16,16 @@ pub mod init { 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 + } } diff --git a/src/login_result.rs b/src/login_result.rs index 782ca77..c4b6740 100644 --- a/src/login_result.rs +++ b/src/login_result.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, Deserialize, Serialize)] pub struct LoginResult { - pub id: i32, + pub id: uuid::Uuid, pub username: String, pub token: String, #[serde(alias = "token_type")] @@ -15,7 +15,7 @@ pub struct LoginResult { impl Default for LoginResult { fn default() -> Self { LoginResult { - id: -1, + id: uuid::Uuid::new_v4(), username: String::new(), token: String::new(), token_type: String::new(), diff --git a/src/song.rs b/src/song.rs index 3f0d15f..bf277ff 100644 --- a/src/song.rs +++ b/src/song.rs @@ -1,6 +1,7 @@ use std::io::Read; use crate::constants; +use crate::init; use crate::types; use rand::Rng; @@ -8,9 +9,9 @@ use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, Default, Deserialize, Serialize)] pub struct Song { - #[serde(skip_serializing_if = "is_zero")] + #[serde(skip_serializing_if = "init::is_uuid_nil")] #[serde(alias = "id")] - pub id: i32, + pub id: uuid::Uuid, #[serde(skip_serializing_if = "String::is_empty")] pub title: String, #[serde(skip_serializing_if = "String::is_empty")] @@ -21,17 +22,17 @@ pub struct Song { pub album_artist: String, #[serde(skip_serializing_if = "String::is_empty")] pub genre: String, - #[serde(skip_serializing_if = "is_zero")] + #[serde(skip_serializing_if = "init::is_zero")] pub year: i32, - #[serde(skip_serializing_if = "is_dur_not_set")] + #[serde(skip_serializing_if = "init::is_dur_not_set")] pub duration: i32, - #[serde(skip_serializing_if = "is_zero")] + #[serde(skip_serializing_if = "init::is_zero")] pub track: i32, - #[serde(skip_serializing_if = "is_zero")] + #[serde(skip_serializing_if = "init::is_zero")] pub disc: i32, - #[serde(skip_serializing_if = "is_zero")] + #[serde(skip_serializing_if = "init::is_zero")] pub disc_count: i32, - #[serde(skip_serializing_if = "is_zero")] + #[serde(skip_serializing_if = "init::is_zero")] pub track_count: i32, #[serde(skip_serializing_if = "String::is_empty")] pub audio_type: String, @@ -39,7 +40,7 @@ pub struct Song { pub date_created: String, #[serde(skip_serializing_if = "String::is_empty")] pub filename: String, - #[serde(skip_serializing_if = "is_zero")] + #[serde(skip_serializing_if = "init::is_zero")] pub user_id: i32, #[serde(skip)] pub data: Vec, @@ -55,14 +56,6 @@ pub struct Song { // 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 { if pretty { diff --git a/src/token.rs b/src/token.rs index dc5a261..fd8f6f7 100644 --- a/src/token.rs +++ b/src/token.rs @@ -13,8 +13,8 @@ pub struct Token { #[derive(Clone, Debug, Deserialize, Serialize)] pub struct AccessToken { - #[serde(alias = "user_id")] - pub user_id: i32, + #[serde(alias = "init::is_uuid_nil")] + pub user_id: uuid::Uuid, #[serde(alias = "username")] pub username: String, #[serde(alias = "token")]