mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Cancel karaoke templater execution immediately when an error occurs

Browse source 
Closes #1849.
This commit is contained in:
Thomas Goyne 2015-03-01 11:22:49 -08:00
parent 9466c98fd7
commit 7a8fda007d
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
automation/autoload/kara-templater.lua
View file

@ -635,6 +635,7 @@ function run_code_template(template, tenv)
local f, err = loadstring(template.code, "template code") local f, err = loadstring(template.code, "template code")
if not f then if not f then
aegisub.debug.out(2, "Failed to parse Lua code: %s\nCode that failed to parse: %s\n\n", err, template.code) aegisub.debug.out(2, "Failed to parse Lua code: %s\nCode that failed to parse: %s\n\n", err, template.code)
aegisub.cancel()
else else
local pcall = pcall local pcall = pcall
setfenv(f, tenv) setfenv(f, tenv)
@ -642,6 +643,7 @@ function run_code_template(template, tenv)
local res, err = pcall(f) local res, err = pcall(f)
if not res then if not res then
aegisub.debug.out(2, "Runtime error in template code: %s\nCode producing error: %s\n\n", err, template.code) aegisub.debug.out(2, "Runtime error in template code: %s\nCode producing error: %s\n\n", err, template.code)
aegisub.cancel()
end end
end end
end end
@ -675,7 +677,7 @@ function run_text_template(template, tenv, varctx)
f, err = loadstring(string.format("return (%s)", expression)) f, err = loadstring(string.format("return (%s)", expression))
if (err) ~= nil then if (err) ~= nil then
aegisub.debug.out(2, "Error parsing expression: %s\nExpression producing error: %s\nTemplate with expression: %s\n\n", err, expression, template) aegisub.debug.out(2, "Error parsing expression: %s\nExpression producing error: %s\nTemplate with expression: %s\n\n", err, expression, template)
return "!" .. expression .. "!" aegisub.cancel()
else else
setfenv(f, tenv) setfenv(f, tenv)
local res, val = pcall(f) local res, val = pcall(f)
@ -683,7 +685,7 @@ function run_text_template(template, tenv, varctx)
return val return val
else else
aegisub.debug.out(2, "Runtime error in template expression: %s\nExpression producing error: %s\nTemplate with expression: %s\n\n", val, expression, template) aegisub.debug.out(2, "Runtime error in template expression: %s\nExpression producing error: %s\nTemplate with expression: %s\n\n", val, expression, template)
return "!" .. expression .. "!" aegisub.cancel()
end end
end end
end end