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

feat(extract): add --upgrade-extract for in-place sidecar generation

Browse source 
Standalone post-extract pass: walks an existing extracted asset
tree and writes open-format sidecars in place, without re-running
MPQ extraction.

  asset_extract --upgrade-extract Data/expansions/wotlk

Lets users with old extractions opt into the open-format pipeline
without losing the extracted state. Implies --emit-open if no
individual --emit-* flag is set.

Verified end-to-end: created a hand-built DBC in a temp dir, ran
--upgrade-extract, observed test.json appear with correct
metadata. Servers continue to read .dbc from manifest; the
runtime client picks up the new .json sidecar via the existing
pickup path.
This commit is contained in:
Kelsi 2026-05-06 10:52:55 -07:00
parent 5a816f104c
commit 30b15554a9
1 changed files with 43 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

43
tools/asset_extract/main.cpp
View file

@ -1,4 +1,5 @@
#include "extractor.hpp"
#include "open_format_emitter.hpp"
#include <filesystem>
#include <iostream>
#include <string>
@ -30,6 +31,9 @@ static void printUsage(const char* prog) {
<< " --emit-wob Emit foo.wob next to every extracted foo.wmo (+groups)\n"
<< " --emit-terrain Emit foo.whm + foo.wot + foo.woc next to every foo.adt\n"
<< " --emit-open Shortcut: enable every open-format emitter (png+json+wom+wob+terrain)\n"
<< " --upgrade-extract <dir>\n"
<< " Standalone post-extract pass on an existing tree —\n"
<< " writes open-format sidecars without re-running MPQ extract\n"
<< " --verify CRC32 verify all extracted files\n"
<< " --threads <N> Number of extraction threads (default: auto)\n"
<< " --verbose Verbose output\n"
@ -40,6 +44,11 @@ int main(int argc, char** argv) {
wowee::tools::Extractor::Options opts;
std::string expansion;
std::string locale;
// Standalone open-format emit mode: skip MPQ enumeration entirely
// and just walk an existing extracted tree, writing sidecars in
// place. Useful for upgrading an old extraction without re-running
// it from MPQ. Triggered by --upgrade-extract <dir>.
std::string upgradeDir;
for (int i = 1; i < argc; ++i) {
if (std::strcmp(argv[i], "--mpq-dir") == 0 && i + 1 < argc) {
@ -85,6 +94,14 @@ int main(int argc, char** argv) {
opts.verify = true;
} else if (std::strcmp(argv[i], "--verbose") == 0) {
opts.verbose = true;
} else if (std::strcmp(argv[i], "--upgrade-extract") == 0 && i + 1 < argc) {
upgradeDir = argv[++i];
// Implies --emit-open if no individual emit flag was set.
if (!opts.emitPng && !opts.emitJsonDbc && !opts.emitWom &&
!opts.emitWob && !opts.emitTerrain) {
opts.emitPng = opts.emitJsonDbc = opts.emitWom =
opts.emitWob = opts.emitTerrain = true;
}
} else if (std::strcmp(argv[i], "--help") == 0 || std::strcmp(argv[i], "-h") == 0) {
printUsage(argv[0]);
return 0;
@ -95,6 +112,32 @@ int main(int argc, char** argv) {
}
}
// --upgrade-extract: standalone post-extract pass on an existing tree.
if (!upgradeDir.empty()) {
if (!std::filesystem::exists(upgradeDir)) {
std::cerr << "upgrade-extract: " << upgradeDir << " does not exist\n";
return 1;
}
std::cout << "Walking " << upgradeDir
<< " for open-format upgrades...\n";
wowee::tools::OpenFormatStats stats;
wowee::tools::emitOpenFormats(upgradeDir,
opts.emitPng, opts.emitJsonDbc,
opts.emitWom, opts.emitWob,
opts.emitTerrain, stats);
std::cout << " PNG (BLP→PNG) : " << stats.pngOk << " ok"
<< (stats.pngFail ? ", " + std::to_string(stats.pngFail) + " failed" : "") << "\n";
std::cout << " JSON (DBC→JSON) : " << stats.jsonDbcOk << " ok"
<< (stats.jsonDbcFail ? ", " + std::to_string(stats.jsonDbcFail) + " failed" : "") << "\n";
std::cout << " WOM (M2→WOM) : " << stats.womOk << " ok"
<< (stats.womFail ? ", " + std::to_string(stats.womFail) + " failed" : "") << "\n";
std::cout << " WOB (WMO→WOB) : " << stats.wobOk << " ok"
<< (stats.wobFail ? ", " + std::to_string(stats.wobFail) + " failed" : "") << "\n";
std::cout << " WHM/WOT/WOC (ADT) : " << stats.whmOk << " ok"
<< (stats.whmFail ? ", " + std::to_string(stats.whmFail) + " failed" : "") << "\n";
return 0;
}
if (opts.mpqDir.empty() || opts.outputDir.empty()) {
std::cerr << "Error: --mpq-dir and --output are required\n\n";
printUsage(argv[0]);