From 7c680e8d2d3abc78005ed81bed88fa78566a19be Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 22 Oct 2025 11:59:17 -0400 Subject: [PATCH 1/4] 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) { -- 2.43.0 From 5e0117f020205418d4959ff88970d1e041feeef4 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 22 Oct 2025 12:03:05 -0400 Subject: [PATCH 2/4] tsk-57: Minor change --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 51465b7..23ad3e1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -409,7 +409,7 @@ pub async fn generate_coverart_queue_dir_and_filename(file_type: &str) -> (Strin let some_chars: String = String::from("abcdefghij0123456789"); let mut rng = rand::rng(); - for _i in 0..filename_len { + for _ in 0..filename_len { let random_number: i32 = rng.random_range(0..=19); let index = random_number as usize; let rando_char = some_chars.chars().nth(index); -- 2.43.0 From efbd1b16b6dbe48eaa9c80b9bb7bdc532343b885 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 22 Oct 2025 12:10:15 -0400 Subject: [PATCH 3/4] tsk-57: Code formatting --- src/main.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index 23ad3e1..b83e0f7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -308,7 +308,10 @@ async fn prep_song( Ok(song_bytes) => { let song = icarus_models::song::Song { directory: icarus_envy::environment::get_root_directory().await.value, - filename: icarus_models::song::generate_filename(icarus_models::types::MusicTypes::FlacExtension, true), + filename: icarus_models::song::generate_filename( + icarus_models::types::MusicTypes::FlacExtension, + true, + ), data: song_bytes, ..Default::default() }; @@ -398,7 +401,6 @@ async fn prep_song( } } - // TODO: Consider having something like this in icarus_models pub async fn generate_coverart_queue_dir_and_filename(file_type: &str) -> (String, String) { use rand::Rng; -- 2.43.0 From fb0ceef5cd8f4c1cc9bce13d40bc0206a01ae023 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 22 Oct 2025 12:10:27 -0400 Subject: [PATCH 4/4] tsk-57: Version bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f78343e..9aeaaf1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1322,7 +1322,7 @@ dependencies = [ [[package]] name = "songparser" -version = "0.4.4" +version = "0.4.5" dependencies = [ "futures", "icarus_envy", diff --git a/Cargo.toml b/Cargo.toml index 50c4c38..94f4ddc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "songparser" -version = "0.4.4" +version = "0.4.5" edition = "2024" rust-version = "1.90" -- 2.43.0