From 9d998938b27093141bbe77e3bbbda7adbac76ac6 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Thu, 28 Aug 2025 12:38:25 -0400 Subject: [PATCH] Renaming queue_song function --- src/managers/commit_manager.rs | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 1971d41..92c4940 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -36,6 +36,13 @@ enum En { Other, } +#[derive(Debug)] +struct UploadSongMembers { + pub song: icarus_models::song::Song, + pub coverart: icarus_models::coverart::CoverArt, + pub token: icarus_models::token::AccessToken, +} + pub fn retrieve_song( album: &icarus_models::album::collection::Album, track: i32, @@ -378,7 +385,13 @@ impl CommitManager { cover_art.data = cover_art.to_data().unwrap(); - match self.queue_song(&token, &s).await { + let members = UploadSongMembers { + song: s, + coverart: cover_art, + token: token + }; + + match self.upload_song_process(&members).await { Ok(_) => Ok(()), Err(err) => Err(err), } @@ -398,15 +411,19 @@ impl CommitManager { } } - async fn queue_song( + async fn upload_song_process( &self, - token: &icarus_models::token::AccessToken, - song: &icarus_models::song::Song, + // token: &icarus_models::token::AccessToken, + // song: &icarus_models::song::Song, + data: &UploadSongMembers ) -> Result<()> { let mut up = syncers::upload::Upload::default(); let host = self.ica_action.retrieve_flag_value(&String::from("-h")); up.set_api(&host); + let token = &data.token; + let song = &data.song; + let mut queued_song_id = uuid::Uuid::nil(); println!("Queueing song"); @@ -417,6 +434,7 @@ impl CommitManager { } Err(err) => { eprintln!("Error: {err:?}"); + return Err(std::io::Error::other(err.to_string())); } }