moparisthebest
/
filebot
mirror of https://github.com/mitb-archive/filebot
1
0
Fork 0
Code Issues Releases Wiki Activity

support custom groovy scripts (via files)

This commit is contained in:
Reinhard Pointner 2019-06-07 19:24:35 +07:00
parent 62238e507e
commit dbcddd02e3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/net/filebot/cli/ArgumentBean.java
View File

@ -232,17 +232,22 @@ public class ArgumentBean {
return files; return files;
} }
public RenameAction getRenameAction() { public RenameAction getRenameAction() throws Exception {
// support custom executables (via absolute path) // support custom executables (via absolute path)
if (action.startsWith("/")) { if (action.startsWith("/")) {
return new ExecutableRenameAction(action, getOutputPath()); return new ExecutableRenameAction(action, getOutputPath());
} }
// support custom groovy scripts (via closures) // support custom groovy scripts (via closures)
if (action.startsWith("{")) { if (action.startsWith("{") || action.endsWith("}")) {
return new GroovyRenameAction(action); return new GroovyRenameAction(action);
} }
// support custom groovy scripts (via files)
if (action.endsWith(".groovy")) {
return new GroovyRenameAction(readTextFile(new File(action)));
}
return StandardRenameAction.forName(action); return StandardRenameAction.forName(action);
} }

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

@ -512,7 +512,7 @@ public abstract class ScriptShellBaseClass extends Script {
return map; return map;
} }
private RenameAction getRenameAction(Map<String, ?> parameters) { private RenameAction getRenameAction(Map<String, ?> parameters) throws Exception {
return consumeParameter(parameters, "action").map(action -> { return consumeParameter(parameters, "action").map(action -> {
return getRenameAction(action); return getRenameAction(action);
}).findFirst().orElse(getArgumentBean().getRenameAction()); // default to global rename action }).findFirst().orElse(getArgumentBean().getRenameAction()); // default to global rename action