From 638fbdfb58e7c47dfcc3ac92f59e1b1015021319 Mon Sep 17 00:00:00 2001
From: quexeky <git@quexeky.dev>
Date: Fri, 25 Oct 2024 14:56:49 +1100
Subject: [PATCH] copy direct to disk

---
 desktop/pages/store/index.vue                       |  5 +++--
 desktop/src-tauri/src/downloads/download_logic.rs   |  6 ++++--
 desktop/src-tauri/src/downloads/download_manager.rs | 12 +++++++-----
 desktop/src-tauri/src/downloads/progress.rs         |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/desktop/pages/store/index.vue b/desktop/pages/store/index.vue
index 486b796d..bb2bedb9 100644
--- a/desktop/pages/store/index.vue
+++ b/desktop/pages/store/index.vue
@@ -6,7 +6,7 @@
     Load Data
   </button>
   <input placeholder="GAME ID" v-model="gameId" />
-  <input placehodler="VERSION NAME" v-model="versionName" />
+  <input placeholder="VERSION NAME" v-model="versionName" />
   <button
     class="w-full rounded-md p-4 bg-blue-600 text-white"
     @click="requestGameWrapper"
@@ -24,8 +24,9 @@ async function requestGame() {
   await invoke("start_game_download", {
     gameId: gameId.value,
     gameVersion: versionName.value,
-    maxThreads: 4,
+    maxThreads: 12,
   });
+  console.log("Requested game from FE");
 }
 function requestGameWrapper() {
   console.log("Wrapper started");
diff --git a/desktop/src-tauri/src/downloads/download_logic.rs b/desktop/src-tauri/src/downloads/download_logic.rs
index cf999bf4..d8e2ddb9 100644
--- a/desktop/src-tauri/src/downloads/download_logic.rs
+++ b/desktop/src-tauri/src/downloads/download_logic.rs
@@ -37,7 +37,9 @@ pub fn download_game_chunk(ctx: DropDownloadContext) {
             .expect("Failed to seek to file offset");
     }
 
-    let mut stream = BufWriter::with_capacity(1024 * 1024, file);
+    // let mut stream = BufWriter::with_capacity(1024, file);
 
-    response.copy_to(&mut stream).unwrap();
+    response.copy_to(&mut file).unwrap();
+
+    // stream.flush().unwrap();
 }
diff --git a/desktop/src-tauri/src/downloads/download_manager.rs b/desktop/src-tauri/src/downloads/download_manager.rs
index 0d0662ac..44521251 100644
--- a/desktop/src-tauri/src/downloads/download_manager.rs
+++ b/desktop/src-tauri/src/downloads/download_manager.rs
@@ -11,6 +11,7 @@ use std::fs::{create_dir_all, File};
 use std::path::Path;
 use std::sync::atomic::AtomicUsize;
 use std::sync::{Arc, Mutex};
+use std::time::Instant;
 
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -138,6 +139,7 @@ pub fn generate_job_contexts(
     let mut contexts = Vec::new();
     let base_path = DATA_ROOT_DIR.join("games").join(game_id.clone()).clone();
     create_dir_all(base_path.clone()).unwrap();
+    info!("Generating contexts");
     for (raw_path, chunk) in manifest {
         let path = base_path.join(Path::new(raw_path));
 
@@ -147,7 +149,7 @@ pub fn generate_job_contexts(
         let file = File::create(path.clone()).unwrap();
         let mut running_offset = 0;
 
-        for i in 0..chunk.ids.len() {
+        for (i, length) in chunk.lengths.iter().enumerate() {
             contexts.push(DropDownloadContext {
                 file_name: raw_path.to_string(),
                 version: version.to_string(),
@@ -156,11 +158,12 @@ pub fn generate_job_contexts(
                 game_id: game_id.to_string(),
                 path: path.clone(),
             });
-            running_offset += chunk.lengths[i] as u64;
+            running_offset += *length as u64;
         }
 
-        fallocate(file, FallocateFlags::empty(), 0, running_offset);
+        fallocate(file, FallocateFlags::empty(), 0, running_offset).unwrap();
     }
+    info!("Finished generating");
     contexts
 }
 
@@ -188,8 +191,7 @@ pub async fn start_game_download(
     let contexts = generate_job_contexts(&local_manifest, game_version.clone(), game_id);
 
     download_manager
-        .begin_download(max_threads, contexts)
-        .unwrap();
+        .begin_download(max_threads, contexts)?;
 
     Ok(())
 }
diff --git a/desktop/src-tauri/src/downloads/progress.rs b/desktop/src-tauri/src/downloads/progress.rs
index 6194a90b..cd36303a 100644
--- a/desktop/src-tauri/src/downloads/progress.rs
+++ b/desktop/src-tauri/src/downloads/progress.rs
@@ -32,7 +32,7 @@ where T: Send + Sync
     }
     pub fn run_contexts_parallel(&self, contexts: Vec<T>, max_threads: usize) {
         let threads = ThreadPoolBuilder::new()
-            // If max_threads == 0, then the limit will be determined 
+            // If max_threads == 0, then the limit will be determined
             // by Rayon's internal RAYON_NUM_THREADS
             .num_threads(max_threads)
             .build()