From c2f54c1dbca0ef79fca659a7d2304a8c3dea4c58 Mon Sep 17 00:00:00 2001 From: DecDuck Date: Sun, 19 Jan 2025 16:15:43 +1100 Subject: [PATCH] fix: fix other metadata endpoints --- pages/library/[id]/index.vue | 1 + src-tauri/src/games/downloads/download_agent.rs | 3 +-- src-tauri/src/games/library.rs | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pages/library/[id]/index.vue b/pages/library/[id]/index.vue index 0fd8ae1..b056713 100644 --- a/pages/library/[id]/index.vue +++ b/pages/library/[id]/index.vue @@ -306,6 +306,7 @@ async function installFlow() { versionOptions.value = await invoke("fetch_game_verion_options", { gameId: game.value.id, }); + console.log(versionOptions.value); installDirs.value = await invoke("fetch_download_dir_stats"); } catch (error) { installError.value = (error as string).toString(); diff --git a/src-tauri/src/games/downloads/download_agent.rs b/src-tauri/src/games/downloads/download_agent.rs index dc6824b..d9b515c 100644 --- a/src-tauri/src/games/downloads/download_agent.rs +++ b/src-tauri/src/games/downloads/download_agent.rs @@ -136,7 +136,7 @@ impl GameDownloadAgent { let manifest_url = base_url .join( format!( - "/api/v1/client/game/manifest?id={}&version={}", + "/api/v1/client/metadata/manifest?id={}&version={}", self.id, encode(&self.version) ) @@ -308,7 +308,6 @@ impl GameDownloadAgent { sender.send(DownloadManagerSignal::Error(e)).unwrap(); } } - info!("Completed context id {}", index); }); } }); diff --git a/src-tauri/src/games/library.rs b/src-tauri/src/games/library.rs index 94d5cde..28b61ea 100644 --- a/src-tauri/src/games/library.rs +++ b/src-tauri/src/games/library.rs @@ -180,7 +180,7 @@ pub fn fetch_game_verion_options_logic( ) -> Result, RemoteAccessError> { let client = reqwest::blocking::Client::new(); - let response = make_request(&client, &["/api/v1/client/game/versions"], &[("id", &game_id)], |r| { + let response = make_request(&client, &["/api/v1/client/metadata/versions"], &[("id", &game_id)], |r| { r.header("Authorization", generate_authorization_header()) })?.send()?; @@ -189,10 +189,8 @@ pub fn fetch_game_verion_options_logic( warn!("{:?}", err); return Err(RemoteAccessError::InvalidResponse(err)); } - let text = response.text().unwrap(); - println!("JSON Text: {}", text); - let data: Vec = serde_json::from_str(&text).unwrap(); + let data: Vec = response.json()?; let state_lock = state.lock().unwrap(); let process_manager_lock = state_lock.process_manager.lock().unwrap(); @@ -295,7 +293,7 @@ pub fn on_game_complete( let endpoint = base_url.join( format!( - "/api/v1/client/game/version?id={}&version={}", + "/api/v1/client/metadata/version?id={}&version={}", meta.id, encode(meta.version.as_ref().unwrap()) )