mojotrollz/mojo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stuffextract:

Browse Source 
* added command line settings
* fixed loading order of MPQ files + patches & added some more.
* little locale update
This commit is contained in:
False.Genesis 2007-09-30 12:59:00 +00:00
parent 9b0da733cc
commit 192eda63da
4 changed files with 196 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/stuffextract/Locale.cpp
View File

@ -3,6 +3,7 @@
#include <fstream> #include <fstream>
#include "ByteBuffer.h" #include "ByteBuffer.h"
bool locale_set=false;
char my_locale[5]; char my_locale[5];
char *cconf = "WTF/config.wtf"; char *cconf = "WTF/config.wtf";
char *cconfentry = "SET locale \""; char *cconfentry = "SET locale \"";
@ -48,9 +49,12 @@ void SetLocale(char *loc)
} }
delete [] buf; delete [] buf;
} }
locale_set = true;
} }
char *GetLocale(void) char *GetLocale(void)
{ {
return &my_locale[0]; if(locale_set)
return &my_locale[0];
return NULL;
} }

7
src/tools/stuffextract/MPQHelper.cpp
View File

@ -16,17 +16,20 @@ MPQHelper::MPQHelper(char *archive)
// order goes from last opened to first opened file // order goes from last opened to first opened file
// ok maybe this is a bit too much but should work fine :) // ok maybe this is a bit too much but should work fine :)
_patches.push_front(dir+archive+ext); //
_patches.push_front(dir+"common"+ext); _patches.push_front(dir+"common"+ext);
_patches.push_front(dir+"expansion"+ext); _patches.push_front(dir+"expansion"+ext);
_patches.push_front(dir+"patch"+ext);
for(uint32 i=1; i<=MAX_PATCH_NUMBER; i++) for(uint32 i=1; i<=MAX_PATCH_NUMBER; i++)
{ {
char buf[200]; char buf[200];
sprintf(buf,"%spatch-%u%s",dir.c_str(),i,ext.c_str()); sprintf(buf,"%spatch-%u%s",dir.c_str(),i,ext.c_str());
_patches.push_front(buf); _patches.push_front(buf);
} }
_patches.push_front(dir+"patch"+ext); _patches.push_front(ldir+"speech-"+GetLocale()+ext);
_patches.push_front(ldir+archive+"-"+GetLocale()+ext); _patches.push_front(ldir+archive+"-"+GetLocale()+ext);
_patches.push_front(ldir+"locale-"+GetLocale()+ext); _patches.push_front(ldir+"locale-"+GetLocale()+ext);
_patches.push_front(ldir+"expansion-speech-"+GetLocale()+ext);
_patches.push_front(ldir+"expansion-locale-"+GetLocale()+ext); _patches.push_front(ldir+"expansion-locale-"+GetLocale()+ext);
_patches.push_front(ldir+"expansion-"+archive+"-"+GetLocale()+ext); _patches.push_front(ldir+"expansion-"+archive+"-"+GetLocale()+ext);
@ -39,6 +42,7 @@ MPQHelper::MPQHelper(char *archive)
_patches.push_front(buf); _patches.push_front(buf);
} }
// now check if the above specified files exist.
for(std::list<std::string>::iterator it=_patches.begin(); it != _patches.end(); it++) for(std::list<std::string>::iterator it=_patches.begin(); it != _patches.end(); it++)
{ {
if(::FileExists(*it)) if(::FileExists(*it))
@ -46,7 +50,6 @@ MPQHelper::MPQHelper(char *archive)
_files.push_back(new MPQFile((*it).c_str())); _files.push_back(new MPQFile((*it).c_str()));
} }
} }
_files.push_back(new MPQFile(archive));
} }
MPQHelper::~MPQHelper() MPQHelper::~MPQHelper()

234
src/tools/stuffextract/StuffExtract.cpp
View File

@ -18,40 +18,151 @@ std::set<std::string> modelNames;
std::set<std::string> wmoNames; std::set<std::string> wmoNames;
std::set<std::string> soundFileSet; std::set<std::string> soundFileSet;
// default config; SCPs are dont always
bool doMaps=true, doSounds=false, doTextures=false, doWmos=false, doModels=false, doMd5=true, doAutoclose=false;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
char input[200]; char input[200];
printf("StuffExtract [version %u]\n\n",SE_VERSION); printf("StuffExtract [version %u]\n\n",SE_VERSION);
printf("Enter your locale (enUS, enGB, deDE, ...) or leave blank to autodetect: "); ProcessCmdArgs(argc, argv);
fgets(input,sizeof(input),stdin); PrintConfig();
char loc[5]; if(!GetLocale())
input[strlen(input)-1] = 0; {
memcpy(loc,input,4); loc[4]=0; printf("Enter your locale (enUS, enGB, deDE, ...) or leave blank to autodetect: ");
SetLocale(loc); fgets(input,sizeof(input),stdin);
char loc[5];
input[strlen(input)-1] = 0;
memcpy(loc,input,4); loc[4]=0;
SetLocale(loc);
}
if(FileExists(std::string("Data/")+GetLocale()+"/locale-"+GetLocale()+".MPQ")) if(FileExists(std::string("Data/")+GetLocale()+"/locale-"+GetLocale()+".MPQ"))
{ {
printf("Locale seems valid, starting conversion...\n"); printf("Locale \"%s\" seems valid, starting conversion...\n",GetLocale());
CreateDir("stuffextract"); CreateDir("stuffextract");
CreateDir("stuffextract/data"); CreateDir("stuffextract/data");
ConvertDBC(); ConvertDBC();
ExtractMaps(); if(doMaps) ExtractMaps();
ExtractMapDependencies(); if(doTextures || doModels || doWmos) ExtractMapDependencies();
ExtractSoundFiles(); if(doSounds) ExtractSoundFiles();
//... //...
printf("\n -- finished, press enter to exit --\n"); if (!doAutoclose)
printf("\n -- finished, press enter to exit --\n");
} }
else else
{ {
printf("ERROR: Invalid locale! Press Enter to exit...\n"); printf("ERROR: Invalid locale \"%s\"! Press Enter to exit...\n",GetLocale());
} }
if (!doAutoclose)
fgets(input,sizeof(input),stdin); fgets(input,sizeof(input),stdin);
//while(true); //while(true);
return 0; return 0;
} }
void ProcessCmdArgs(int argc, char *argv[])
{
bool on,help=false;
char *what;
for(int i = 1; i < argc; i++)
{
if(strlen(argv[i]) > 1)
{
if(argv[i][0] == '-')
on = false;
else if(argv[i][0] == '+')
on = true;
else if(!stricmp(argv[i],"/?") || !stricmp(argv[i],"/help"))
{
help = true;
break;
}
else
{
printf("Incorrect cmd arg: \"%s\"\n",argv[i]);
continue;
}
what = argv[i]+1; // skip first byte (+/-)
if (!stricmp(what,"maps")) doMaps = on;
else if(!stricmp(what,"textures")) doTextures = on;
else if(!stricmp(what,"wmos")) doWmos = on;
else if(!stricmp(what,"models")) doModels = on;
else if(!stricmp(what,"sounds")) doSounds = on;
else if(!stricmp(what,"md5")) doMd5 = on;
else if(!stricmp(what,"autoclose")) doAutoclose = on;
// autodetect or use given locale. + or - as arg start doesnt matter here
else if(!strnicmp(what,"locale:",7))
{
if(!stricmp(what+7,"auto"))
SetLocale(NULL);
else
SetLocale(what+7);
}
else if(!stricmp(what,"?") || !stricmp(what,"help"))
{
help = true;
break;
}
else
{
printf("Unknown cmd arg: \"%s\"\n",what);
}
}
}
// fix up wrong configs. not necessary but better for display.
// TODO: as soon as M2 model or WMO reading is done, extract those textures to, but independent from maps!!
if(!doMaps)
{
doTextures = false;
doWmos = false;
doModels = false;
}
if(help)
{
PrintHelp();
printf("\n\n- Press any key to exit -\n");
getchar();
exit(0);
}
}
void PrintConfig(void)
{
printf("config: Do maps: %s\n",doMaps?"yes":"no");
printf("config: Do textures: %s\n",doTextures?"yes":"no");
printf("config: Do wmos: %s\n",doWmos?"yes":"no");
printf("config: Do models: %s\n",doModels?"yes":"no");
printf("config: Do sounds: %s\n",doSounds?"yes":"no");
printf("config: Calc md5: %s\n",doMd5?"yes":"no");
printf("config: Autoclose: %s\n",doAutoclose?"yes":"no");
}
void PrintHelp(void)
{
printf("Usage information:\n\n");
printf("Use + or - to turn a feature on or off.\n");
printf("Features are:\n");
printf("maps - map extraction\n");
printf("textures - extract textures (requires maps extraction, for now)\n");
printf("wmos - extract map WMOs (requires maps extraction)\n");
printf("models - extract models (required maps extraction, for now)\n");
printf("sounds - extract sound files (wav/mp3)\n");
printf("md5 - write MD5 checksum lists of extracted files\n");
printf("autoclose - close program when done\n");
printf("\n");
printf("Use -locale:xxXX to set a locale. If you don't use this, you will be asked.\n");
printf("Use -locale:auto to autodetect currently used locale.\n");
printf("\n");
printf("Examples:\n");
printf("stuffextract +sounds +md5 -maps +autoclose -locale:enGB\n");
printf("stuffextract +md5 -wmos -sounds -locale:auto -autoclose\n");
printf("\nDefault is: +maps -sounds -textures -wmos -models +md5 -autoclose\n");
}
// be careful using this, that you supply correct format string // be careful using this, that you supply correct format string
std::string AutoGetDataString(DBCFile::Iterator& it, const char* format, uint32 field) std::string AutoGetDataString(DBCFile::Iterator& it, const char* format, uint32 field)
{ {
@ -106,7 +217,8 @@ void OutSCP(char *fn, SCPStorageMap& scp)
void OutMD5(char *path, MD5FileMap& fm) void OutMD5(char *path, MD5FileMap& fm)
{ {
if(!doMd5)
return;
std::string fullname(path); std::string fullname(path);
fullname += "/md5.txt"; fullname += "/md5.txt";
printf("Writing MD5 file checksums to '%s'\n",fullname.c_str()); printf("Writing MD5 file checksums to '%s'\n",fullname.c_str());
@ -238,8 +350,8 @@ bool ConvertDBC(void)
{ {
SoundDataStorage[id].push_back(std::string(SoundEntriesFieldNames[field]) + "=" + value); SoundDataStorage[id].push_back(std::string(SoundEntriesFieldNames[field]) + "=" + value);
// fill up file storage // fill up file storage. not necessary if we dont want to extract sounds
if(field >= SOUNDENTRY_FILE_1 && field <= SOUNDENTRY_FILE_10) if(doSounds && field >= SOUNDENTRY_FILE_1 && field <= SOUNDENTRY_FILE_10)
soundFileSet.insert(path + value); soundFileSet.insert(path + value);
} }
} }
@ -371,16 +483,21 @@ void ExtractMaps(void)
fh.flush(); fh.flush();
fh.close(); fh.close();
olddeps = texNames.size() + modelNames.size() + wmoNames.size(); olddeps = texNames.size() + modelNames.size() + wmoNames.size();
ADT_FillTextureData(bb.contents(),texNames);
ADT_FillModelData(bb.contents(),modelNames); if(doTextures) ADT_FillTextureData(bb.contents(),texNames);
ADT_FillWMOData(bb.contents(),wmoNames); if(doModels) ADT_FillModelData(bb.contents(),modelNames);
if(doWmos) ADT_FillWMOData(bb.contents(),wmoNames);
depdiff = texNames.size() + modelNames.size() + wmoNames.size() - olddeps; depdiff = texNames.size() + modelNames.size() + wmoNames.size() - olddeps;
MD5Hash h; if(doMd5)
h.Update((uint8*)bb.contents(), bb.size()); {
h.Finalize(); MD5Hash h;
uint8 *md5ptr = new uint8[MD5_DIGEST_LENGTH]; h.Update((uint8*)bb.contents(), bb.size());
md5map[_PathToFileName(outbuf)] = md5ptr; h.Finalize();
memcpy(md5ptr, h.GetDigest(), MD5_DIGEST_LENGTH); uint8 *md5ptr = new uint8[MD5_DIGEST_LENGTH];
md5map[_PathToFileName(outbuf)] = md5ptr;
memcpy(md5ptr, h.GetDigest(), MD5_DIGEST_LENGTH);
}
extr++; extr++;
printf("[%u:%u] %s; %u new deps.\n",extr,it->first,namebuf,depdiff); printf("[%u:%u] %s; %u new deps.\n",extr,it->first,namebuf,depdiff);
} }
@ -425,12 +542,15 @@ void ExtractMapDependencies(void)
{ {
ByteBuffer& bb = mpqtex.ExtractFile((char*)mpqfn.c_str()); ByteBuffer& bb = mpqtex.ExtractFile((char*)mpqfn.c_str());
fh.write((const char*)bb.contents(),bb.size()); fh.write((const char*)bb.contents(),bb.size());
MD5Hash h; if(doMd5)
h.Update((uint8*)bb.contents(), bb.size()); {
h.Finalize(); MD5Hash h;
uint8 *md5ptr = new uint8[MD5_DIGEST_LENGTH]; h.Update((uint8*)bb.contents(), bb.size());
md5Tex[_PathToFileName(realfn)] = md5ptr; h.Finalize();
memcpy(md5ptr, h.GetDigest(), MD5_DIGEST_LENGTH); uint8 *md5ptr = new uint8[MD5_DIGEST_LENGTH];
md5Tex[_PathToFileName(realfn)] = md5ptr;
memcpy(md5ptr, h.GetDigest(), MD5_DIGEST_LENGTH);
}
texdone++; texdone++;
printf("- textures... %u\r",texdone); printf("- textures... %u\r",texdone);
} }
@ -469,12 +589,15 @@ void ExtractMapDependencies(void)
{ {
ByteBuffer& bb = mpqmodel.ExtractFile((char*)mpqfn.c_str()); ByteBuffer& bb = mpqmodel.ExtractFile((char*)mpqfn.c_str());
fh.write((const char*)bb.contents(),bb.size()); fh.write((const char*)bb.contents(),bb.size());
MD5Hash h; if(doMd5)
h.Update((uint8*)bb.contents(), bb.size()); {
h.Finalize(); MD5Hash h;
uint8 *md5ptr = new uint8[MD5_DIGEST_LENGTH]; h.Update((uint8*)bb.contents(), bb.size());
md5Model[_PathToFileName(realfn)] = md5ptr; h.Finalize();
memcpy(md5ptr, h.GetDigest(), MD5_DIGEST_LENGTH); uint8 *md5ptr = new uint8[MD5_DIGEST_LENGTH];
md5Model[_PathToFileName(realfn)] = md5ptr;
memcpy(md5ptr, h.GetDigest(), MD5_DIGEST_LENGTH);
}
mdone++; mdone++;
printf("- models... %u\r",mdone); printf("- models... %u\r",mdone);
} }
@ -497,12 +620,15 @@ void ExtractMapDependencies(void)
{ {
ByteBuffer& bb = mpqwmo.ExtractFile((char*)mpqfn.c_str()); ByteBuffer& bb = mpqwmo.ExtractFile((char*)mpqfn.c_str());
fh.write((const char*)bb.contents(),bb.size()); fh.write((const char*)bb.contents(),bb.size());
MD5Hash h; if(doMd5)
h.Update((uint8*)bb.contents(), bb.size()); {
h.Finalize(); MD5Hash h;
uint8 *md5ptr = new uint8[MD5_DIGEST_LENGTH]; h.Update((uint8*)bb.contents(), bb.size());
md5Wmo[_PathToFileName(realfn)] = md5ptr; h.Finalize();
memcpy(md5ptr, h.GetDigest(), MD5_DIGEST_LENGTH); uint8 *md5ptr = new uint8[MD5_DIGEST_LENGTH];
md5Wmo[_PathToFileName(realfn)] = md5ptr;
memcpy(md5ptr, h.GetDigest(), MD5_DIGEST_LENGTH);
}
wmosdone++; wmosdone++;
printf("- WMOs... %u\r",wmosdone); printf("- WMOs... %u\r",wmosdone);
} }
@ -519,14 +645,17 @@ void ExtractSoundFiles(void)
{ {
MD5FileMap md5data; MD5FileMap md5data;
uint32 done = 0; uint32 done = 0;
printf("\nExtracting game audio files, %u total...\n",soundFileSet.size()); printf("\nExtracting game audio files, %u found in DBC...\n",soundFileSet.size());
CreateDir(SOUNDDIR); CreateDir(SOUNDDIR);
MPQHelper smpq("sound"); MPQHelper smpq("sound");
std::string outfn; std::string outfn;
for(std::set<std::string>::iterator i = soundFileSet.begin(); i != soundFileSet.end(); i++) for(std::set<std::string>::iterator i = soundFileSet.begin(); i != soundFileSet.end(); i++)
{ {
if(!smpq.FileExists((char*)(*i).c_str())) if(!smpq.FileExists((char*)(*i).c_str()))
{
DEBUG( printf("MPQ: File not found: '%s'\n",(*i).c_str()) );
continue; continue;
}
outfn = std::string(SOUNDDIR) + "/" + _PathToFileName(*i); outfn = std::string(SOUNDDIR) + "/" + _PathToFileName(*i);
std::fstream fh; std::fstream fh;
@ -537,12 +666,15 @@ void ExtractSoundFiles(void)
if(bb.size()) if(bb.size())
{ {
fh.write((const char*)bb.contents(),bb.size()); fh.write((const char*)bb.contents(),bb.size());
MD5Hash h; if(doMd5)
h.Update((uint8*)bb.contents(), bb.size()); {
h.Finalize(); MD5Hash h;
uint8 *md5ptr = new uint8[MD5_DIGEST_LENGTH]; h.Update((uint8*)bb.contents(), bb.size());
md5data[_PathToFileName(*i)] = md5ptr; h.Finalize();
memcpy(md5ptr, h.GetDigest(), MD5_DIGEST_LENGTH); uint8 *md5ptr = new uint8[MD5_DIGEST_LENGTH];
md5data[_PathToFileName(*i)] = md5ptr;
memcpy(md5ptr, h.GetDigest(), MD5_DIGEST_LENGTH);
}
done++; done++;
printf("- %u files done.\r",done); printf("- %u files done.\r",done);
} }

3
src/tools/stuffextract/StuffExtract.h
View File

@ -15,6 +15,9 @@ typedef std::map< uint32,std::list<std::string> > SCPStorageMap;
typedef std::map<std::string,uint8*> MD5FileMap; typedef std::map<std::string,uint8*> MD5FileMap;
int main(int argc, char *argv[]); int main(int argc, char *argv[]);
void ProcessCmdArgs(int argc, char *argv[]);
void PrintConfig(void);
void PrintHelp(void);
void OutSCP(char*, SCPStorageMap&); void OutSCP(char*, SCPStorageMap&);
void OutMD5(char*, MD5FileMap&); void OutMD5(char*, MD5FileMap&);
bool ConvertDBC(void); bool ConvertDBC(void);