From e817ca46897e040300cdb4f10864375400b6a0cc Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Thu, 15 Nov 2012 13:48:28 +0000 Subject: [PATCH] * cover more special cases with series name detection * better respect query-blacklist by applying it before removing any tokens using other patterns --- source/net/sourceforge/filebot/media/MediaDetection.java | 3 ++- source/net/sourceforge/filebot/media/ReleaseInfo.java | 2 +- website/data/query-blacklist.txt | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/net/sourceforge/filebot/media/MediaDetection.java b/source/net/sourceforge/filebot/media/MediaDetection.java index 25f993e8..6875c2d5 100644 --- a/source/net/sourceforge/filebot/media/MediaDetection.java +++ b/source/net/sourceforge/filebot/media/MediaDetection.java @@ -283,7 +283,8 @@ public class MediaDetection { // check all filenames if necessary if (matches.isEmpty()) { - matches = matchSeriesByName(stripReleaseInfo(filenames, true), 0); + matches.addAll(matchSeriesByName(filenames, 0)); + matches.addAll(matchSeriesByName(stripReleaseInfo(filenames, false), 0)); } // use lenient sub sequence matching only as fallback diff --git a/source/net/sourceforge/filebot/media/ReleaseInfo.java b/source/net/sourceforge/filebot/media/ReleaseInfo.java index 64a2b9f2..9ce4289d 100644 --- a/source/net/sourceforge/filebot/media/ReleaseInfo.java +++ b/source/net/sourceforge/filebot/media/ReleaseInfo.java @@ -129,7 +129,7 @@ public class ReleaseInfo { Pattern queryBlacklist = getBlacklistPattern(); stopwords = new Pattern[] { languageTag, videoSource, videoFormat, resolution, languageSuffix }; - blacklist = new Pattern[] { clutterBracket, releaseGroup, languageTag, videoSource, videoFormat, resolution, languageSuffix, queryBlacklist }; + blacklist = new Pattern[] { queryBlacklist, languageTag, clutterBracket, releaseGroup, videoSource, videoFormat, resolution, languageSuffix }; // cache compiled patterns for common usage this.stopwords.put(strict, stopwords); diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt index 8a5c2e4c..6738d7e7 100644 --- a/website/data/query-blacklist.txt +++ b/website/data/query-blacklist.txt @@ -73,6 +73,7 @@ Director's.Cut Directors.Cut Discovery.Channel DLLValley.eu +DLLValley docu Dual.Audio dubbed