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

Make executeScript() easier to use

This commit is contained in:
Reinhard Pointner 2017-01-07 01:11:32 +08:00
parent 3f56e58b8b
commit 5c1c3f9f5c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/net/filebot/cli/ScriptShellBaseClass.java
View File

@ -113,7 +113,7 @@ public abstract class ScriptShellBaseClass extends Script {
return executeScript(input, asList(getArgumentBean().getArgumentArray()), bindings, asFileList(args));
}
public Object executeScript(String input, List<String> argv, Map<String, ?> bindings, List<File> args) throws Throwable {
public Object executeScript(String input, List<String> argv, Map<String, ?> bindings, List<?> args) throws Throwable {
// apply parent script defines
Bindings parameters = new SimpleBindings();
@ -122,8 +122,8 @@ public abstract class ScriptShellBaseClass extends Script {
parameters.putAll(bindings);
}
parameters.put(ScriptShell.SHELL_ARGS_BINDING_NAME, new ArgumentBean(argv != null ? argv.toArray(new String[0]) : new String[0]));
parameters.put(ScriptShell.ARGV_BINDING_NAME, args != null ? new ArrayList<File>(args) : new ArrayList<File>());
parameters.put(ScriptShell.SHELL_ARGS_BINDING_NAME, argv != null ? new ArgumentBean(argv.toArray(new String[0])) : new ArgumentBean());
parameters.put(ScriptShell.ARGV_BINDING_NAME, args != null ? asFileList(args) : new ArrayList<File>());
// run given script
return getShell().runScript(input, parameters);