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

First model change (#23)
All checks were successful
Release Tagging / release (push) Successful in 29s
Details
Rust Build / Check (push) Successful in 26s
Details
Rust Build / Test Suite (push) Successful in 26s
Details
Rust Build / Rustfmt (push) Successful in 33s
Details
Rust Build / Clippy (push) Successful in 30s
Details
Rust Build / build (push) Successful in 28s
Details

Browse Source 
Reviewed-on: #23
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
This commit is contained in:
phoenix
2025-04-04 01:48:27 +00:00
committed by phoenix
parent a64d35d153
commit 61ad88a258
9 changed files with 55 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/song.rs
View File

@@ -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<u8>,
@@ -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<String, serde_json::Error> {
if pretty {