From 409cc3e29f7f6622a604b719a9dfde52d35c1f81 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 30 Aug 2025 13:08:21 -0400 Subject: [PATCH 1/3] Removed old upload method --- src/syncers/upload.rs | 70 ------------------------------------------- 1 file changed, 70 deletions(-) diff --git a/src/syncers/upload.rs b/src/syncers/upload.rs index a0b6ea8..0ecdf53 100644 --- a/src/syncers/upload.rs +++ b/src/syncers/upload.rs @@ -38,45 +38,6 @@ mod response { } impl Upload { - pub async fn upload_song_with_metadata( - &mut self, - token: &icarus_models::token::AccessToken, - song: &icarus_models::song::Song, - cover: &icarus_models::coverart::CoverArt, - ) -> Result { - self.api.endpoint = String::from("song/data/upload/with/data"); - let url = syncers::common::retrieve_url(&self.api, false, &uuid::Uuid::nil()); - let access_token = token.bearer_token(); - - if url.is_empty() { - println!("Url is empty"); - } - - println!("Url: {url}"); - println!("Token: {access_token}"); - println!("Path: {:?}", song.song_path()); - - let mut headers = reqwest::header::HeaderMap::new(); - headers.insert( - reqwest::header::AUTHORIZATION, - HeaderValue::from_str(&access_token.clone()).unwrap(), - ); - headers.insert(reqwest::header::ACCEPT, HeaderValue::from_static("*/*")); - - let form = self.init_form(song, cover); - let client = reqwest::Client::builder().build().unwrap(); - match client - .post(url) - .headers(headers) - .multipart(form) - .send() - .await - { - Ok(r) => Ok(r), - Err(err) => Err(err), - } - } - pub async fn queue_song( &self, token: &icarus_models::token::AccessToken, @@ -332,37 +293,6 @@ impl Upload { } } - fn init_form( - &self, - song: &icarus_models::song::Song, - cover: &icarus_models::coverart::CoverArt, - ) -> reqwest::multipart::Form { - let songpath = song.song_path().unwrap_or_default(); - let coverpath = cover.path.clone(); - println!("Cover path: {coverpath:?}"); - let song_detail = song.to_metadata_json(true).unwrap_or_default(); - - println!("\n{song_detail}\n"); - - let mut song_filename = String::from("audio"); - song_filename += icarus_models::constants::file_extensions::audio::DEFAULTMUSICEXTENSION; - let mut cover_filename = String::from("cover"); - cover_filename += icarus_models::constants::file_extensions::image::JPGEXTENSION; - - reqwest::multipart::Form::new() - .part( - "file", - reqwest::multipart::Part::bytes(std::fs::read(songpath).unwrap()) - .file_name(song_filename), - ) - .part( - "cover", - reqwest::multipart::Part::bytes(std::fs::read(coverpath).unwrap()) - .file_name(cover_filename), - ) - .text("metadata", song_detail) - } - pub fn set_api(&mut self, host: &str) { let api = models::api::Api { url: host.to_owned(), -- 2.47.3 From de797d97f3514dacb4714bd0e02fdcfa30d1c0af Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 30 Aug 2025 13:09:53 -0400 Subject: [PATCH 2/3] Removed upload commit action --- src/managers/commit_manager.rs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 71e82b1..94d7e12 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -22,7 +22,6 @@ enum ActionValues { DeleteAct, DownloadAct, RetrieveAct, - UploadAct, UploadSongWithMetadata, None, } @@ -101,7 +100,6 @@ impl CommitManager { ActionValues::DeleteAct => self.delete_song().await, ActionValues::DownloadAct => self.download_song().await, ActionValues::RetrieveAct => self.retrieve_object().await, - ActionValues::UploadAct => self.upload_song(), ActionValues::UploadSongWithMetadata => self.upload_song_with_metadata().await, _ => { println!("Nothing good here"); @@ -127,7 +125,6 @@ impl CommitManager { let actions: HashMap = HashMap::from([ ("download".to_string(), ActionValues::DownloadAct), ("download".to_string(), ActionValues::DownloadAct), - ("upload".to_string(), ActionValues::UploadAct), ( "upload-meta".to_string(), ActionValues::UploadSongWithMetadata, @@ -266,12 +263,6 @@ impl CommitManager { } } - // TODO: Remove at some point - fn upload_song(&self) { - println!("Deleting song"); - panic!("Not supported"); - } - async fn parse_token(&self, api: &models::api::Api) -> icarus_models::token::AccessToken { println!("Fetching token"); -- 2.47.3 From 2be11a8f9932da15b30065680142e7d45c10cb53 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 30 Aug 2025 13:10:22 -0400 Subject: [PATCH 3/3] Version bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f3df95b..c2a1ecf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -479,7 +479,7 @@ dependencies = [ [[package]] name = "icarus-dm" -version = "0.6.8" +version = "0.6.9" dependencies = [ "futures", "http", diff --git a/Cargo.toml b/Cargo.toml index 4a06ac9..fe38f3f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus-dm" -version = "0.6.8" +version = "0.6.9" rust-version = "1.88" edition = "2024" -- 2.47.3