mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Change the naming scheme for lua commands to 'automation/lua/[Script File Name]/[Macro Name]'

Browse source 
Originally committed to SVN as r5664.
This commit is contained in:
Thomas Goyne 2011-09-28 19:52:20 +00:00
parent 799c18e22d
commit c632a662b2
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
aegisub/src/auto4_lua.cpp
View file

@ -210,6 +210,7 @@ namespace Automation4 {
lua_pushcfunction(L, luaopen_io); lua_call(L, 0, 0); lua_pushcfunction(L, luaopen_io); lua_call(L, 0, 0);
lua_pushcfunction(L, luaopen_os); lua_call(L, 0, 0); lua_pushcfunction(L, luaopen_os); lua_call(L, 0, 0);
_stackcheck.check_stack(0); _stackcheck.check_stack(0);
// dofile and loadfile are replaced with include // dofile and loadfile are replaced with include
lua_pushnil(L); lua_pushnil(L);
lua_setglobal(L, "dofile"); lua_setglobal(L, "dofile");
@ -240,6 +241,12 @@ namespace Automation4 {
_stackcheck.check_stack(0); _stackcheck.check_stack(0);
// prepare stuff in the registry // prepare stuff in the registry
// store the script's filename
lua_pushstring(L, wxFileName(GetFilename()).GetName().utf8_str().data());
lua_setfield(L, LUA_REGISTRYINDEX, "filename");
_stackcheck.check_stack(0);
// reference to the script object // reference to the script object
lua_pushlightuserdata(L, this); lua_pushlightuserdata(L, this);
lua_setfield(L, LUA_REGISTRYINDEX, "aegisub"); lua_setfield(L, LUA_REGISTRYINDEX, "aegisub");
@ -539,11 +546,13 @@ namespace Automation4 {
LuaCommand::LuaCommand(lua_State *L) LuaCommand::LuaCommand(lua_State *L)
: LuaFeature(L) : LuaFeature(L)
, cmd_name(std::string("automation/cmd/") + lua_tostring(L, 1))
, display(check_wxstring(L, 1)) , display(check_wxstring(L, 1))
, help(get_wxstring(L, 2)) , help(get_wxstring(L, 2))
, cmd_type(cmd::COMMAND_NORMAL) , cmd_type(cmd::COMMAND_NORMAL)
{ {
lua_getfield(L, LUA_REGISTRYINDEX, "filename");
cmd_name = STD_STR(wxString::Format("automation/lua/%s/%s", get_wxstring(L, -1), check_wxstring(L, 1)));
if (!lua_isfunction(L, 3)) if (!lua_isfunction(L, 3))
luaL_error(L, "The macro processing function must be a function"); luaL_error(L, "The macro processing function must be a function");