Various fixes

Author: ByteZ1337

src/command/patch/assets_patcher.rs

@@ -5,8 +5,12 @@ use walkdir::WalkDir;
 use crate::command::patch::xml_patcher;
 
 pub fn patch_assets(patch: &PathBuf, unpacked: &PathBuf, temp_dir: &PathBuf) -> anyhow::Result<PathBuf> {
+    println!("Patching assets..");
     let patched_assets = temp_dir.join("patched");
+    std::fs::create_dir_all(&patched_assets)
+        .context("Failed to create patched assets directory")?;
 
+    // copy over original files and if they have a patch, apply the patch
     for file in WalkDir::new(unpacked) {
         let file = file.map_err(|e| anyhow::anyhow!("Failed to walk directory: {}", e))?;
         let rel_path = file.path().strip_prefix(unpacked)
@@ -28,7 +32,7 @@ pub fn patch_assets(patch: &PathBuf, unpacked: &PathBuf, temp_dir: &PathBuf) ->
         // check if file exists in patch directory
         let patch_file = patch.join(rel_path);
         if !patch_file.exists() { // patch file doesn't exist, so copy over the original
-            copy_file(&file, rel_path, &patched_assets)?;
+            copy_file(&file.path(), rel_path, &patched_assets)?;
             continue;
         }
 
@@ -38,34 +42,63 @@ pub fn patch_assets(patch: &PathBuf, unpacked: &PathBuf, temp_dir: &PathBuf) ->
         // copy over the patch file if it's a png, csv or txt file
         // TODO: csv and txt patching
         if ext == OsStr::new("png") || ext == OsStr::new("csv") || ext == OsStr::new("txt") {
-            copy_file(&file, rel_path, &patched_assets)?;
-        } else if ext == OsStr::new("xml") || ext == OsStr::new("xml") {
+            println!("Copying patch file for: {}", rel_path.display());
+            copy_file(&patch_file.as_path(), rel_path, &patched_assets)?;
+        } else if ext == OsStr::new("xml") || ext == OsStr::new("fnt") {
+            println!("Patching xml file: {}", rel_path.display());
             patch_xml(&file, &patch_file, rel_path, &patched_assets)?;
         } else {
             anyhow::bail!("Unsupported file type: {}", patch_file.display());
         }
 
     }
 
+    // Loop over any files newly added with the patch
+    for file in WalkDir::new(patch) {
+        let file = file.map_err(|e| anyhow::anyhow!("Failed to walk directory: {}", e))?;
+        let rel_path = file.path().strip_prefix(patch)
+            .context("Failed to strip prefix")?;
+        let target = patched_assets.join(rel_path);
+        let file_type = file.file_type();
+
+        // if file is a directory, just create it in the patched assets directory
+        if file_type.is_dir() && !target.exists() {
+            std::fs::create_dir_all(&target).context("Failed to create directory")?;
+            continue;
+        }
+
+        // skip symlinks etc.
+        if !file_type.is_file() {
+            continue;
+        }
+
+        // copy over the file if it doesn't exist already
+        if !target.exists() {
+            println!("Adding new file: {}", rel_path.display());
+            copy_file(&file.path(), rel_path, &patched_assets)?;
+        }
+    }
+
     return Ok(patched_assets);
 }
 
-/// Copies a file from the unpacked assets to the patched assets directory and makes sure the directory structure is created
-fn copy_file(file: &walkdir::DirEntry, rel_path: &Path, patched_assets: &PathBuf) -> anyhow::Result<()> {
+/// Copies a file from one of the input directories to the patched assets directory and makes sure
+/// the directory structure is created
+fn copy_file(file: &Path, rel_path: &Path, patched_assets: &PathBuf) -> anyhow::Result<()> {
     let output = patched_assets.join(rel_path);
     if let Some(parent) = output.parent() {
         std::fs::create_dir_all(parent).context("Failed to create directory")?;
     }
-    std::fs::copy(file.path(), &output).context("Failed to copy file")?;
+    std::fs::copy(file, &output).context("Failed to copy file")?;
     Ok(())
 }
 
 /// Patches an XML file using the given patch file and writes the output to the patched assets directory
-fn patch_xml(file: &walkdir::DirEntry, patch_file: &PathBuf, rel_path: &Path, patched_assets: &PathBuf) -> anyhow::Result<()> {
+fn patch_xml(original: &walkdir::DirEntry, patch_file: &PathBuf, rel_path: &Path, patched_assets: &PathBuf) -> anyhow::Result<()> {
     let output = patched_assets.join(rel_path);
     if let Some(parent) = output.parent() {
         std::fs::create_dir_all(parent)
             .context("Failed to create directory")?;
     }
-    xml_patcher::patch(file.path(), patch_file, &output)
+    xml_patcher::patch(original.path(), patch_file, &output)
 }

src/command/patch/mod.rs

@@ -18,18 +18,19 @@ pub fn patch(args: &NewArgs, patch: &PathBuf, locale_mode: &I18nCompatMode) -> a
         anyhow::bail!("Patch directory {:?} does not exist", patch);
     }
 
-    let game_files = prepare_game_files(&patch)?;
+    let game_files = prepare_game_files(&args.game)?;
 
     let temp_dir = create_temp_dir();
+    println!("Using temp directory: {}", temp_dir.display());
     let temp_unpacked = temp_dir.join("unpacked");
     std::fs::create_dir_all(&temp_unpacked)
         .context("Failed to create temp directory")?;
 
-    unpack::unpack_dat(args, &game_files.assets, &temp_unpacked)?;
+    unpack::unpack_assets(args, &game_files.assets, &temp_unpacked)?;
 
     patch_assets(patch, &temp_unpacked, &temp_dir)?;
 
-    unimplemented!()
+    Ok(())
 }
 
 
@@ -41,13 +42,20 @@ pub struct GameFiles {
 }
 
 fn prepare_game_files(game_dir: &PathBuf) -> anyhow::Result<GameFiles> {
+    // if game_dir is not already PapersPlease_Data, append it
+    let game_dir = if game_dir.ends_with("PapersPlease_Data") {
+        game_dir.clone()
+    } else {
+        game_dir.join("PapersPlease_Data")
+    };
+
     if !game_dir.is_dir() {
         anyhow::bail!("Game directory {:?} does not exist", game_dir);
     }
 
-    let assets = prepare_file(game_dir, "sharedassets0.assets")?;
-    let resources = prepare_file(game_dir, "sharedassets0.resource")?;
-    let locale = prepare_file(game_dir, "StreamingAssets/loc/en.zip")?;
+    let assets = prepare_file(&game_dir, "sharedassets0.assets")?;
+    let resources = prepare_file(&game_dir, "sharedassets0.resource")?;
+    let locale = prepare_file(&game_dir, "StreamingAssets/loc/en.zip")?;
 
     Ok(GameFiles { assets, resources, locale })
 }

src/command/patch/xml_patcher.rs

@@ -27,8 +27,8 @@ pub fn patch(original: &Path, patch: &PathBuf, output: &PathBuf) -> anyhow::Resu
         merge_to(&mut writer, first, &mut patch_index)
             .with_context(|| format!("Failed to patch {} with {}", original.display(), patch.display()))?;
     }
-
-    unimplemented!()
+    
+    Ok(())
 }
 
 type NodeIndex<'doc, 'input> = HashMap<String, HashMap<String, Node<'doc, 'input>>>;

src/main.rs

@@ -59,7 +59,7 @@ enum Command {
         output: PathBuf,
 
         /// How should the tool handle localized assets.
-        #[arg(long, default_value = "None")]
+        #[arg(long, default_value = "none")]
         i18n: I18nCompatMode,
     },
     /// Unpack assets from an Art.dat or unity asset bundle.
@@ -79,7 +79,7 @@ enum Command {
         patch: PathBuf,
 
         /// How should the tool handle localized assets.
-        #[arg(long, default_value = "None")]
+        #[arg(long, default_value = "none")]
         i18n: I18nCompatMode,
     },
 }