diff --git a/desktop/pages/store/index.vue b/desktop/pages/store/index.vue index 02446b26..4369b873 100644 --- a/desktop/pages/store/index.vue +++ b/desktop/pages/store/index.vue @@ -13,7 +13,7 @@ import { invoke } from "@tauri-apps/api/core"; async function requestGame() { console.log("Requested game from FE"); - await invoke("start_game_download", { gameId: "123", gameVersion: "1.2.3", maxThreads: 4 }); + await invoke("start_game_download", { gameId: "94b8ac10-a6fc-4a94-b519-e6df78018e26", gameVersion: "1.11.2", maxThreads: 4 }); } function requestGameWrapper() { console.log("Wrapper started"); @@ -23,4 +23,4 @@ function requestGameWrapper() { console.log(e); }) } - \ No newline at end of file + diff --git a/desktop/src-tauri/src/downloads/game_download.rs b/desktop/src-tauri/src/downloads/game_download.rs index 159f38a7..6c2e3d72 100644 --- a/desktop/src-tauri/src/downloads/game_download.rs +++ b/desktop/src-tauri/src/downloads/game_download.rs @@ -95,19 +95,21 @@ impl GameDownload { let header = generate_authorization_header(); info!("Generating & sending client"); - let client = reqwest::blocking::Client::new(); + let client = reqwest::Client::new(); let response = client .get(manifest_url.to_string()) .header("Authorization", header) .send() + .await .unwrap(); info!("Got status"); if response.status() != 200 { + info!("Error status: {}", response.status()); return Err(GameDownloadError::StatusError(response.status().as_u16())); } - info!("{:?}", response.text()); + info!("{:?}", response.text().await.unwrap()); Ok(()) } @@ -142,9 +144,8 @@ pub async fn start_game_download( let tmp = download.clone(); //let manifest = &tmp.manifest; - let res = download.download_manifest().await; + download.download_manifest().await - res /* let Some(unlocked) = manifest else { return Err(GameDownloadError::ManifestDoesNotExist) }; let lock = unlocked.lock().unwrap();