From 027eca5c38db1de2e0d5dcaa30c539715e126a80 Mon Sep 17 00:00:00 2001
From: kdeng00 <kundeng00@pm.me>
Date: Sat, 30 Aug 2025 11:43:10 -0400
Subject: [PATCH] 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<String, MyError> {
-        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())),
                     }