Compare commits

...

2 Commits

Author SHA1 Message Date
KD 56384fb371 Added file extension constant and updated constants module (#17)
Reviewed-on: phoenix/icarus-models#17
Co-authored-by: KD <kundeng94@gmail.com>
Co-committed-by: KD <kundeng94@gmail.com>
2025-03-29 22:37:02 +00:00
phoenix bf5808a06a Added default to coverart model (#18)
Reviewed-on: phoenix/icarus-models#18
Co-authored-by: phoenix <kundeng94@gmail.com>
Co-committed-by: phoenix <kundeng94@gmail.com>
2025-03-29 22:36:47 +00:00
3 changed files with 25 additions and 10 deletions
+14 -5
View File
@@ -1,5 +1,14 @@
pub const DEFAULTMUSICEXTENSION: &str = FLACEXTENSION; pub mod file_extensions {
pub const FLACEXTENSION: &str = ".flac"; pub mod audio {
pub const WAVEXTENSION: &str = ".wav"; pub const DEFAULTMUSICEXTENSION: &str = FLACEXTENSION;
pub const MPTHREEEXTENSION: &str = ".mp3"; pub const FLACEXTENSION: &str = ".flac";
pub const JPGEXTENSION: &str = ".jpg"; pub const WAVEXTENSION: &str = ".wav";
pub const MPTHREEEXTENSION: &str = ".mp3";
}
pub mod image {
pub const JPGEXTENSION: &str = ".jpg";
pub const JPEGEXTENSION: &str = ".jpeg";
pub const PNGEXTENSION: &str = ".png";
}
}
+1 -1
View File
@@ -2,7 +2,7 @@ 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: i32,
pub title: String, pub title: String,
+10 -4
View File
@@ -128,12 +128,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 {