diff --git a/src/access_level.rs b/src/access_level.rs index a51dcef..3c828e1 100644 --- a/src/access_level.rs +++ b/src/access_level.rs @@ -12,7 +12,7 @@ pub struct AccessLevel { impl Default for AccessLevel { fn default() -> Self { AccessLevel { - id: uuid::Uuid::new_v4(), + id: uuid::Uuid::nil(), level: String::new(), song_id: uuid::Uuid::new_v4(), } @@ -21,7 +21,7 @@ impl Default for AccessLevel { pub fn default_level() -> AccessLevel { AccessLevel { - id: uuid::Uuid::new_v4(), + id: uuid::Uuid::nil(), level: String::from("Public"), song_id: uuid::Uuid::new_v4(), } diff --git a/src/coverart.rs b/src/coverart.rs index 09be846..1af0ae7 100644 --- a/src/coverart.rs +++ b/src/coverart.rs @@ -15,7 +15,7 @@ pub mod init { pub fn init_coverart_only_path(path: String) -> CoverArt { CoverArt { - id: uuid::Uuid::new_v4(), + id: uuid::Uuid::nil(), title: String::new(), path: path.clone(), data: Vec::new(), diff --git a/src/login_result.rs b/src/login_result.rs index c4b6740..29d60d9 100644 --- a/src/login_result.rs +++ b/src/login_result.rs @@ -15,7 +15,7 @@ pub struct LoginResult { impl Default for LoginResult { fn default() -> Self { LoginResult { - id: uuid::Uuid::new_v4(), + id: uuid::Uuid::nil(), username: String::new(), token: String::new(), token_type: String::new(), diff --git a/src/song.rs b/src/song.rs index bf277ff..5ed3440 100644 --- a/src/song.rs +++ b/src/song.rs @@ -227,9 +227,9 @@ mod embedded { // 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(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")] @@ -240,17 +240,17 @@ mod embedded { pub album_artist: String, #[serde(skip_serializing_if = "String::is_empty")] pub genre: String, - #[serde(skip_serializing_if = "is_embed_zero")] + #[serde(skip_serializing_if = "init::is_embed_zero")] 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, - #[serde(skip_serializing_if = "is_embed_zero")] + #[serde(skip_serializing_if = "init::is_embed_zero")] pub track: i32, - #[serde(skip_serializing_if = "is_embed_zero")] + #[serde(skip_serializing_if = "init::is_embed_zero")] pub disc: i32, - #[serde(skip_serializing_if = "is_embed_zero")] + #[serde(skip_serializing_if = "init::is_embed_zero")] pub disc_count: i32, - #[serde(skip_serializing_if = "is_embed_zero")] + #[serde(skip_serializing_if = "init::is_embed_zero")] pub track_count: i32, #[serde(skip_serializing_if = "String::is_empty")] pub audio_type: String, @@ -258,7 +258,7 @@ mod embedded { pub date_created: String, #[serde(skip_serializing_if = "String::is_empty")] pub filename: String, - #[serde(skip_serializing_if = "is_embed_zero")] + #[serde(skip_serializing_if = "init::is_embed_zero")] pub user_id: i32, #[serde(skip)] pub data: Vec, @@ -274,18 +274,11 @@ mod embedded { // 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, + id: uuid::Uuid::nil(), title: String::new(), artist: String::new(), album: String::new(),