Added file extension constant and updated constants module #17

Merged
phoenix merged 3 commits from file_extension into devel 2025-03-29 22:37:04 +00:00
2 changed files with 24 additions and 9 deletions

View File

@@ -1,5 +1,14 @@
pub mod file_extensions {
pub mod audio {
pub const DEFAULTMUSICEXTENSION: &str = FLACEXTENSION; pub const DEFAULTMUSICEXTENSION: &str = FLACEXTENSION;
pub const FLACEXTENSION: &str = ".flac"; pub const FLACEXTENSION: &str = ".flac";
pub const WAVEXTENSION: &str = ".wav"; pub const WAVEXTENSION: &str = ".wav";
pub const MPTHREEEXTENSION: &str = ".mp3"; pub const MPTHREEEXTENSION: &str = ".mp3";
}
pub mod image {
pub const JPGEXTENSION: &str = ".jpg"; pub const JPGEXTENSION: &str = ".jpg";
pub const JPEGEXTENSION: &str = ".jpeg";
pub const PNGEXTENSION: &str = ".png";
}
}

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 {