MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

type: Provide more useful information (script paths, plugin names)

develop
lethosor 2015-10-27 17:34:32 -04:00
parent d58c9019be
commit 1250bb5204
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
library/Core.cpp
Unescape Escape View File

@ -919,29 +919,34 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
} }
con << parts[0]; con << parts[0];
string builtin_cmd = getBuiltinCommand(parts[0]); string builtin_cmd = getBuiltinCommand(parts[0]);
string lua_path = findScript(parts[0] + ".lua");
string ruby_path = findScript(parts[0] + ".rb");
Plugin *plug = plug_mgr->getPluginByCommand(parts[0]); Plugin *plug = plug_mgr->getPluginByCommand(parts[0]);
if (builtin_cmd.size()) if (builtin_cmd.size())
{ {
con << " is a built-in command"; con << " is a built-in command";
if (builtin_cmd != parts[0]) if (builtin_cmd != parts[0])
con << " (aliased to " << builtin_cmd << ")"; con << " (aliased to " << builtin_cmd << ")";
con << "." << std::endl; con << std::endl;
} }
else if (plug) else if (plug)
{ {
con << " is part of plugin " << plug->getName() << "." << std::endl; con << " is a command implemented by the plugin " << plug->getName() << std::endl;
} }
else if (findScript(parts[0] + ".lua").size()) else if (lua_path.size())
{ {
con << " is a Lua script." << std::endl; con << " is a Lua script: " << lua_path << std::endl;
} }
else if (findScript(parts[0] + ".rb").size()) else if (ruby_path.size())
{ {
con << " is a Ruby script." << std::endl; con << " is a Ruby script: " << ruby_path << std::endl;
} }
else else
{ {
con << " is not recognized." << std::endl; con << " is not a recognized command." << std::endl;
plug = plug_mgr->getPluginByName(parts[0]);
if (plug)
con << "Plugin " << parts[0] << " exists and implements " << plug->size() << " commands." << std::endl;
return CR_FAILURE; return CR_FAILURE;
} }
} }