phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-07 09:33:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat(editor): add --diff-checksum for SHA256SUMS comparison

Browse source 
Compares two SHA256SUMS files (from --export-zone-checksum). Reports
added / removed / changed entries between two zone snapshots — much
faster than walking the filesystem to recompute hashes of unchanged
content:

  wowee_editor --export-zone-checksum custom_zones/Z /tmp/before.sha256
  ... edits happen ...
  wowee_editor --export-zone-checksum custom_zones/Z /tmp/after.sha256
  wowee_editor --diff-checksum /tmp/before.sha256 /tmp/after.sha256

  Diff: /tmp/before.sha256 vs /tmp/after.sha256
    added   : 1
    removed : 0
    changed : 0
    +  creatures.json

Standard diff-style markers (+/-/~) for added/removed/changed,
sorted within each category alphabetically.

Use cases:
- Audit what an editing session actually touched (snapshot before,
  snapshot after, diff)
- Verify a zone bundle re-extracts identically (transfer integrity
  beyond the per-file PASS/FAIL of sha256sum -c)
- CI gate: fail build if a refactor touches files it shouldn't

Diff family for content/integrity formats:
  --diff-zone      unpacked zone dir vs zone dir (high-level)
  --diff-extract   per-extension counts in two extracts
  --diff-checksum  per-file hash diff between two snapshots  <- new

Verified: scaffold + export checksum, add creature, re-export,
diff correctly reports '+ creatures.json' (added) and exit 1.
This commit is contained in:
Kelsi 2026-05-06 16:32:55 -07:00
parent dbf973e29e
commit 9b362fc825
1 changed files with 78 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

78
tools/editor/main.cpp
View file

@ -745,6 +745,8 @@ static void printUsage(const char* argv0) {
std::printf(" Compare two JSON DBC sidecars (format/source/recordCount/fieldCount)\n");
std::printf(" --diff-extract <a> <b> [--json]\n");
std::printf(" Compare two extracted asset directories (per-extension file count + bytes)\n");
std::printf(" --diff-checksum <a> <b> [--json]\n");
std::printf(" Diff two SHA256SUMS files; report added/removed/changed entries\n");
std::printf(" --pack-wcp <zone> [dst] Pack a zone dir/name into a .wcp archive and exit\n");
std::printf(" --unpack-wcp <wcp> [dst] Extract a WCP archive (default dst=custom_zones/) and exit\n");
std::printf(" --list-commands Print every recognized --flag, one per line, and exit\n");
@ -864,6 +866,11 @@ int main(int argc, char* argv[]) {
"--diff-extract requires <dirA> <dirB>\n");
return 1;
}
if (std::strcmp(argv[i], "--diff-checksum") == 0 && i + 2 >= argc) {
std::fprintf(stderr,
"--diff-checksum requires <a.sha256> <b.sha256>\n");
return 1;
}
if (std::strcmp(argv[i], "--diff-wcp") == 0 && i + 2 >= argc) {
std::fprintf(stderr, "--diff-wcp requires two paths\n");
return 1;
@ -3945,6 +3952,77 @@ int main(int argc, char* argv[]) {
}
std::printf("\n %d extension(s) differ\n", diffs);
return 1;
} else if (std::strcmp(argv[i], "--diff-checksum") == 0 && i + 2 < argc) {
// Compare two SHA256SUMS files (from --export-zone-checksum).
// Reports which files are added / removed / changed between
// two zone snapshots — much faster than walking the
// filesystem to recompute hashes of unchanged content.
std::string aPath = argv[++i];
std::string bPath = argv[++i];
bool jsonOut = (i + 1 < argc &&
std::strcmp(argv[i + 1], "--json") == 0);
if (jsonOut) i++;
// Parse standard sha256sum format: "<64-hex> <path>"
auto load = [](const std::string& p,
std::map<std::string, std::string>& out) {
std::ifstream in(p);
if (!in) return false;
std::string line;
while (std::getline(in, line)) {
if (line.size() < 66) continue;
std::string hash = line.substr(0, 64);
// Two spaces, then path.
size_t sep = line.find(" ", 64);
if (sep == std::string::npos) continue;
std::string path = line.substr(sep + 2);
out[path] = hash;
}
return true;
};
std::map<std::string, std::string> a, b;
if (!load(aPath, a)) {
std::fprintf(stderr,
"diff-checksum: failed to read %s\n", aPath.c_str());
return 1;
}
if (!load(bPath, b)) {
std::fprintf(stderr,
"diff-checksum: failed to read %s\n", bPath.c_str());
return 1;
}
std::vector<std::string> added, removed, changed;
for (const auto& [path, hash] : a) {
auto it = b.find(path);
if (it == b.end()) removed.push_back(path);
else if (it->second != hash) changed.push_back(path);
}
for (const auto& [path, hash] : b) {
if (a.count(path) == 0) added.push_back(path);
}
int diffs = added.size() + removed.size() + changed.size();
if (jsonOut) {
nlohmann::json j;
j["a"] = aPath; j["b"] = bPath;
j["added"] = added;
j["removed"] = removed;
j["changed"] = changed;
j["totalDiffs"] = diffs;
j["identical"] = (diffs == 0);
std::printf("%s\n", j.dump(2).c_str());
return diffs == 0 ? 0 : 1;
}
std::printf("Diff: %s vs %s\n", aPath.c_str(), bPath.c_str());
std::printf(" added : %zu\n", added.size());
std::printf(" removed : %zu\n", removed.size());
std::printf(" changed : %zu\n", changed.size());
for (const auto& p : added) std::printf(" + %s\n", p.c_str());
for (const auto& p : removed) std::printf(" - %s\n", p.c_str());
for (const auto& p : changed) std::printf(" ~ %s\n", p.c_str());
if (diffs == 0) {
std::printf(" IDENTICAL\n");
return 0;
}
return 1;
} else if (std::strcmp(argv[i], "--list-wcp") == 0 && i + 1 < argc) {
// Like --info-wcp but prints every file path. Useful for spotting
// missing or unexpected entries before unpacking.