tsk-57: Refactoring
This commit is contained in:
18
src/main.rs
18
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) {
|
||||
|
Reference in New Issue
Block a user