games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

[programming challenge] Paths with spaces work (win).

Browse Source
This commit is contained in:
Michał W. Urbańczyk 2011-12-09 21:37:32 +00:00
parent ae6ee4de63
commit c0637f333d
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Odpalarka/main.cpp
View File

@ -4,6 +4,14 @@
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
namespace po = boost::program_options; namespace po = boost::program_options;
std::string addQuotesIfNeeded(const std::string &s)
{
if(s.find_first_of(' ') != std::string::npos)
return "\"" + s + "\"";
return s;
}
void prog_help() void prog_help()
{ {
std::cout << "If run without args, then StupidAI will be run on b1.json.\n"; std::cout << "If run without args, then StupidAI will be run on b1.json.\n";
@ -15,7 +23,10 @@ void runCommand(const std::string &command, const std::string &name, const std::
static int i = 0; static int i = 0;
std::string &cmd = commands[i++]; std::string &cmd = commands[i++];
if(logsDir.size() && name.size()) if(logsDir.size() && name.size())
cmd = command + " > " + logsDir + "/" + name + ".txt"; {
std::string directionLogs = logsDir + "/" + name + ".txt";
cmd = command + " > " + addQuotesIfNeeded(directionLogs);
}
else else
cmd = command; cmd = command;
@ -90,9 +101,9 @@ int main(int argc, char **argv)
#endif #endif
; ;
std::string serverCommand = servername + " " + battle + " " + leftAI + " " + rightAI + " " + results + " " + logsDir + " " + (withVisualization ? " v" : ""); std::string serverCommand = servername + " " + addQuotesIfNeeded(battle) + " " + addQuotesIfNeeded(leftAI) + " " + addQuotesIfNeeded(rightAI) + " " + addQuotesIfNeeded(results) + " " + addQuotesIfNeeded(logsDir) + " " + (withVisualization ? " v" : "");
std::string runnerCommand = runnername + " " + logsDir; std::string runnerCommand = runnername + " " + addQuotesIfNeeded(logsDir);
std::cout <<"Server command: " << serverCommand << std::endl << "Runner command: " << runnername << std::endl; std::cout <<"Server command: " << serverCommand << std::endl << "Runner command: " << runnerCommand << std::endl;
boost::thread t(boost::bind(std::system, serverCommand.c_str())); boost::thread t(boost::bind(std::system, serverCommand.c_str()));
runCommand(runnerCommand, "first_runner", logsDir); runCommand(runnerCommand, "first_runner", logsDir);

2
server/CVCMIServer.cpp
View File

@ -625,7 +625,7 @@ void CVCMIServer::startDuel(const std::string &battle, const std::string &leftAI
{ {
if(aisSoFar < 2) if(aisSoFar < 2)
{ {
tlog0 << " will run " << (aisSoFar ? "right" : "left") << " AI " << std::endl; tlog0 << " (PID=" << pidsFromConns[c] << ") will run " << (aisSoFar ? "right" : "left") << " AI " << std::endl;
*c << gh->ais[aisSoFar] << ui8(aisSoFar); *c << gh->ais[aisSoFar] << ui8(aisSoFar);
PIDs[aisSoFar] = pidsFromConns[c]; PIDs[aisSoFar] = pidsFromConns[c];
aisSoFar++; aisSoFar++;