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

* fix series index

Browse Source
This commit is contained in:
Reinhard Pointner 2014-03-10 06:21:25 +00:00
parent de3c4ebd23
commit 1495ba19e4
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BuildData.groovy
View File

@ -223,7 +223,7 @@ tvdb.values().each{ r ->
def rating = r[5] def rating = r[5]
def votes = r[6] def votes = r[6]
if ((votes >= 5 && rating >= 4.0) || (votes >= 2 && rating >= 8.0)) { if ((votes >= 5 && rating >= 4) || (votes >= 2 && rating >= 8) || (votes >= 1 && rating >= 10)) {
getNamePermutations([tvdb_name, imdb_name]).each{ n -> getNamePermutations([tvdb_name, imdb_name]).each{ n ->
thetvdb_index << [tvdb_id, n] thetvdb_index << [tvdb_id, n]
} }

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

@ -321,13 +321,24 @@ public class MediaDetection {
Logger.getLogger(MediaDetection.class.getClass().getName()).log(Level.WARNING, "Failed to match direct mappings: " + e.getMessage(), e); Logger.getLogger(MediaDetection.class.getClass().getName()).log(Level.WARNING, "Failed to match direct mappings: " + e.getMessage(), e);
} }
// strict series name matcher for recognizing 1x01 patterns
SeriesNameMatcher snm = new SeriesNameMatcher(locale, true);
// cross-reference known series names against file structure // cross-reference known series names against file structure
try { try {
Set<String> folders = new LinkedHashSet<String>(); Set<String> folders = new LinkedHashSet<String>();
Set<String> filenames = new LinkedHashSet<String>(); Set<String> filenames = new LinkedHashSet<String>();
for (File f : files) { for (File f : files) {
for (int i = 0; i < 3 && f != null && !isStructureRoot(f); i++, f = f.getParentFile()) { for (int i = 0; i < 3 && f != null && !isStructureRoot(f); i++, f = f.getParentFile()) {
(i == 0 ? filenames : folders).add(normalizeBrackets(getName(f))); String fn = getName(f);
// try to minimize noise
String sn = snm.matchByEpisodeIdentifier(fn);
if (sn != null) {
fn = sn;
}
(i == 0 ? filenames : folders).add(normalizeBrackets(fn));
} }
} }
@ -343,7 +354,6 @@ public class MediaDetection {
// use lenient sub sequence matching only as fallback and try name without spacing logic that may mess up any lookup // use lenient sub sequence matching only as fallback and try name without spacing logic that may mess up any lookup
if (matches.isEmpty()) { if (matches.isEmpty()) {
// try to narrow down file to series name as best as possible // try to narrow down file to series name as best as possible
SeriesNameMatcher snm = new SeriesNameMatcher();
List<String> sns = new ArrayList<String>(); List<String> sns = new ArrayList<String>();
sns.addAll(folders); sns.addAll(folders);
sns.addAll(filenames); sns.addAll(filenames);
@ -375,7 +385,6 @@ public class MediaDetection {
Collection<String> matches = new LinkedHashSet<String>(); Collection<String> matches = new LinkedHashSet<String>();
// check CWS matches // check CWS matches
SeriesNameMatcher snm = new SeriesNameMatcher(locale, true);
matches.addAll(snm.matchAll(files.toArray(new File[files.size()]))); matches.addAll(snm.matchAll(files.toArray(new File[files.size()])));
// check for known pattern matches // check for known pattern matches