mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fix issue with args not being passed in

This commit is contained in:
Reinhard Pointner 2013-10-22 09:15:46 +00:00
parent 3ad6b1f55d
commit d623c07373
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/net/sourceforge/filebot/cli/ScriptShell.java
View File

@ -8,6 +8,7 @@ import java.awt.AWTPermission;
import java.io.File;
import java.io.FilePermission;
import java.io.InputStreamReader;
import java.lang.management.ManagementPermission;
import java.lang.reflect.ReflectPermission;
import java.net.SocketPermission;
import java.net.URI;
@ -170,10 +171,14 @@ class ScriptShell {
Permissions permissions = new Permissions();
permissions.add(new RuntimePermission("createClassLoader"));
permissions.add(new RuntimePermission("accessClassInPackage.*"));
permissions.add(new RuntimePermission("modifyThread"));
permissions.add(new FilePermission("<<ALL FILES>>", "read"));
permissions.add(new SocketPermission("*", "connect"));
permissions.add(new PropertyPermission("*", "read"));
permissions.add(new RuntimePermission("getenv.*"));
permissions.add(new RuntimePermission("getFileSystemAttributes"));
permissions.add(new ManagementPermission("monitor"));
// write permissions for temp and cache folders
permissions.add(new FilePermission(new File(System.getProperty("ehcache.disk.store.dir")).getAbsolutePath() + File.separator + "-", "write, delete"));

9
source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy
View File

@ -257,11 +257,12 @@ List.metaClass.sortBySimilarity = { prime, Closure toStringFunction = { obj -> o
// call scripts
def executeScript(String input, Map bindings = [:], Object... args) {
// apply parent script defines
def parameters = new javax.script.SimpleBindings(bindings != null ? _def : [:])
parameters.putAll(bindings)
def parameters = new javax.script.SimpleBindings()
// initialize default parameter
parameters['args'] = (args as List).flatten().findResults{ it as File }
parameters.putAll(_def)
parameters.putAll(bindings)
parameters.put('args', args.toList().flatten().findResults{ it as File })
// run given script
_shell.runScript(input, parameters)