From 7c680e8d2d3abc78005ed81bed88fa78566a19be Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 22 Oct 2025 11:59:17 -0400 Subject: [PATCH] tsk-57: Refactoring --- src/main.rs | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/main.rs b/src/main.rs index 19bc2f8..51465b7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -306,11 +306,9 @@ async fn prep_song( // Process data here... match api::parsing::parse_response_into_bytes(response).await { Ok(song_bytes) => { - let (song_directory, song_filename) = - generate_song_queue_dir_and_filename().await; let song = icarus_models::song::Song { - directory: song_directory, - filename: song_filename, + directory: icarus_envy::environment::get_root_directory().await.value, + filename: icarus_models::song::generate_filename(icarus_models::types::MusicTypes::FlacExtension, true), data: song_bytes, ..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 pub async fn generate_coverart_queue_dir_and_filename(file_type: &str) -> (String, String) {