diff --git a/src-tauri/src/downloads/game_download.rs b/src-tauri/src/downloads/game_download.rs index 1149f61..867017d 100644 --- a/src-tauri/src/downloads/game_download.rs +++ b/src-tauri/src/downloads/game_download.rs @@ -8,6 +8,7 @@ use versions::Version; use crate::{AppState, DB}; use crate::auth::generate_authorization_header; use crate::db::DatabaseImpls; +use crate::downloads::manifest::DropManifest; use crate::downloads::progress::ProgressChecker; #[derive(Serialize, Deserialize)] @@ -78,7 +79,6 @@ impl GameDownload { return Err(GameDownloadError::ManifestAlreadyExists); } - info!("Getting url components"); let base_url = DB.fetch_base_url(); let manifest_url = base_url .join( @@ -91,7 +91,6 @@ impl GameDownload { ) .unwrap(); - info!("Generating authorization header"); let header = generate_authorization_header(); info!("Generating & sending client"); @@ -103,13 +102,14 @@ impl GameDownload { .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().await.unwrap()); + //info!("{}", response.text().await.unwrap()); + + info!("Parsed manifest: {:?}", response.json::().await.unwrap()); Ok(()) } diff --git a/src-tauri/src/downloads/manifest.rs b/src-tauri/src/downloads/manifest.rs index 29727eb..eb7a498 100644 --- a/src-tauri/src/downloads/manifest.rs +++ b/src-tauri/src/downloads/manifest.rs @@ -1,11 +1,11 @@ -pub(crate) struct DropManifest { +use std::collections::HashMap; +use serde::{Deserialize, Serialize}; -} +pub type DropManifest = HashMap; +#[derive(Serialize, Deserialize, Debug, Clone, Ord, PartialOrd, Eq, PartialEq)] pub struct DropChunk { permissions: usize, ids: Vec, checksums: Vec, - lengths: Vec -} - -type Manifest = (DropManifest, DropChunk); \ No newline at end of file + lengths: Vec +} \ No newline at end of file