mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Nicer help text and error for not selecting a valid mode.

Browse Source
This commit is contained in:
Alexander "Ace" Olofsson 2012-04-08 17:14:56 +02:00
parent fc8c75ab89
commit 23f81e63dd
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/esmtool/esmtool.cpp
View File

@ -46,7 +46,7 @@ struct Arguments
bool parseOptions (int argc, char** argv, Arguments &info) bool parseOptions (int argc, char** argv, Arguments &info)
{ {
bpo::options_description desc("Inspect and extract from Morrowind ES files (ESM, ESP, ESS)\nSyntax: esmtool [options] mode infile [outfile]\nAllowed options"); bpo::options_description desc("Inspect and extract from Morrowind ES files (ESM, ESP, ESS)\nSyntax: esmtool [options] mode infile [outfile]\nAllowed modes:\n dump\t Dumps all readable data from the input file\n clone\t Clones the input file to the output file.\n\nAllowed options");
desc.add_options() desc.add_options()
("help,h", "print help message.") ("help,h", "print help message.")
@ -103,6 +103,14 @@ bool parseOptions (int argc, char** argv, Arguments &info)
return false; return false;
} }
info.mode = variables["mode"].as<std::string>();
if (!(info.mode == "dump" || info.mode == "clone"))
{
std::cout << std::endl << "ERROR: invalid mode \"" << info.mode << "\"" << std::endl << std::endl
<< desc << finalText << std::endl;
return false;
}
if ( !variables.count("input-file") ) if ( !variables.count("input-file") )
{ {
std::cout << "\nERROR: missing ES file\n\n"; std::cout << "\nERROR: missing ES file\n\n";
@ -118,8 +126,6 @@ bool parseOptions (int argc, char** argv, Arguments &info)
return false; return false;
}*/ }*/
info.mode = variables["mode"].as<std::string>();
info.filename = variables["input-file"].as< vector<std::string> >()[0]; info.filename = variables["input-file"].as< vector<std::string> >()[0];
if (variables["input-file"].as< vector<std::string> >().size() > 1) if (variables["input-file"].as< vector<std::string> >().size() > 1)
info.outname = variables["input-file"].as< vector<std::string> >()[1]; info.outname = variables["input-file"].as< vector<std::string> >()[1];
@ -814,7 +820,7 @@ int clone(Arguments& info)
esm.endRecord(n.toString()); esm.endRecord(n.toString());
saved++; saved++;
int perc = ((int)saved / (float)recordCount)*100; int perc = (saved / (float)recordCount)*100;
if (perc % 10 == 0) if (perc % 10 == 0)
{ {
cerr << "\r" << perc << "%"; cerr << "\r" << perc << "%";