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

tsk-83: Add None value for MusicTypes and CoverArtTypes #87

Merged
phoenix merged 6 commits from tsk-83 into main 2025-10-28 17:05:14 +00:00
Conversation 0 Commits 6 Files Changed 6 +9 -5
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6d5d621f16 - Show all commits

5
src/coverart.rs
View File

@@ -85,7 +85,10 @@ impl CoverArt {
}
/// Generates filename for a CoverArt
pub fn generate_filename(typ: crate::types::CoverArtTypes, randomize: bool) -> Result<String, std::io::Error> {
pub fn generate_filename(
typ: crate::types::CoverArtTypes,
randomize: bool,
) -> Result<String, std::io::Error> {
let file_extension = match typ {
crate::types::CoverArtTypes::PngExtension => {
String::from(crate::constants::file_extensions::image::PNGEXTENSION)

9
src/song.rs
View File

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