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

tsk-86: Make MusicTypes and CoverArtTypes singular #88

Merged
phoenix merged 5 commits from tsk-86 into main 2025-10-29 18:00:56 +00:00
Conversation 0 Commits 5 Files Changed 6 +11 -14
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3a6b2c5a53 - Show all commits

10
src/coverart.rs
View File

@@ -86,20 +86,20 @@ impl CoverArt {
/// Generates filename for a CoverArt /// Generates filename for a CoverArt
pub fn generate_filename( pub fn generate_filename(
typ: crate::types::CoverArtTypes, typ: crate::types::CoverArtType,
randomize: bool, randomize: bool,
) -> Result<String, std::io::Error> { ) -> Result<String, std::io::Error> {
let file_extension = match typ { let file_extension = match typ {
crate::types::CoverArtTypes::PngExtension => { crate::types::CoverArtType::PngExtension => {
String::from(crate::constants::file_extensions::image::PNGEXTENSION) String::from(crate::constants::file_extensions::image::PNGEXTENSION)
} }
crate::types::CoverArtTypes::JpegExtension => { crate::types::CoverArtType::JpegExtension => {
String::from(crate::constants::file_extensions::image::JPEGEXTENSION) String::from(crate::constants::file_extensions::image::JPEGEXTENSION)
} }
crate::types::CoverArtTypes::JpgExtension => { crate::types::CoverArtType::JpgExtension => {
String::from(crate::constants::file_extensions::image::JPGEXTENSION) String::from(crate::constants::file_extensions::image::JPGEXTENSION)
} }
crate::types::CoverArtTypes::None => { crate::types::CoverArtType::None => {
return Err(std::io::Error::other("Unsupported CoverArtTypes")); return Err(std::io::Error::other("Unsupported CoverArtTypes"));
} }
}; };

15
src/song.rs
View File

@@ -126,24 +126,21 @@ impl Song {
} }
/// Generates a filename. In order to save a song to the filesystem /// Generates a filename. In order to save a song to the filesystem
pub fn generate_filename( pub fn generate_filename(typ: types::MusicType, randomize: bool) -> Result<String, std::io::Error> {
typ: types::MusicTypes,
randomize: bool,
) -> Result<String, std::io::Error> {
let file_extension = match typ { let file_extension = match typ {
types::MusicTypes::DefaultMusicExtension => { types::MusicType::DefaultMusicExtension => {
String::from(constants::file_extensions::audio::DEFAULTMUSICEXTENSION) String::from(constants::file_extensions::audio::DEFAULTMUSICEXTENSION)
} }
types::MusicTypes::WavExtension => { types::MusicType::WavExtension => {
String::from(constants::file_extensions::audio::WAVEXTENSION) String::from(constants::file_extensions::audio::WAVEXTENSION)
} }
types::MusicTypes::FlacExtension => { types::MusicType::FlacExtension => {
String::from(constants::file_extensions::audio::FLACEXTENSION) String::from(constants::file_extensions::audio::FLACEXTENSION)
} }
types::MusicTypes::MPThreeExtension => { types::MusicType::MPThreeExtension => {
String::from(constants::file_extensions::audio::MPTHREEEXTENSION) String::from(constants::file_extensions::audio::MPTHREEEXTENSION)
} }
types::MusicTypes::None => return Err(std::io::Error::other("Unsupported MusicTypes")), types::MusicType::None => return Err(std::io::Error::other("Unsupported MusicTypes")),
}; };
let filename: String = if randomize { let filename: String = if randomize {