moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-24 16:58:51 -05:00
Code Issues Releases Wiki Activity

// try to merge overlapping path sections

Browse Source
This commit is contained in:
Reinhard Pointner 2016-04-13 18:41:04 +00:00
parent 69311852d1
commit 92b8592652
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,14 +76,14 @@ class ExpressionFormatter implements MatchFormatter {
// try to resolve against structure root folder by default // try to resolve against structure root folder by default
try { try {
File structureRoot = getStructureRoot(source); File structureRoot = getStructureRoot(source);
File destinationRoot = listPath(parent).get(0); if (structureRoot != null) {
while (structureRoot != null) { for (File f : listPath(parent)) {
// try to merge overlapping path sections if (isStructureRoot(f)) {
if (!structureRoot.getName().equals(destinationRoot.getName())) {
return new File(structureRoot, destination).getPath();
}
structureRoot = structureRoot.getParentFile(); structureRoot = structureRoot.getParentFile();
} }
}
return new File(structureRoot, destination).getPath();
}
} catch (Exception e) { } catch (Exception e) {
debug.log(Level.SEVERE, "Failed to resolve structure root: " + source, e); debug.log(Level.SEVERE, "Failed to resolve structure root: " + source, e);
} }