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

* sanity check for SxE values

This commit is contained in:
Reinhard Pointner 2011-11-22 14:44:54 +00:00
parent 47c289420a
commit b08ec77642
4 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
source/net/sourceforge/filebot/similarity/SeasonEpisodeMatcher.java
View File

@ -17,17 +17,17 @@ public class SeasonEpisodeMatcher {
private final SeasonEpisodePattern[] patterns;
public SeasonEpisodeMatcher() {
public SeasonEpisodeMatcher(SeasonEpisodeFilter sanity) {
patterns = new SeasonEpisodePattern[3];
// match patterns like S01E01, s01e02, ... [s01]_[e02], s01.e02, s01e02a, s2010e01 ...
patterns[0] = new SeasonEpisodePattern("(?<!\\p{Alnum})[Ss](\\d{1,2}|\\d{4})[^\\p{Alnum}]{0,3}[Ee](\\d{1,3})(?!\\p{Digit})");
patterns[0] = new SeasonEpisodePattern(sanity, "(?<!\\p{Alnum})[Ss](\\d{1,2}|\\d{4})[^\\p{Alnum}]{0,3}[Ee](\\d{1,3})(?!\\p{Digit})");
// match patterns like 1x01, 1.02, ..., 1x01a, 10x01, 10.02, ...
patterns[1] = new SeasonEpisodePattern("(?<!\\p{Alnum})(\\d{1,2})[x.](\\d{2,3})(?!\\p{Digit})");
patterns[1] = new SeasonEpisodePattern(sanity, "(?<!\\p{Alnum})(\\d{1,2})[x.](\\d{2,3})(?!\\p{Digit})");
// match patterns like 01, 102, 1003 (enclosed in separators)
patterns[2] = new SeasonEpisodePattern("(?<!\\p{Alnum})([0-1]?\\d?)(\\d{2})(?!\\p{Alnum})") {
patterns[2] = new SeasonEpisodePattern(sanity, "(?<!\\p{Alnum})([0-1]?\\d?)(\\d{2})(?!\\p{Alnum})") {
@Override
protected Collection<SxE> process(MatchResult match) {
@ -147,13 +147,35 @@ public class SeasonEpisodeMatcher {
}
protected static class SeasonEpisodePattern {
public static class SeasonEpisodeFilter {
protected final Pattern pattern;
public final int seasonLimit;
public final int seasonEpisodeLimit;
public final int absoluteEpisodeLimit;
public SeasonEpisodePattern(String pattern) {
public SeasonEpisodeFilter(int seasonLimit, int seasonEpisodeLimit, int absoluteEpisodeLimit) {
this.seasonLimit = seasonLimit;
this.seasonEpisodeLimit = seasonEpisodeLimit;
this.absoluteEpisodeLimit = absoluteEpisodeLimit;
}
boolean filter(SxE sxe) {
return (sxe.season >= 0 && sxe.season < seasonLimit && sxe.episode < seasonEpisodeLimit) || (sxe.season < 0 && sxe.episode < absoluteEpisodeLimit);
}
}
public static class SeasonEpisodePattern {
protected final Pattern pattern;
protected final SeasonEpisodeFilter sanity;
public SeasonEpisodePattern(SeasonEpisodeFilter sanity, String pattern) {
this.pattern = Pattern.compile(pattern);
this.sanity = sanity;
}
@ -174,7 +196,11 @@ public class SeasonEpisodeMatcher {
Matcher matcher = matcher(name);
while (matcher.find()) {
matches.addAll(process(matcher));
for (SxE value : process(matcher)) {
if (sanity == null || sanity.filter(value)) {
matches.add(value);
}
}
}
return matches;
@ -182,10 +208,14 @@ public class SeasonEpisodeMatcher {
public int find(CharSequence name, int fromIndex) {
Matcher matcher = matcher(name);
Matcher matcher = matcher(name).region(fromIndex, name.length());
if (matcher.find(fromIndex)) {
return matcher.start();
while (matcher.find()) {
for (SxE value : process(matcher)) {
if (sanity == null || sanity.filter(value)) {
return matcher.start();
}
}
}
return -1;

2
source/net/sourceforge/filebot/similarity/SeasonEpisodeMetric.java
View File

@ -10,7 +10,7 @@ import net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SxE;
public class SeasonEpisodeMetric implements SimilarityMetric {
private final SeasonEpisodeMatcher seasonEpisodeMatcher = new SeasonEpisodeMatcher();
private final SeasonEpisodeMatcher seasonEpisodeMatcher = new SeasonEpisodeMatcher(null);
@Override

3
source/net/sourceforge/filebot/similarity/SeriesNameMatcher.java
View File

@ -21,13 +21,14 @@ import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SeasonEpisodeFilter;
import net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SxE;
import net.sourceforge.tuned.FileUtilities;
public class SeriesNameMatcher {
protected final SeasonEpisodeMatcher seasonEpisodeMatcher = new SeasonEpisodeMatcher();
protected final SeasonEpisodeMatcher seasonEpisodeMatcher = new SeasonEpisodeMatcher(new SeasonEpisodeFilter(30, 50, 1000));
protected final NameSimilarityMetric nameSimilarityMetric = new NameSimilarityMetric();
protected final int commonWordSequenceMaxStartIndex = 3;

2
test/net/sourceforge/filebot/similarity/SeasonEpisodeMatcherTest.java
View File

@ -13,7 +13,7 @@ import net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SxE;
public class SeasonEpisodeMatcherTest {
private static SeasonEpisodeMatcher matcher = new SeasonEpisodeMatcher();
private static SeasonEpisodeMatcher matcher = new SeasonEpisodeMatcher(null);
@Test