From 419884ab739b605e208ed3d1b04bfeffc27caa62 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Sun, 9 Dec 2012 18:57:04 +0000
Subject: [PATCH] * make movie index lookup more restrictive and reliable

---
 .../filebot/media/MediaDetection.java         | 10 ++++++++--
 website/data/query-blacklist.txt              | 19 ++++++++++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/source/net/sourceforge/filebot/media/MediaDetection.java b/source/net/sourceforge/filebot/media/MediaDetection.java
index fd998d3b..e299ee93 100644
--- a/source/net/sourceforge/filebot/media/MediaDetection.java
+++ b/source/net/sourceforge/filebot/media/MediaDetection.java
@@ -419,7 +419,10 @@ public class MediaDetection {
 			terms.add(reduceMovieName(getName(movieFolder)));
 		}
 		
-		List<Movie> movieNameMatches = matchMovieName(terms, strict, 3);
+		List<Movie> movieNameMatches = matchMovieName(terms, true, 0);
+		if (movieNameMatches.isEmpty()) {
+			movieNameMatches = matchMovieName(terms, strict, 2);
+		}
 		
 		// skip further queries if collected matches are already sufficient
 		if (options.size() > 0 && movieNameMatches.size() > 0) {
@@ -429,7 +432,10 @@ public class MediaDetection {
 		
 		// if matching name+year failed, try matching only by name
 		if (movieNameMatches.isEmpty() && strict) {
-			movieNameMatches = matchMovieName(terms, false, 3);
+			movieNameMatches = matchMovieName(terms, false, 0);
+			if (movieNameMatches.isEmpty()) {
+				movieNameMatches = matchMovieName(terms, false, 2);
+			}
 		}
 		
 		// assume name without spacing will mess up any lookup
diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt
index 4c2403a0..8c7fb032 100644
--- a/website/data/query-blacklist.txt
+++ b/website/data/query-blacklist.txt
@@ -1,8 +1,3 @@
-(?-i:ENGLISH)
-(?-i:FRENCH)
-(?-i:GERMAN)
-(?-i:SPANISH)
-(?-i:SWEDISH|SWEDiSH)
 .+sample$
 1-3-3-8.com
 5[.,]1
@@ -32,17 +27,24 @@
 ^DVD
 ^Erotic$
 ^Extract$
+^Film$
 ^Film[s]?
+^Filme$
 ^Finished
+^home$
 ^Horror$
 ^HVDVD_TS$
 ^In.Progress$
 ^Incoming$
+^jukebox$
+^media$
 ^mnt$
 ^Movie[s]?
 ^new$
 ^other$
 ^private$
+^pyload$
+^raid$
 ^Romance$
 ^rtorrent$
 ^Science.Fiction$
@@ -58,6 +60,7 @@
 ^Torrent[s]?
 ^Tracker
 ^Trailer
+^transfer$
 ^user$
 ^VCD$
 ^VIDEO_TS$
@@ -93,6 +96,7 @@ dubbed
 DVDXvID
 DVSKY
 ENG
+English
 EXTENDED
 Extended.Version
 ExtraScene
@@ -102,7 +106,9 @@ Final.Cut
 FIXED
 Fra
 FRE
+French
 GER
+German
 Hard.Subbed
 HBO
 HDRip
@@ -116,6 +122,7 @@ iPod
 ISO
 iTA
 iTALIA
+Italian
 jigaxx
 KIDZCORNER
 KOR
@@ -158,6 +165,7 @@ ShareZONE
 ShortKut
 Snapshots
 SPA
+Spanish
 Special.Edition
 Sub
 SUBBED
@@ -165,6 +173,7 @@ Subs
 Subtit
 Subtitle
 swe.?sub
+Swedish
 SYNC
 SYNCED
 SYNCFIX