iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve error reporting when an automation script fails to load 

Cut down on the amount of redundant information displayed so that the
actual error is visible.
This commit is contained in:
Thomas Goyne 2013-09-21 12:10:37 -07:00
parent 1a8fbf35f1
commit ced3dd7a7e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aegisub/src/auto4_base.cpp
View File

@ -474,7 +474,7 @@ namespace Automation4 {
auto s = factory->Produce(filename); auto s = factory->Produce(filename);
if (s) { if (s) {
if (!s->GetLoadedState()) { if (!s->GetLoadedState()) {
wxLogError(_("An Automation script failed to load. File name: '%s', error reported: %s"), filename.wstring(), s->GetDescription()); wxLogError(_("Failed to load Automation script '%s':\n%s"), filename.wstring(), s->GetDescription());
} }
return s; return s;
} }

8
aegisub/src/auto4_lua.cpp
View File

@ -438,7 +438,7 @@ namespace Automation4 {
// load user script // load user script
if (!LoadFile(L, GetFilename())) { if (!LoadFile(L, GetFilename())) {
std::string err = str(boost::format("Error loading Lua script \"%s\":\n\n%s") % GetPrettyFilename().string() % get_string_or_default(L, 1)); std::string err = get_string_or_default(L, 1);
lua_pop(L, 1); lua_pop(L, 1);
throw ScriptLoadError(err); throw ScriptLoadError(err);
} }
@ -558,7 +558,7 @@ namespace Automation4 {
try { try {
if (!LoadFile(L, path)) if (!LoadFile(L, path))
return luaL_error(L, "Error loading Lua module \"%s\":\n\n%s", path.string().c_str(), luaL_checkstring(L, 1)); return luaL_error(L, "Error loading Lua module \"%s\":\n%s", path.string().c_str(), luaL_checkstring(L, 1));
break; break;
} }
catch (agi::fs::FileNotFound const&) { catch (agi::fs::FileNotFound const&) {
@ -568,7 +568,7 @@ namespace Automation4 {
// Not an error so swallow and continue on // Not an error so swallow and continue on
} }
catch (agi::Exception const& e) { catch (agi::Exception const& e) {
return luaL_error(L, "Error loading Lua module \"%s\":\n\n%s", path.string().c_str(), e.GetChainedMessage().c_str()); return luaL_error(L, "Error loading Lua module \"%s\":\n%s", path.string().c_str(), e.GetChainedMessage().c_str());
} }
} }
@ -597,7 +597,7 @@ namespace Automation4 {
return luaL_error(L, "Lua include not found: %s", filename.c_str()); return luaL_error(L, "Lua include not found: %s", filename.c_str());
if (!LoadFile(L, filepath)) if (!LoadFile(L, filepath))
return luaL_error(L, "Error loading Lua include \"%s\":\n\n%s", filename.c_str(), luaL_checkstring(L, 1)); return luaL_error(L, "Error loading Lua include \"%s\":\n%s", filename.c_str(), luaL_checkstring(L, 1));
int pretop = lua_gettop(L) - 1; // don't count the function value itself int pretop = lua_gettop(L) - 1; // don't count the function value itself
lua_call(L, 0, LUA_MULTRET); lua_call(L, 0, LUA_MULTRET);