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

* add some stop-folder logic for movie structures

Browse Source
This commit is contained in:
Reinhard Pointner 2013-11-16 05:37:41 +00:00
parent 2b09bd1414
commit 27f272077d
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/net/sourceforge/filebot/media/MediaDetection.java
View File

@ -701,7 +701,7 @@ public class MediaDetection {
File f = movieFile; File f = movieFile;
// check for double nested structures // check for double nested structures
if (checkMovie(f.getParentFile(), false) != null && checkMovie(f, false) == null) { if (!isStructureRoot(f.getParentFile()) && checkMovie(f.getParentFile(), false) != null && checkMovie(f, false) == null) {
return f.getParentFile(); return f.getParentFile();
} else { } else {
return f; return f;
@ -711,7 +711,7 @@ public class MediaDetection {
// first parent folder that matches a movie (max 3 levels deep) // first parent folder that matches a movie (max 3 levels deep)
for (boolean strictness : new boolean[] { true, false }) { for (boolean strictness : new boolean[] { true, false }) {
File f = movieFile.getParentFile(); File f = movieFile.getParentFile();
for (int i = 0; f != null && i < 3; f = f.getParentFile(), i++) { for (int i = 0; f != null && i < 3 && !isStructureRoot(f); f = f.getParentFile(), i++) {
String term = stripReleaseInfo(f.getName()); String term = stripReleaseInfo(f.getName());
if (term.length() > 0 && checkMovie(f, strictness) != null) { if (term.length() > 0 && checkMovie(f, strictness) != null) {
return f; return f;
@ -721,7 +721,7 @@ public class MediaDetection {
// otherwise try the first potentially meaningful parent folder (max 2 levels deep) // otherwise try the first potentially meaningful parent folder (max 2 levels deep)
File f = movieFile.getParentFile(); File f = movieFile.getParentFile();
for (int i = 0; f != null && i < 2; f = f.getParentFile(), i++) { for (int i = 0; f != null && i < 2 && !isStructureRoot(f); f = f.getParentFile(), i++) {
String term = stripReleaseInfo(f.getName()); String term = stripReleaseInfo(f.getName());
if (term.length() > 0) { if (term.length() > 0) {
// check for double nested structures // check for double nested structures
@ -733,7 +733,7 @@ public class MediaDetection {
} }
} }
if (movieFile.getParentFile() != null && stripReleaseInfo(movieFile.getParentFile().getName()).length() > 0) { if (movieFile.getParentFile() != null && !isStructureRoot(f.getParentFile()) && stripReleaseInfo(movieFile.getParentFile().getName()).length() > 0) {
return movieFile.getParentFile(); return movieFile.getParentFile();
} }
return null; return null;
@ -886,6 +886,10 @@ public class MediaDetection {
} }
} }
public static boolean isStructureRoot(File folder) throws IOException {
return releaseInfo.getStructureRootPattern().matcher(folder.getName()).matches();
}
public static List<String> stripReleaseInfo(Collection<String> names, boolean strict) throws IOException { public static List<String> stripReleaseInfo(Collection<String> names, boolean strict) throws IOException {
return releaseInfo.cleanRelease(names, strict); return releaseInfo.cleanRelease(names, strict);
} }

16
source/net/sourceforge/filebot/media/ReleaseInfo.java
View File

@ -166,6 +166,22 @@ public class ReleaseInfo {
return item; return item;
} }
// cached patterns
private Pattern structureRootFolderPattern;
public Pattern getStructureRootPattern() throws IOException {
if (structureRootFolderPattern == null) {
List<String> folders = new ArrayList<String>();
for (String it : queryBlacklistResource.get()) {
if (it.startsWith("^")) {
folders.add(it);
}
}
structureRootFolderPattern = compile(join(folders, "|"), CASE_INSENSITIVE | UNICODE_CASE);
}
return structureRootFolderPattern;
}
public Pattern getLanguageTagPattern(Collection<String> languages) { public Pattern getLanguageTagPattern(Collection<String> languages) {
// [en] // [en]
return compile("(?<=[-\\[{(])(" + join(quoteAll(languages), "|") + ")(?=\\p{Punct})", CASE_INSENSITIVE | UNICODE_CASE); return compile("(?<=[-\\[{(])(" + join(quoteAll(languages), "|") + ")(?=\\p{Punct})", CASE_INSENSITIVE | UNICODE_CASE);