tsk-57: Refactoring

This commit is contained in:
2025-10-22 11:59:17 -04:00
parent 5636f82b29
commit 7c680e8d2d

View File

@@ -306,11 +306,9 @@ async fn prep_song(
// Process data here... // Process data here...
match api::parsing::parse_response_into_bytes(response).await { match api::parsing::parse_response_into_bytes(response).await {
Ok(song_bytes) => { Ok(song_bytes) => {
let (song_directory, song_filename) =
generate_song_queue_dir_and_filename().await;
let song = icarus_models::song::Song { let song = icarus_models::song::Song {
directory: song_directory, directory: icarus_envy::environment::get_root_directory().await.value,
filename: song_filename, filename: icarus_models::song::generate_filename(icarus_models::types::MusicTypes::FlacExtension, true),
data: song_bytes, data: song_bytes,
..Default::default() ..Default::default()
}; };
@@ -400,18 +398,6 @@ async fn prep_song(
} }
} }
// TODO: Consider having something like this in icarus_models
pub async fn generate_song_queue_dir_and_filename() -> (String, String) {
let mut song = icarus_models::song::Song::default();
song.filename = icarus_models::song::generate_filename(
icarus_models::types::MusicTypes::FlacExtension,
true,
);
song.directory = icarus_envy::environment::get_root_directory().await.value;
(song.directory, song.filename)
}
// TODO: Consider having something like this in icarus_models // TODO: Consider having something like this in icarus_models
pub async fn generate_coverart_queue_dir_and_filename(file_type: &str) -> (String, String) { pub async fn generate_coverart_queue_dir_and_filename(file_type: &str) -> (String, String) {