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

try to resolve against structure root folder by default

This commit is contained in:
Reinhard Pointner 2016-04-13 11:22:06 +00:00
parent e0cc5eb771
commit 4d87f4c456
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source/net/filebot/ui/rename/ExpressionFormatter.java
View File

@ -1,8 +1,12 @@
package net.filebot.ui.rename; package net.filebot.ui.rename;
import static net.filebot.Logging.*;
import static net.filebot.media.MediaDetection.*;
import java.io.File; import java.io.File;
import java.text.Format; import java.text.Format;
import java.util.Map; import java.util.Map;
import java.util.logging.Level;
import javax.script.ScriptException; import javax.script.ScriptException;
@ -25,7 +29,6 @@ class ExpressionFormatter implements MatchFormatter {
this.expression = expression; this.expression = expression;
this.preview = preview; this.preview = preview;
this.target = target; this.target = target;
} }
@Override @Override
@ -48,14 +51,39 @@ class ExpressionFormatter implements MatchFormatter {
// evaluate the expression using the given bindings // evaluate the expression using the given bindings
Object bindingBean = new MediaBindingBean(match.getValue(), (File) match.getCandidate(), (Map) context); Object bindingBean = new MediaBindingBean(match.getValue(), (File) match.getCandidate(), (Map) context);
String result = format.format(bindingBean).trim(); String destination = format.format(bindingBean).trim();
// if result is empty, check for script exceptions // if result is empty, check for script exceptions
if (result.isEmpty() && format.caughtScriptException() != null) { if (destination.isEmpty() && format.caughtScriptException() != null) {
throw format.caughtScriptException(); throw format.caughtScriptException();
} }
return result; return getPath((File) match.getCandidate(), destination);
}
private String getPath(File source, String destination) {
if (source == null) {
return destination;
}
// resolve against parent folder
File parent = new File(destination).getParentFile();
if (parent == null || parent.isAbsolute() || parent.getPath().startsWith(".")) {
return destination;
}
// try to resolve against structure root folder by default
try {
File structureRoot = getStructureRoot(source);
if (structureRoot != null) {
return new File(structureRoot, destination).getPath();
}
} catch (Exception e) {
debug.log(Level.SEVERE, "Failed to resolve structure root: " + source, e);
}
// resolve against parent folder by default
return destination;
} }
} }