* fix various possible movie detection issues
TEST-DATA: [www.Cpasbien.me] Django.Unchained.2012.FRENCH.BDRip.XviD-AYMO\[www.Cpasbien.me] aymo-django.xvid.cd1.avi
This commit is contained in:
parent
18df1820a7
commit
95ff15d475
|
@ -629,12 +629,12 @@ public class MediaDetection {
|
|||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
return movieFile.getParentFile();
|
||||
}
|
||||
|
||||
|
||||
public static Movie checkMovie(File file) throws Exception {
|
||||
List<Movie> matches = file != null ? matchMovieName(singleton(file.getName()), false, 2) : null;
|
||||
List<Movie> matches = file != null ? matchMovieName(singleton(file.getName()), false, 4) : null;
|
||||
return matches != null && matches.size() > 0 ? matches.get(0) : null;
|
||||
}
|
||||
|
||||
|
|
|
@ -139,7 +139,7 @@ public class ReleaseInfo {
|
|||
List<String> output = new ArrayList<String>(items.size());
|
||||
for (String it : items) {
|
||||
it = strict ? clean(it, stopwords) : substringBefore(it, stopwords);
|
||||
it = clean(it, blacklist);
|
||||
it = normalizePunctuation(clean(it, blacklist));
|
||||
|
||||
// ignore empty values
|
||||
if (it.length() > 0) {
|
||||
|
@ -155,8 +155,7 @@ public class ReleaseInfo {
|
|||
for (Pattern it : blacklisted) {
|
||||
item = it.matcher(item).replaceAll("");
|
||||
}
|
||||
|
||||
return normalizePunctuation(item);
|
||||
return item;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -227,6 +227,7 @@ unrated
|
|||
unrated.edition
|
||||
UsaBit.com
|
||||
video[s]?
|
||||
www.Cpasbien.me
|
||||
www[.][\w-.]+[.](com|net|tk|ro|cd)
|
||||
xRipp
|
||||
XtremeDoN
|
||||
|
|
Loading…
Reference in New Issue