Compare commits

...

2 Commits

Author SHA1 Message Date
5e0117f020 tsk-57: Minor change
Some checks failed
Rust Build / Check (pull_request) Successful in 43s
Rust Build / Test Suite (pull_request) Successful in 37s
Rust Build / Rustfmt (pull_request) Failing after 38s
Rust Build / Clippy (pull_request) Successful in 40s
Rust Build / build (pull_request) Successful in 50s
2025-10-22 12:03:05 -04:00
7c680e8d2d tsk-57: Refactoring 2025-10-22 11:59:17 -04:00

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) {
@@ -423,7 +409,7 @@ pub async fn generate_coverart_queue_dir_and_filename(file_type: &str) -> (Strin
let some_chars: String = String::from("abcdefghij0123456789"); let some_chars: String = String::from("abcdefghij0123456789");
let mut rng = rand::rng(); 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 random_number: i32 = rng.random_range(0..=19);
let index = random_number as usize; let index = random_number as usize;
let rando_char = some_chars.chars().nth(index); let rando_char = some_chars.chars().nth(index);