Update repak

Cargo.toml

@@ -16,6 +16,7 @@ edition = "2021"
 anyhow = { version = "1.0.75", features = ["backtrace"] }
 patternsleuth = { git = "https://github.com/trumank/patternsleuth" }
 steamlocate = "2.0.0-alpha.0"
+repak = { git = "https://github.com/trumank/repak" }
 
 [package]
 name = "mint"
@@ -76,11 +77,8 @@ uasset_utils = { git = "https://github.com/trumank/uasset_utils" }
 unreal_asset = { git = "https://github.com/trumank/unrealmodding", branch = "patches" }
 url = "2.5.0"
 zip = { version = "0.6.6", default-features = false, features = ["aes-crypto", "deflate", "time"] }
+repak = { workspace = true, features = ["oodle", "oodle_loader"] }
 
-[target.'cfg(windows)'.dependencies]
-repak = { git = "https://github.com/trumank/repak", features = ["oodle"] }
-[target.'cfg(not(windows))'.dependencies]
-repak = { git = "https://github.com/trumank/repak" }
 [target.'cfg(target_env = "msvc")'.dependencies]
 hook = { path = "hook", artifact = "cdylib", optional = true, target = "x86_64-pc-windows-msvc"}
 [target.'cfg(not(target_env = "msvc"))'.dependencies]

mint_lib/Cargo.toml

@@ -9,3 +9,4 @@ edition.workspace = true
 [dependencies]
 anyhow.workspace = true
 steamlocate.workspace = true
+repak.workspace = true

src/integrate.rs

@@ -169,10 +169,12 @@ pub fn integrate<P: AsRef<Path>>(
         kind: IntegrationErrKind::Generic(e),
     })?;
     let mut fsd_pak_reader = BufReader::new(fsd_pak_file);
-    let fsd_pak = repak::PakReader::new_any(&mut fsd_pak_reader).map_err(|e| IntegrationErr {
-        mod_ctxt: None,
-        kind: IntegrationErrKind::Repak(e),
-    })?;
+    let fsd_pak = repak::PakBuilder::new()
+        .reader(&mut fsd_pak_reader)
+        .map_err(|e| IntegrationErr {
+            mod_ctxt: None,
+            kind: IntegrationErrKind::Repak(e),
+        })?;
 
     #[derive(Debug, Default)]
     struct Dir<'a> {
@@ -309,7 +311,7 @@ pub fn integrate<P: AsRef<Path>>(
         })?;
     }
 
-    let mut mod_pak = repak::PakWriter::new(
+    let mut mod_pak = repak::PakBuilder::new().writer(
         BufWriter::new(
             OpenOptions::new()
                 .write(true)
@@ -362,10 +364,13 @@ pub fn integrate<P: AsRef<Path>>(
                 kind: IntegrationErrKind::Generic(e),
             }
         })?;
-        let pak = repak::PakReader::new_any(&mut buf).map_err(|e| IntegrationErr {
-            mod_ctxt: Some(mod_info.clone()),
-            kind: IntegrationErrKind::Repak(e),
-        })?;
+        let pak = repak::PakBuilder::new()
+            .oodle(repak::oodle_loader::decompress)
+            .reader(&mut buf)
+            .map_err(|e| IntegrationErr {
+                mod_ctxt: Some(mod_info.clone()),
+                kind: IntegrationErrKind::Repak(e),
+            })?;
 
         let mount = Path::new(pak.mount_point());
 
@@ -466,10 +471,12 @@ pub fn integrate<P: AsRef<Path>>(
     patch_deferred(modding_tab_path, patch_modding_tab_item)?;
 
     let mut int_pak_reader = Cursor::new(include_bytes!("../assets/integration.pak"));
-    let int_pak = repak::PakReader::new_any(&mut int_pak_reader).map_err(|e| IntegrationErr {
-        mod_ctxt: None,
-        kind: IntegrationErrKind::Repak(e),
-    })?;
+    let int_pak = repak::PakBuilder::new()
+        .reader(&mut int_pak_reader)
+        .map_err(|e| IntegrationErr {
+            mod_ctxt: None,
+            kind: IntegrationErrKind::Repak(e),
+        })?;
 
     let mount = Path::new(int_pak.mount_point());
     let files = int_pak.files();

src/lib.rs

@@ -89,7 +89,7 @@ pub fn write_file<P: AsRef<Path>, C: AsRef<[u8]>>(path: P, data: C) -> Result<()
 
 pub fn is_drg_pak<P: AsRef<Path>>(path: P) -> Result<()> {
     let mut reader = std::io::BufReader::new(open_file(path)?);
-    let pak = repak::PakReader::new_any(&mut reader)?;
+    let pak = repak::PakBuilder::new().reader(&mut reader)?;
     pak.get("FSD/FSD.uproject", &mut reader)?;
     Ok(())
 }

src/mod_lints/mod.rs

@@ -96,7 +96,9 @@ impl LintCtxt {
             }
 
             let mut first_pak_read_seek = individual_pak_readers.remove(0);
-            let pak_reader = repak::PakReader::new_any(&mut first_pak_read_seek)?;
+            let pak_reader = repak::PakBuilder::new()
+                .oodle(repak::oodle_loader::decompress)
+                .reader(&mut first_pak_read_seek)?;
             f(mod_spec.clone(), &mut first_pak_read_seek, &pak_reader)?
         }
 

src/mod_lints/unmodified_game_assets.rs

@@ -29,7 +29,7 @@ impl Lint for UnmodifiedGameAssetsLint {
         // Adapted from
         // <https://github.com/trumank/repak/blob/a006d9ed6f021687a87b8b2ff9d66083d019824c/repak_cli/src/main.rs#L217>.
         let mut reader = BufReader::new(open_file(game_pak_path)?);
-        let pak = repak::PakReader::new_any(&mut reader)?;
+        let pak = repak::PakBuilder::new().reader(&mut reader)?;
 
         let mount_point = PathBuf::from(pak.mount_point());