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

Fix various AutoDetection issues

This commit is contained in:
Reinhard Pointner 2019-01-30 23:05:23 +07:00
parent 41fbc3516c
commit dfa4f78448
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@ public class AutoDetection {
}
public boolean isAnime(File f) {
if (MediaDetection.parseEpisodeNumber(f.getName(), false) == null) {
if (parseEpisodeNumber(f.getName(), false) == null) {
return false;
}
@ -131,7 +131,7 @@ public class AutoDetection {
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 && !MediaDetection.isVolumeRoot(f); f = f.getParentFile()) {
for (File f = file; f != null && !isVolumeRoot(f); f = f.getParentFile()) {
if (pattern.matcher(f.getName()).matches()) {
return true;
}
@ -202,7 +202,7 @@ public class AutoDetection {
}
private List<Movie> getMovieMatches(File file, boolean strict) throws Exception {
return MediaDetection.detectMovie(file, TheMovieDB, locale, strict);
return detectMovie(file, TheMovieDB, locale, strict);
}
private List<File> getVideoFiles(File parent) {
@ -252,6 +252,10 @@ public class AutoDetection {
return new NameSimilarityMetric().getSimilarity(self, other);
}
private boolean matchMovie(String name) {
return matchMovieName(singleton(name), true, 0).size() > 0;
}
public Group apply() throws Exception {
List<Rule> rules = new ArrayList<Rule>(15);
rules.add(new Rule(-1, 0, this::equalsMovieName, "AutoDetection::equalsMovieName"));
@ -322,13 +326,13 @@ public class AutoDetection {
}
public boolean episodeWithoutNumbers() throws Exception {
return find(asn, DASH) && getMovieMatches(f, true).isEmpty();
return find(asn, DASH) && !matchMovie(fn);
}
public boolean episodeNumbers() throws Exception {
String n = stripReleaseInfo(asn, false);
if (parseEpisodeNumber(n, false) != null || NUMBER_PAIR.matcher(n).find()) {
return Stream.of(dn, fn).anyMatch(it -> snm.matcher(it).find()) && matchMovieName(singleton(fn), true, 0).isEmpty();
return Stream.of(dn, fn).anyMatch(it -> snm.matcher(it).find() && !matchMovie(it));
}
return false;
}