* use proper Groovy DefaultTypeTransformation instead of hacky "value as boolean" script

This commit is contained in:
Reinhard Pointner 2014-04-17 06:14:38 +00:00
parent ed9413afe7
commit 03ce43e6f9
1 changed files with 20 additions and 35 deletions

View File

@ -1,7 +1,5 @@
package net.sourceforge.filebot.format;
import java.security.AccessController;
import javax.script.Bindings;
@ -9,44 +7,36 @@ import javax.script.Compilable;
import javax.script.CompiledScript;
import javax.script.ScriptContext;
import javax.script.ScriptException;
import javax.script.SimpleBindings;
import javax.script.SimpleScriptContext;
import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
public class ExpressionFilter {
private final String expression;
private final CompiledScript userScript;
private final CompiledScript asBooleanScript;
private final CompiledScript compiledExpression;
private Throwable lastException;
public ExpressionFilter(String expression) throws ScriptException {
this.expression = expression;
Compilable engine = (Compilable) ExpressionFormat.getGroovyScriptEngine();
this.userScript = new SecureCompiledScript(engine.compile(expression)); // sandboxed script
this.asBooleanScript = engine.compile("value as Boolean");
this.compiledExpression = new SecureCompiledScript(engine.compile(expression)); // sandboxed script
}
public String getExpression() {
return expression;
}
public Throwable getLastException() {
return lastException;
}
public boolean matches(Object value) throws ScriptException {
return matches(new ExpressionBindings(value));
}
public boolean matches(Bindings bindings) throws ScriptException {
this.lastException = null;
@ -59,15 +49,10 @@ public class ExpressionFilter {
try {
// evaluate user script
Object value = userScript.eval(context);
Object value = compiledExpression.eval(context);
// convert value to boolean
Bindings valueBinding = new SimpleBindings();
valueBinding.put("value", value);
Object result = asBooleanScript.eval(valueBinding);
if (result instanceof Boolean) {
return (Boolean) result;
}
// value as boolean
return DefaultTypeTransformation.castToBoolean(value);
} catch (Throwable e) {
// ignore any and all scripting exceptions
this.lastException = e;