moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-01-08 12:28:04 -05:00
Code Issues Releases Wiki Activity

Improved SxE sanity checks

Browse Source
This commit is contained in:
Reinhard Pointner 2019-03-15 12:33:46 +07:00
parent 1aba8ecb9b
commit 3007df1a8f
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/net/filebot/media/AutoDetection.java
View File

@ -31,6 +31,7 @@ import java.util.regex.Pattern;
import java.util.stream.Stream;
import net.filebot.similarity.NameSimilarityMetric;
import net.filebot.similarity.SeasonEpisodeMatcher.SxE;
import net.filebot.util.FastFile;
import net.filebot.web.Episode;
import net.filebot.web.Movie;
@ -108,7 +109,7 @@ public class AutoDetection {
}
public boolean isAnime(File f) {
if (parseEpisodeNumber(f.getName(), false) == null) {
if (!findEpisodeNumbers(f.getName(), false)) {
return false;
}
@ -129,6 +130,20 @@ public class AutoDetection {
return metaInfo instanceof Episode && AniDB.getIdentifier().equals(((Episode) metaInfo).getSeriesInfo().getDatabase());
}
private boolean findEpisodeNumbers(String s, boolean strict) {
List<SxE> matches = parseEpisodeNumber(s, strict);
if (matches == null || matches.isEmpty()) {
return false;
}
if (strict) {
return !matches.isEmpty();
}
return matches.stream().anyMatch(m -> m.season < 19 || m.season > 20) || findEpisodeNumbers(s, true);
}
public boolean anyMatch(File file, Pattern pattern) {
// episode characteristics override movie characteristics (e.g. episodes in ~/Movies folder which is considered a volume root)
for (File f = file; f != null && !isVolumeRoot(f); f = f.getParentFile()) {
@ -311,20 +326,20 @@ public class AutoDetection {
public boolean containsMovieYear() {
return m.getYear() >= 1950 && listPathTail(f, 3, true).stream().anyMatch(it -> {
return after(it.getName(), mym).map(amy -> parseEpisodeNumber(amy, false) == null).orElse(false);
return after(it.getName(), mym).map(amy -> !findEpisodeNumbers(amy, false)).orElse(false);
});
}
public boolean containsMovieNameYear() {
return find(mn, snm) && Stream.of(dn, fn).anyMatch(it -> {
return after(it, YEAR).map(ay -> {
return parseEpisodeNumber(ay, false) == null;
return !findEpisodeNumbers(ay, false);
}).orElse(false);
});
}
public boolean containsEpisodeNumbers() {
return parseEpisodeNumber(fn, true) != null || parseDate(fn) != null;
return findEpisodeNumbers(fn, true) || parseDate(fn) != null;
}
public boolean commonNumberPattern() {
@ -341,7 +356,7 @@ public class AutoDetection {
public boolean episodeNumbers() {
String n = stripReleaseInfo(asn, false);
if (parseEpisodeNumber(n, false) != null || find(n, NUMBER_PAIR)) {
if (findEpisodeNumbers(n, false) || find(n, NUMBER_PAIR)) {
return Stream.of(dn, fn).anyMatch(it -> find(it, snm) && !matchMovie(it));
}
return false;
@ -361,7 +376,7 @@ public class AutoDetection {
}
public boolean containsMovieName() {
return fn.contains(mn) && parseEpisodeNumber(after(fn, mnm).orElse(fn), false) == null;
return fn.contains(mn) && !findEpisodeNumbers(after(fn, mnm).orElse(fn), false);
}
public boolean similarNameYear() {