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

Refactor

Browse Source
This commit is contained in:
Reinhard Pointner 2016-03-29 08:00:06 +00:00
parent a73952ea81
commit 745b0aede8
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
source/net/filebot/media/MediaDetection.java
View File

@ -338,7 +338,7 @@ public class MediaDetection {
// completely trust xattr metadata if all files are tagged // completely trust xattr metadata if all files are tagged
if (unids.size() == files.size()) { if (unids.size() == files.size()) {
return getUniqueQuerySet(unids, emptySet()); return getUniqueQuerySet(unids);
} }
// try to detect series name via nfo files // try to detect series name via nfo files
@ -351,11 +351,7 @@ public class MediaDetection {
} }
// try to detect series name via known patterns // try to detect series name via known patterns
try { unids.addAll(matchSeriesMappings(files));
unids.addAll(matchSeriesByMapping(files));
} catch (Exception e) {
debug.warning("Failed to match direct mappings: " + e);
}
// guessed queries // guessed queries
List<String> names = new ArrayList<String>(); List<String> names = new ArrayList<String>();
@ -421,7 +417,7 @@ public class MediaDetection {
} }
// match common word sequence and clean detected word sequence from unwanted elements // match common word sequence and clean detected word sequence from unwanted elements
Collection<String> matches = new LinkedHashSet<String>(); Set<String> matches = new LinkedHashSet<String>();
// check for known pattern matches // check for known pattern matches
for (boolean strict : new boolean[] { true, false }) { for (boolean strict : new boolean[] { true, false }) {
@ -459,25 +455,29 @@ public class MediaDetection {
} }
} }
debug.finest(format("Match Series Name => %s %s", names, matches)); debug.finest(format("Match Series Name => %s %s %s", unids, names, matches));
List<String> querySet = getUniqueQuerySet(unids, names);
List<String> querySet = getUniqueQuerySet(unids, names, matches);
debug.finest(format("Query Series => %s", querySet)); debug.finest(format("Query Series => %s", querySet));
return querySet; return querySet;
} }
public static List<String> matchSeriesByMapping(Collection<File> files) throws Exception { public static List<String> matchSeriesMappings(Collection<File> files) {
Map<Pattern, String> patterns = releaseInfo.getSeriesMappings(); try {
List<String> matches = new ArrayList<String>(); Map<Pattern, String> patterns = releaseInfo.getSeriesMappings();
List<String> matches = new ArrayList<String>();
for (File file : files) { for (File file : files) {
patterns.forEach((pattern, seriesName) -> { patterns.forEach((pattern, seriesName) -> {
if (pattern.matcher(getName(file)).find()) { if (pattern.matcher(getName(file)).find()) {
matches.add(seriesName); matches.add(seriesName);
} }
}); });
}
return matches;
} catch (Exception e) {
debug.log(Level.SEVERE, "Failed to load series mappings: " + e.getMessage(), e);
} }
return emptyList();
return matches;
} }
private static final ArrayList<IndexEntry<SearchResult>> seriesIndex = new ArrayList<IndexEntry<SearchResult>>(); private static final ArrayList<IndexEntry<SearchResult>> seriesIndex = new ArrayList<IndexEntry<SearchResult>>();
@ -949,7 +949,7 @@ public class MediaDetection {
return results; return results;
} }
private static List<String> getUniqueQuerySet(Collection<String> exactMatches, Collection<String> guessMatches) { private static List<String> getUniqueQuerySet(Collection<String> exactMatches, Collection<String>... guessMatches) {
Map<String, String> unique = new LinkedHashMap<String, String>(); Map<String, String> unique = new LinkedHashMap<String, String>();
// unique key function (case-insensitive ignore-punctuation) // unique key function (case-insensitive ignore-punctuation)
@ -958,8 +958,10 @@ public class MediaDetection {
// remove blacklisted terms and remove duplicates // remove blacklisted terms and remove duplicates
Set<String> terms = new LinkedHashSet<String>(); Set<String> terms = new LinkedHashSet<String>();
terms.addAll(stripReleaseInfo(guessMatches, true)); for (Collection<String> it : guessMatches) {
terms.addAll(stripReleaseInfo(guessMatches, false)); terms.addAll(stripReleaseInfo(it, true));
terms.addAll(stripReleaseInfo(it, false));
}
addUniqueQuerySet(stripBlacklistedTerms(terms), normalize, normalize, unique); addUniqueQuerySet(stripBlacklistedTerms(terms), normalize, normalize, unique);
return new ArrayList<String>(unique.values()); return new ArrayList<String>(unique.values());
@ -1474,7 +1476,7 @@ public class MediaDetection {
// load filter data // load filter data
MediaDetection.getClutterFileFilter(); MediaDetection.getClutterFileFilter();
MediaDetection.getDiskFolderFilter(); MediaDetection.getDiskFolderFilter();
MediaDetection.matchSeriesByMapping(emptyList()); MediaDetection.matchSeriesMappings(emptyList());
// load movie/series index // load movie/series index
MediaDetection.stripReleaseInfo(singleton(""), true); MediaDetection.stripReleaseInfo(singleton(""), true);