From 027eca5c38db1de2e0d5dcaa30c539715e126a80 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 30 Aug 2025 11:43:10 -0400 Subject: [PATCH 1/5] Got download functionality working --- src/managers/commit_manager.rs | 5 +++-- src/syncers/common.rs | 2 +- src/syncers/download.rs | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs index 713616f..a08c96f 100644 --- a/src/managers/commit_manager.rs +++ b/src/managers/commit_manager.rs @@ -196,6 +196,7 @@ impl CommitManager { let auth_api = prsr.retrieve_api(parsers::api_parser::APIType::Auth); let token = self.parse_token(&auth_api).await; println!("Message: {}", token.message); + let api = prsr.retrieve_api(parsers::api_parser::APIType::Main); let mut dwn_loader = syncers::download::Download { api: api.clone() }; @@ -203,8 +204,8 @@ impl CommitManager { id: song_id, ..Default::default() }; - let result_fut = dwn_loader.download_song(&token, &song); - match Runtime::new().unwrap().block_on(result_fut) { + + match dwn_loader.download_song(&token, &song).await { Ok(o) => { println!("Success"); let filename = String::from("audio") diff --git a/src/syncers/common.rs b/src/syncers/common.rs index 5d7eeb6..2bc1873 100644 --- a/src/syncers/common.rs +++ b/src/syncers/common.rs @@ -15,7 +15,7 @@ fn retrieve_url_reg(api: &models::api::Api) -> String { } fn retrieve_url_with_id(api: &models::api::Api, id: &uuid::Uuid) -> String { - let url = format!("{}/api/{}/{}/{}", api.url, api.version, api.endpoint, id); + let url = format!("{}api/{}/{}/{}", api.url, api.version, api.endpoint, id); url } diff --git a/src/syncers/download.rs b/src/syncers/download.rs index d994e3e..a69fabf 100644 --- a/src/syncers/download.rs +++ b/src/syncers/download.rs @@ -20,7 +20,7 @@ impl Download { token: &icarus_models::token::AccessToken, song: &icarus_models::song::Song, ) -> Result { - self.api.endpoint = String::from("song/data/download"); + self.api.endpoint = String::from("song/download"); let url = syncers::common::retrieve_url(&self.api, true, &song.id); let access_token = token.bearer_token(); @@ -36,8 +36,7 @@ impl Download { { Ok(rep) => match rep.status() { reqwest::StatusCode::OK => { - let data = rep.text(); - match data.await { + match rep.text().await { Ok(e) => Ok(e), Err(er) => Err(MyError::Other(er.to_string())), } -- 2.47.3 From 04d86c7f4f4a5011945459a885b09484fcc3219d Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 30 Aug 2025 11:44:39 -0400 Subject: [PATCH 2/5] Updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 375a3e8..996cbfc 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ The program has been built and can be executed by the binary file *icarus-dm*. F ### Downloading Song ```BASH -icarus-dm download -u spacecadet -p stellar40 -h https://icarus.com -b e8407fc6-edd2-44c1-993f-08dd7324d91a +icarus-dm download -u spacecadet -p stellar40 -h https://icarus.com -ha https://auth.icarus.com -b e8407fc6-edd2-44c1-993f-08dd7324d91a ``` ### Uploading Song with metadata -- 2.47.3 From afc36e4f8f2c8fceb003f8f6bcc285e6bad427ba Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 30 Aug 2025 11:44:48 -0400 Subject: [PATCH 3/5] Code formatting --- src/syncers/download.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/syncers/download.rs b/src/syncers/download.rs index a69fabf..f5da441 100644 --- a/src/syncers/download.rs +++ b/src/syncers/download.rs @@ -35,12 +35,10 @@ impl Download { .await { Ok(rep) => match rep.status() { - reqwest::StatusCode::OK => { - match rep.text().await { - Ok(e) => Ok(e), - Err(er) => Err(MyError::Other(er.to_string())), - } - } + reqwest::StatusCode::OK => match rep.text().await { + Ok(e) => Ok(e), + Err(er) => Err(MyError::Other(er.to_string())), + }, reqwest::StatusCode::UNAUTHORIZED => { Err(MyError::Other(String::from("Need to grab a new token"))) } -- 2.47.3 From 2c8d3af320ae7b9da434f004a7e362a296544294 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 30 Aug 2025 11:47:06 -0400 Subject: [PATCH 4/5] Updated help --- src/help.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/help.rs b/src/help.rs index 357d22f..fb6d2ce 100644 --- a/src/help.rs +++ b/src/help.rs @@ -12,7 +12,8 @@ pub fn print_help() { Required for all actions -u username -p password - -h host + -h api host + -ha auth api host Required for upload with metadata -s path of song -- 2.47.3 From b9a71ad540c691760363b725508b811de73b2ef9 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 30 Aug 2025 11:47:59 -0400 Subject: [PATCH 5/5] Version bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0667dfc..b8b6f27 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -479,7 +479,7 @@ dependencies = [ [[package]] name = "icarus-dm" -version = "0.6.2" +version = "0.6.6" dependencies = [ "futures", "http", diff --git a/Cargo.toml b/Cargo.toml index c83c7d8..4b42cd5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icarus-dm" -version = "0.6.2" +version = "0.6.6" rust-version = "1.88" edition = "2024" -- 2.47.3