fix: assorted fixes

src-tauri/src/games/downloads/download_agent.rs

@@ -127,25 +127,17 @@ impl GameDownloadAgent {
     }
 
     fn download_manifest(&self) -> Result<(), ApplicationDownloadError> {
-        let base_url = DB.fetch_base_url();
-        let manifest_url = base_url
-            .join(
-                format!(
-                    "/api/v1/client/game/manifest?id={}&version={}",
-                    self.id,
-                    encode(&self.version)
-                )
-                .as_str(),
-            )
-            .unwrap();
-
         let header = generate_authorization_header();
         let client = reqwest::blocking::Client::new();
-        let response = client
-            .get(manifest_url.to_string())
-            .header("Authorization", header)
-            .send()
-            .unwrap();
+        let response = make_request(
+            &client,
+            &["/api/v1/client/game/manifest"],
+            &[("id", &self.id), ("version", &self.version)],
+            |f| f.header("Authorization", header),
+        )
+        .map_err(|e| ApplicationDownloadError::Communication(e))?
+        .send()
+        .map_err(|e| ApplicationDownloadError::Communication(e.into()))?;
 
         if response.status() != 200 {
             return Err(ApplicationDownloadError::Communication(
@@ -266,9 +258,10 @@ impl GameDownloadAgent {
 
                 let progress = self.progress.get(index);
                 let progress_handle = ProgressHandle::new(progress, self.progress.clone());
+
                 // If we've done this one already, skip it
                 if self.completed_contexts.lock().unwrap().contains(&index) {
-                    progress_handle.add(context.length);
+                    progress_handle.skip(context.length);
                     continue;
                 }
 
@@ -319,8 +312,10 @@ impl GameDownloadAgent {
         // If we're not out of contexts, we're not done, so we don't fire completed
         if completed_lock_len != contexts.len() {
             info!(
-                "download agent for {} exited without completing",
-                self.id.clone()
+                "download agent for {} exited without completing ({}/{})",
+                self.id.clone(),
+                completed_lock_len,
+                contexts.len(),
             );
             self.stored_manifest
                 .set_completed_contexts(self.completed_contexts.lock().unwrap().as_slice());
@@ -385,6 +380,7 @@ impl Downloadable for GameDownloadAgent {
         .unwrap();
     }
 
+    // TODO: fix this function. It doesn't restart the download properly, nor does it reset the state properly
     fn on_incomplete(&self, app_handle: &tauri::AppHandle) {
         let meta = self.metadata();
         *self.status.lock().unwrap() = DownloadStatus::Queued;

src-tauri/src/games/downloads/download_logic.rs

@@ -133,7 +133,6 @@ pub fn download_game_chunk(
 
     if response.status() != 200 {
         let err = response.json().unwrap();
-        warn!("{:?}", err);
         return Err(ApplicationDownloadError::Communication(
             RemoteAccessError::InvalidResponse(err),
         ));

src-tauri/src/games/library.rs

@@ -53,6 +53,8 @@ pub struct QueueUpdateEventQueueData {
     pub meta: DownloadableMetadata,
     pub status: DownloadStatus,
     pub progress: f64,
+    pub current: usize,
+    pub max: usize,
 }
 
 #[derive(serde::Serialize, Clone)]
@@ -81,16 +83,13 @@ pub struct GameVersionOption {
 }
 
 pub fn fetch_library_logic(app: AppHandle) -> Result<Vec<Game>, RemoteAccessError> {
-    let base_url = DB.fetch_base_url();
-    let library_url = base_url.join("/api/v1/client/user/library")?;
-
     let header = generate_authorization_header();
 
     let client = reqwest::blocking::Client::new();
-    let response = client
-        .get(library_url.to_string())
-        .header("Authorization", header)
-        .send()?;
+    let response = make_request(&client, &["/api/v1/client/user/library"], &[], |f| {
+        f.header("Authorization", header)
+    })?
+    .send()?;
 
     if response.status() != 200 {
         let err = response.json().unwrap();
@@ -290,26 +289,23 @@ pub fn on_game_complete(
     app_handle: &AppHandle,
 ) -> Result<(), RemoteAccessError> {
     // Fetch game version information from remote
-    let base_url = DB.fetch_base_url();
     if meta.version.is_none() {
         return Err(RemoteAccessError::GameNotFound);
     }
 
-    let endpoint = base_url.join(
-        format!(
-            "/api/v1/client/metadata/version?id={}&version={}",
-            meta.id,
-            encode(meta.version.as_ref().unwrap())
-        )
-        .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/metadata/version"],
+        &[
+            ("id", &meta.id),
+            ("version", meta.version.as_ref().unwrap()),
+        ],
+        |f| f.header("Authorization", header),
+    )?
+    .send()?;
 
     let data: GameVersion = response.json()?;