From 3a6b2c5a53c558f94e702ac2c268c027b17cfed6 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 29 Oct 2025 13:51:08 -0400 Subject: [PATCH] tsk-86: Build fix --- src/coverart.rs | 10 +++++----- src/song.rs | 15 ++++++--------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/coverart.rs b/src/coverart.rs index c681291..2c37a77 100644 --- a/src/coverart.rs +++ b/src/coverart.rs @@ -86,20 +86,20 @@ impl CoverArt { /// Generates filename for a CoverArt pub fn generate_filename( - typ: crate::types::CoverArtTypes, + typ: crate::types::CoverArtType, randomize: bool, ) -> Result { let file_extension = match typ { - crate::types::CoverArtTypes::PngExtension => { + crate::types::CoverArtType::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) } - crate::types::CoverArtTypes::JpgExtension => { + crate::types::CoverArtType::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")); } }; diff --git a/src/song.rs b/src/song.rs index b333f7f..fb1c1a4 100644 --- a/src/song.rs +++ b/src/song.rs @@ -126,24 +126,21 @@ impl Song { } /// Generates a filename. In order to save a song to the filesystem -pub fn generate_filename( - typ: types::MusicTypes, - randomize: bool, -) -> Result { +pub fn generate_filename(typ: types::MusicType, randomize: bool) -> Result { let file_extension = match typ { - types::MusicTypes::DefaultMusicExtension => { + types::MusicType::DefaultMusicExtension => { String::from(constants::file_extensions::audio::DEFAULTMUSICEXTENSION) } - types::MusicTypes::WavExtension => { + types::MusicType::WavExtension => { String::from(constants::file_extensions::audio::WAVEXTENSION) } - types::MusicTypes::FlacExtension => { + types::MusicType::FlacExtension => { String::from(constants::file_extensions::audio::FLACEXTENSION) } - types::MusicTypes::MPThreeExtension => { + types::MusicType::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 {