From f80a50a724110804f8edf98b0ede6be295250294 Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Tue, 12 Sep 2023 10:08:40 +0200
Subject: [PATCH] Default to manifest 17 (#99)

* Default to manifest 17

* Oops

* Test with 16 in CI
---
 Cargo.toml                |  9 +++++++++
 src/main.rs               |  2 +-
 src/splat.rs              | 39 ++++++++++++++++++++++++++++-----------
 tests/compiles.rs         | 12 +++++++++++-
 tests/snapshots/xwin.snap |  2 +-
 5 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 8484eef..da4a9f5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -76,3 +76,12 @@ zip = { version = "0.6", default-features = false, features = ["deflate"] }
 [dev-dependencies]
 insta = "1.12"
 walkdir = "2.3"
+
+[profile.dev.package.insta]
+opt-level = 3
+
+[profile.dev.package.similar]
+opt-level = 3
+
+[profile.dev.package.sha2]
+opt-level = 3
diff --git a/src/main.rs b/src/main.rs
index d1fb04d..588acd8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -147,7 +147,7 @@ pub struct Args {
     #[arg(long, conflicts_with_all = &["manifest_version", "channel"])]
     manifest: Option<PathBuf>,
     /// The manifest version to retrieve
-    #[arg(long, default_value = "16")]
+    #[arg(long, default_value = "17")]
     manifest_version: String,
     /// The product channel to use.
     #[arg(long, default_value = "release")]
diff --git a/src/splat.rs b/src/splat.rs
index 4f01185..23ca389 100644
--- a/src/splat.rs
+++ b/src/splat.rs
@@ -618,7 +618,7 @@ pub(crate) fn finalize_splat(
 ) -> Result<(), Error> {
     let mut files: std::collections::HashMap<
         _,
-        _,
+        Header<'_>,
         std::hash::BuildHasherDefault<twox_hash::XxHash64>,
     > = Default::default();
 
@@ -627,18 +627,35 @@ pub(crate) fn finalize_splat(
         path: PathBuf,
     }
 
+    fn compare_hashes(existing: &Path, new: &PathBuf) -> anyhow::Result<()> {
+        use crate::util::Sha256;
+
+        let existing_hash = Sha256::digest(&std::fs::read(existing)?);
+        let new_hash = Sha256::digest(&std::fs::read(new)?);
+
+        anyhow::ensure!(
+            existing_hash == new_hash,
+            "2 files with same relative path were not equal: '{existing}' != '{new}'"
+        );
+
+        Ok(())
+    }
+
     for hdrs in &sdk_headers {
         for (k, v) in &hdrs.inner {
-            let existing = files.insert(
-                k,
-                Header {
-                    root: hdrs,
-                    path: v.clone(),
-                },
-            );
-
-            if let Some(existing) = existing {
-                panic!("already have {} matching {v}", existing.path);
+            if let Some(existing) = files.get(k) {
+                // We already have a file with the same path, if they're the same
+                // as each other it's fine, but if they differ we have an issue
+                compare_hashes(&existing.path, v)?;
+                tracing::debug!("skipped {v}, a matching path already exists");
+            } else {
+                files.insert(
+                    k,
+                    Header {
+                        root: hdrs,
+                        path: v.clone(),
+                    },
+                );
             }
         }
     }
diff --git a/tests/compiles.rs b/tests/compiles.rs
index 581dc55..f8a1d7b 100644
--- a/tests/compiles.rs
+++ b/tests/compiles.rs
@@ -11,7 +11,17 @@ fn verify_compiles() {
 
     let hidden = indicatif::ProgressBar::hidden();
 
-    let manifest = xwin::manifest::get_manifest(&ctx, "16", "release", hidden.clone()).unwrap();
+    // TODO: Bump to CI to 17 once github actions isn't using an ancient version,
+    // we could install in the action run, but not really worth it since I can
+    // test locally
+    let manifest_version = if std::env::var_os("CI").is_some() {
+        "16"
+    } else {
+        "17"
+    };
+
+    let manifest =
+        xwin::manifest::get_manifest(&ctx, manifest_version, "release", hidden.clone()).unwrap();
     let pkg_manifest =
         xwin::manifest::get_package_manifest(&ctx, &manifest, hidden.clone()).unwrap();
 
diff --git a/tests/snapshots/xwin.snap b/tests/snapshots/xwin.snap
index 353cbec..03baa2b 100644
--- a/tests/snapshots/xwin.snap
+++ b/tests/snapshots/xwin.snap
@@ -49,7 +49,7 @@ Options:
       --manifest-version <MANIFEST_VERSION>
           The manifest version to retrieve
           
-          [default: 16]
+          [default: 17]
 
       --channel <CHANNEL>
           The product channel to use