Ryan/drop-app
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop-app.git synced 2025-11-19 03:01:26 +10:00
Code Issues Packages Projects Releases Wiki Activity

refactor(remote): Created separate function to generate requests

Browse Source
This commit is contained in:
quexeky
2025-01-19 15:09:35 +11:00
parent fd30b3e402
commit 9a184a8f35
5 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src-tauri/src/games/library.rs
View File

@ -16,6 +16,7 @@ use crate::error::remote_access_error::RemoteAccessError;
use crate::games::state::{GameStatusManager, GameStatusWithTransient};
use crate::process::process_manager::Platform;
use crate::remote::auth::generate_authorization_header;
use crate::remote::requests::make_request;
use crate::{AppState, DB};
#[derive(serde::Serialize)]
@ -66,7 +67,7 @@ pub struct StatsUpdateEvent {
}
// Game version with some fields missing and size information
#[derive(serde::Deserialize, serde::Serialize)]
#[derive(serde::Deserialize, serde::Serialize, Debug)]
#[serde(rename_all = "camelCase")]
pub struct GameVersionOption {
version_index: usize,
@ -137,17 +138,10 @@ pub fn fetch_game_logic(
return Ok(data);
}
let base_url = DB.fetch_base_url();
let endpoint = base_url.join(&format!("/api/v1/game/{}", id))?;
let header = generate_authorization_header();
let client = reqwest::blocking::Client::new();
let response = client
.get(endpoint.to_string())
.header("Authorization", header)
.send()?;
let response = make_request(&client, &["/api/v1/game/", &id],&[], |r| {
r.header("Authorization", generate_authorization_header())
})?.send()?;
if response.status() == 404 {
return Err(RemoteAccessError::GameNotFound);
@ -184,25 +178,21 @@ pub fn fetch_game_verion_options_logic(
game_id: String,
state: tauri::State<'_, Mutex<AppState>>,
) -> Result<Vec<GameVersionOption>, RemoteAccessError> {
let base_url = DB.fetch_base_url();
let endpoint =
base_url.join(format!("/api/v1/client/game/versions?id={}", game_id).as_str())?;
let header = generate_authorization_header();
let client = reqwest::blocking::Client::new();
let response = client
.get(endpoint.to_string())
.header("Authorization", header)
.send()?;
let response = make_request(&client, &["/api/v1/client/game/versions"], &[("id", &game_id)], |r| {
r.header("Authorization", generate_authorization_header())
})?.send()?;
if response.status() != 200 {
let err = response.json().unwrap();
warn!("{:?}", err);
return Err(RemoteAccessError::InvalidResponse(err));
}
let text = response.text().unwrap();
println!("JSON Text: {}", text);
let data: Vec<GameVersionOption> = response.json()?;
let data: Vec<GameVersionOption> = serde_json::from_str(&text).unwrap();
let state_lock = state.lock().unwrap();
let process_manager_lock = state_lock.process_manager.lock().unwrap();