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

Improve Lua enable/disable error handling

develop
lethosor 2015-03-15 16:54:18 -04:00
parent eaf282c18e
commit 42a6cfaee6
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
library/Core.cpp
Unescape Escape View File

@ -661,32 +661,43 @@ command_result Core::runCommand(color_ostream &con, const std::string &first_, v
for (size_t i = 0; i < parts.size(); i++) for (size_t i = 0; i < parts.size(); i++)
{ {
Plugin * plug = plug_mgr->getPluginByName(parts[i]); std::string part = parts[i];
if (part.find('\\') != std::string::npos)
{
con.printerr("Replacing backslashes with forward slashes in \"%s\"\n", part.c_str());
for (size_t j = 0; j < part.size(); j++)
{
if (part[j] == '\\')
part[j] = '/';
}
}
Plugin * plug = plug_mgr->getPluginByName(part);
if(!plug) if(!plug)
{ {
std::string lua = findScript(this->p->getPath(), parts[i] + ".lua"); std::string lua = findScript(this->p->getPath(), part + ".lua");
if (lua.size()) if (lua.size())
{ {
res = enableLuaScript(con, parts[i], enable); res = enableLuaScript(con, part, enable);
} }
else else
{ {
res = CR_NOT_FOUND; res = CR_NOT_FOUND;
con.printerr("No such plugin or Lua script: %s\n", parts[i].c_str()); con.printerr("No such plugin or Lua script: %s\n", part.c_str());
} }
} }
else if (!plug->can_set_enabled()) else if (!plug->can_set_enabled())
{ {
res = CR_NOT_IMPLEMENTED; res = CR_NOT_IMPLEMENTED;
con.printerr("Cannot %s plugin: %s\n", first.c_str(), parts[i].c_str()); con.printerr("Cannot %s plugin: %s\n", first.c_str(), part.c_str());
} }
else else
{ {
res = plug->set_enabled(con, enable); res = plug->set_enabled(con, enable);
if (res != CR_OK || plug->is_enabled() != enable) if (res != CR_OK || plug->is_enabled() != enable)
con.printerr("Could not %s plugin: %s\n", first.c_str(), parts[i].c_str()); con.printerr("Could not %s plugin: %s\n", first.c_str(), part.c_str());
} }
} }

15
library/lua/dfhack.lua
Unescape Escape View File

@ -399,9 +399,13 @@ function Script:get_flags()
local f = io.open(self.path) local f = io.open(self.path)
local contents = f:read('*all') local contents = f:read('*all')
f:close() f:close()
for line in contents:gmatch('--@([^\n]+)') do for line in contents:gmatch('%-%-@([^\n]+)') do
local chunk = load(line, self.path, 't', self._flags) local chunk = load(line, self.path, 't', self._flags)
if chunk then chunk() end if chunk then
chunk()
else
dfhack.printerr('Parse error: ' .. line)
end
end end
end end
return self._flags return self._flags
@ -434,7 +438,7 @@ function dfhack.findScript(name)
end end
local valid_script_flags = { local valid_script_flags = {
enable = {required = true}, enable = {required = true, error = 'Does not recognize enable/disable commands'},
enable_state = {required = false}, enable_state = {required = false},
module = {required = true, error = 'Cannot be used as a module'}, module = {required = true, error = 'Cannot be used as a module'},
} }
@ -444,9 +448,10 @@ function dfhack.run_script(name,...)
end end
function dfhack.enable_script(name, state) function dfhack.enable_script(name, state)
local res = dfhack.pcall(dfhack.run_script_with_env, nil, name, {enable=true, enable_state=state}) local res, err = dfhack.pcall(dfhack.run_script_with_env, nil, name, {enable=true, enable_state=state})
if not res then if not res then
qerror('Cannot ' .. (state and 'enable' or 'disable') .. ' Lua script: ' .. name) dfhack.printerr(err.message)
qerror(('Cannot %s Lua script: %s'):format(state and 'enable' or 'disable', name))
end end
end end