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

* fix -script g:code URI encoding problems

This commit is contained in:
Reinhard Pointner 2012-08-11 12:23:30 +00:00
parent b5cdd5fd63
commit d56f19f9c3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/net/sourceforge/filebot/cli/ArgumentProcessor.java
View File

@ -128,7 +128,7 @@ public class ArgumentProcessor {
Analytics.trackEvent("CLI", "ExecuteScript", script.getScheme()); Analytics.trackEvent("CLI", "ExecuteScript", script.getScheme());
ScriptShell shell = new ScriptShell(cli, args, AccessController.getContext(), scriptProvider); ScriptShell shell = new ScriptShell(cli, args, AccessController.getContext(), scriptProvider);
shell.runScript(script.toString(), bindings); shell.runScript(script, bindings);
} }
CLILogger.finest("Done ヾ(＠⌒ー⌒＠)ノ"); CLILogger.finest("Done ヾ(＠⌒ー⌒＠)ノ");

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

@ -83,9 +83,12 @@ class ScriptShell {
public Object runScript(String input, Bindings bindings) throws Throwable { public Object runScript(String input, Bindings bindings) throws Throwable {
URI resource = scriptProvider.getScriptLocation(input); return runScript(scriptProvider.getScriptLocation(input), bindings);
Script script = scriptProvider.fetchScript(resource); }
public Object runScript(URI resource, Bindings bindings) throws Throwable {
Script script = scriptProvider.fetchScript(resource);
return evaluate(script.code, bindings, script.trusted); return evaluate(script.code, bindings, script.trusted);
} }