moparisthebest
/
filebot
mirror of https://github.com/mitb-archive/filebot
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix series lookup issues (short series names)

This commit is contained in:
Reinhard Pointner 2016-03-30 21:42:54 +00:00
parent 97cf4800b8
commit 00e5eed75b
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,9 +350,6 @@ public class MediaDetection {
// try to detect series name via known patterns // try to detect series name via known patterns
unids.addAll(matchSeriesMappings(files)); unids.addAll(matchSeriesMappings(files));
// guessed queries
List<String> names = new ArrayList<String>();
// strict series name matcher for recognizing 1x01 patterns // strict series name matcher for recognizing 1x01 patterns
SeriesNameMatcher strictSeriesNameMatcher = getSeriesNameMatcher(true); SeriesNameMatcher strictSeriesNameMatcher = getSeriesNameMatcher(true);
@ -399,32 +396,31 @@ public class MediaDetection {
matches.add(it.getName()); matches.add(it.getName());
} }
// less reliable CWS deep matching
matches.addAll(matchSeriesByName(folders, 2, index)); matches.addAll(matchSeriesByName(folders, 2, index));
matches.addAll(matchSeriesByName(filenames, 2, index)); matches.addAll(matchSeriesByName(filenames, 2, index));
// pass along only valid terms // pass along only valid terms
names.addAll(stripBlacklistedTerms(matches)); unids.addAll(stripBlacklistedTerms(matches));
} else { } else {
// trust terms matched by 0-stance // trust terms matched by 0-stance
names.addAll(matches); unids.addAll(matches);
} }
} catch (Exception e) { } catch (Exception e) {
debug.warning("Failed to match folder structure: " + e); debug.warning("Failed to match folder structure: " + e);
} }
// match common word sequence and clean detected word sequence from unwanted elements // match common word sequence and clean detected word sequence from unwanted elements
Set<String> matches = new LinkedHashSet<String>(); Set<String> queries = 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 }) {
if (matches.isEmpty()) { if (queries.isEmpty()) {
// check CWS matches // check CWS matches
SeriesNameMatcher seriesNameMatcher = getSeriesNameMatcher(strict); SeriesNameMatcher seriesNameMatcher = getSeriesNameMatcher(strict);
matches.addAll(strictSeriesNameMatcher.matchAll(files.toArray(new File[files.size()]))); queries.addAll(strictSeriesNameMatcher.matchAll(files.toArray(new File[files.size()])));
// try before SxE pattern // try before SxE pattern
if (matches.isEmpty()) { if (queries.isEmpty()) {
for (File f : files) { for (File f : files) {
for (File path : listPathTail(f, 2, true)) { for (File path : listPathTail(f, 2, true)) {
String fn = getName(path); String fn = getName(path);
@ -443,7 +439,7 @@ public class MediaDetection {
} }
} }
} }
matches.add(sn); queries.add(sn);
break; break;
} }
} }
@ -452,9 +448,9 @@ public class MediaDetection {
} }
} }
debug.finest(format("Match Series Name => %s %s %s", unids, names, matches)); debug.finest(format("Match Series Name => %s %s", unids, queries));
List<String> querySet = getUniqueQuerySet(unids, names, matches); List<String> querySet = getUniqueQuerySet(unids, queries);
debug.finest(format("Query Series => %s", querySet)); debug.finest(format("Query Series => %s", querySet));
return querySet; return querySet;
} }