moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-08-13 17:03:45 -04:00
Code Issues Releases Wiki Activity

* properly deal with space sequences by default

Browse Source
This commit is contained in:
Reinhard Pointner 2014-06-28 06:07:45 +00:00
parent 1a4c3691b2
commit 07568068c5
2 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/net/filebot/format/ExpressionFormat.java
View File

@ -1,6 +1,5 @@
package net.filebot.format; package net.filebot.format;
import static net.filebot.similarity.Normalization.*;
import static net.filebot.util.ExceptionUtilities.*; import static net.filebot.util.ExceptionUtilities.*;
import static net.filebot.util.FileUtilities.*; import static net.filebot.util.FileUtilities.*;
import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyClassLoader;
@ -24,6 +23,8 @@ import javax.script.ScriptEngine;
import javax.script.ScriptException; import javax.script.ScriptException;
import javax.script.SimpleScriptContext; import javax.script.SimpleScriptContext;
import net.filebot.similarity.Normalization;
import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.CompilerConfiguration;
import org.codehaus.groovy.control.MultipleCompilationErrorsException; import org.codehaus.groovy.control.MultipleCompilationErrorsException;
import org.codehaus.groovy.control.customizers.ImportCustomizer; import org.codehaus.groovy.control.customizers.ImportCustomizer;
@ -163,10 +164,10 @@ public class ExpressionFormat extends Format {
@Override @Override
public StringBuffer format(Object object, StringBuffer sb, FieldPosition pos) { public StringBuffer format(Object object, StringBuffer sb, FieldPosition pos) {
return format(getBindings(object), sb); return sb.append(format(getBindings(object)));
} }
public StringBuffer format(Bindings bindings, StringBuffer sb) { public String format(Bindings bindings) {
// use privileged bindings so we are not restricted by the script sandbox // use privileged bindings so we are not restricted by the script sandbox
Bindings priviledgedBindings = PrivilegedInvocation.newProxy(Bindings.class, bindings, AccessController.getContext()); Bindings priviledgedBindings = PrivilegedInvocation.newProxy(Bindings.class, bindings, AccessController.getContext());
@ -177,11 +178,11 @@ public class ExpressionFormat extends Format {
// reset exception state // reset exception state
lastException = null; lastException = null;
StringBuilder sb = new StringBuilder();
for (Object snipped : compilation) { for (Object snipped : compilation) {
if (snipped instanceof CompiledScript) { if (snipped instanceof CompiledScript) {
try { try {
Object value = normalizeExpressionValue(((CompiledScript) snipped).eval(context)); Object value = normalizeExpressionValue(((CompiledScript) snipped).eval(context));
if (value != null) { if (value != null) {
sb.append(value); sb.append(value);
} }
@ -193,13 +194,13 @@ public class ExpressionFormat extends Format {
} }
} }
return sb; return Normalization.replaceSpace(sb.toString(), " ").trim();
} }
protected Object normalizeBindingValue(Object value) { protected Object normalizeBindingValue(Object value) {
// if the binding value is a String, remove illegal characters // if the binding value is a String, remove illegal characters
if (value instanceof CharSequence) { if (value instanceof CharSequence) {
return replaceSpace(replacePathSeparators((CharSequence) value), " ").trim(); return replacePathSeparators((CharSequence) value, " ").trim();
} }
// if the binding value is an Object, just leave it // if the binding value is an Object, just leave it

9
source/net/filebot/ui/list/ListPanel.java
View File

@ -1,7 +1,5 @@
package net.filebot.ui.list; package net.filebot.ui.list;
import static java.awt.Font.*; import static java.awt.Font.*;
import static java.lang.Math.*; import static java.lang.Math.*;
import static net.filebot.ui.NotificationLogging.*; import static net.filebot.ui.NotificationLogging.*;
@ -30,7 +28,6 @@ import javax.swing.JTextField;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import javax.swing.SpinnerNumberModel; import javax.swing.SpinnerNumberModel;
import net.miginfocom.swing.MigLayout;
import net.filebot.format.ExpressionFormat; import net.filebot.format.ExpressionFormat;
import net.filebot.similarity.SeriesNameMatcher; import net.filebot.similarity.SeriesNameMatcher;
import net.filebot.ui.FileBotList; import net.filebot.ui.FileBotList;
@ -39,7 +36,7 @@ import net.filebot.ui.transfer.LoadAction;
import net.filebot.ui.transfer.SaveAction; import net.filebot.ui.transfer.SaveAction;
import net.filebot.util.ExceptionUtilities; import net.filebot.util.ExceptionUtilities;
import net.filebot.util.ui.TunedUtilities; import net.filebot.util.ui.TunedUtilities;
import net.miginfocom.swing.MigLayout;
public class ListPanel extends JComponent { public class ListPanel extends JComponent {
@ -49,7 +46,6 @@ public class ListPanel extends JComponent {
private SpinnerNumberModel fromSpinnerModel = new SpinnerNumberModel(1, 0, Integer.MAX_VALUE, 1); private SpinnerNumberModel fromSpinnerModel = new SpinnerNumberModel(1, 0, Integer.MAX_VALUE, 1);
private SpinnerNumberModel toSpinnerModel = new SpinnerNumberModel(20, 0, Integer.MAX_VALUE, 1); private SpinnerNumberModel toSpinnerModel = new SpinnerNumberModel(20, 0, Integer.MAX_VALUE, 1);
public ListPanel() { public ListPanel() {
list.setTitle("Title"); list.setTitle("Title");
@ -88,7 +84,6 @@ public class ListPanel extends JComponent {
TunedUtilities.installAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), createAction); TunedUtilities.installAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), createAction);
} }
private AbstractAction createAction = new AbstractAction("Create") { private AbstractAction createAction = new AbstractAction("Create") {
@Override @Override
@ -124,7 +119,7 @@ public class ListPanel extends JComponent {
bindings.put("from", from); bindings.put("from", from);
bindings.put("to", to); bindings.put("to", to);
names.add(format.format(bindings, new StringBuffer()).toString()); names.add(format.format(bindings));
} }
if (signum(to - from) < 0) { if (signum(to - from) < 0) {