pre-read cams (#12)

* dev: pre-read cams

* sourcepak 0.2.0

* add padding to error for long errors

* more descriptive load progress

README.md

@@ -25,4 +25,4 @@ To build only the executable, instead run `yarn tauri build -b none`.
 ## Details:
 Uses [sourcepak](https://github.com/barnabwhy/sourcepak-rs) to unpack files from VPKs.
 
-sourcepak version: [v0.1.1](https://crates.io/crates/sourcepak/0.1.1)
+sourcepak version: [v0.2.0](https://crates.io/crates/sourcepak/0.2.0)

src-tauri/Cargo.toml

@@ -14,7 +14,7 @@ tauri-build = { version = "2.0.0-beta", features = [] }
 tauri = { version = "2.0.0-beta.22", features = ["linux-ipc-protocol"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-sourcepak = { version = "0.1.1", features = ["respawn"] }
+sourcepak = { version = "0.2.0", features = ["respawn"] }
 urlencoding = "2.1.3"
 rayon = "1.8.1"
 tauri-plugin-dialog = "2.0.0-beta.9"

src-tauri/src/main.rs

@@ -80,7 +80,11 @@ async fn select_vpk(window: Window) -> Option<String> {
 }
 
 #[tauri::command]
-async fn load_vpk(state: tauri::State<'_, AppState>, vpk_path: String) -> Result<(), String> {
+async fn load_vpk(
+    state: tauri::State<'_, AppState>,
+    window: tauri::Window,
+    vpk_path: String,
+) -> Result<(), String> {
     let mut file = File::open(&vpk_path).expect("Failed to open file");
 
     let pak_format = detect_pak_format(&mut file);
@@ -92,11 +96,18 @@ async fn load_vpk(state: tauri::State<'_, AppState>, vpk_path: String) -> Result
             let vpk = VPKRespawn::try_from(&mut file);
 
             match vpk {
-                Ok(vpk) => {
+                Ok(mut vpk) => {
                     let mut state_guard = state.inner.lock().unwrap();
 
                     println!("VPK loaded: {}", &vpk_path);
 
+                    let archive_path = vpk_archive_path(&vpk_path);
+                    let vpk_name = get_vpk_name(&vpk_path);
+                    println!("Attempting to read VPK CAM files from: {}", &archive_path);
+
+                    let _ = window.emit("load_step", "Reading CAM files...");
+                    vpk.read_all_cams(&archive_path, &vpk_name)?;
+
                     state_guard.vpk_path = Some(vpk_path);
                     state_guard.loaded_format = Some(PakFormat::VPKRespawn);
                     state_guard.revpk = Some(vpk);

src/components/Error.vue

@@ -23,6 +23,7 @@ const mainStore = useStore();
     height: 100%;
     grid-template-rows: 1fr auto 1fr 56px;
     line-height: 1.5;
+    padding: 2rem;
 }
 
 .error-text {

src/components/Loading.vue

@@ -1,10 +1,15 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import { useStore } from '../stores/main';
+import { listen } from '@tauri-apps/api/event';
 
 const mainStore = useStore();
 
 let step = ref("Parsing VPK directory tree...");
+
+listen<string>('load_step', (event) => {
+    step.value = event.payload;
+});
 </script>
 
 <template>