From 27575e411e2bb930e85b8880925d61d85b4e16bb Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Wed, 24 Jul 2013 12:05:12 +0000
Subject: [PATCH] amc and movie detection fine-tuning

@see http://www.filebot.net/forums/viewtopic.php?f=4&p=5379#p5375
---
 source/net/sourceforge/filebot/cli/CmdlineOperations.java | 2 +-
 source/net/sourceforge/filebot/media/MediaDetection.java  | 6 +++++-
 website/data/query-blacklist.txt                          | 1 +
 website/data/release-groups.txt                           | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/source/net/sourceforge/filebot/cli/CmdlineOperations.java b/source/net/sourceforge/filebot/cli/CmdlineOperations.java
index 0c01c9c9..b76a02e5 100644
--- a/source/net/sourceforge/filebot/cli/CmdlineOperations.java
+++ b/source/net/sourceforge/filebot/cli/CmdlineOperations.java
@@ -897,7 +897,7 @@ public class CmdlineOperations implements CmdlineInterface {
 		}
 		
 		// return first and only value
-		return probableMatches.size() <= 5 ? probableMatches : probableMatches.subList(0, 5);
+		return probableMatches.size() <= 3 ? probableMatches : probableMatches.subList(0, 3); // trust that the correct match is in the Top 3
 	}
 	
 	
diff --git a/source/net/sourceforge/filebot/media/MediaDetection.java b/source/net/sourceforge/filebot/media/MediaDetection.java
index 12bf1f96..3aea038a 100644
--- a/source/net/sourceforge/filebot/media/MediaDetection.java
+++ b/source/net/sourceforge/filebot/media/MediaDetection.java
@@ -619,6 +619,10 @@ public class MediaDetection {
 		List<String> paragon = stripReleaseInfo(terms, true);
 		List<T> sorted = new ArrayList<T>(options);
 		sort(sorted, new SimilarityComparator(getMovieMatchMetric(), paragon.toArray()));
+		
+		// DEBUG
+		// System.out.format("sortBySimilarity %s => %s", terms, options);
+		
 		return sorted;
 	}
 	
@@ -814,7 +818,7 @@ public class MediaDetection {
 		querySet.addAll(stripReleaseInfo(files, false));
 		
 		// remove duplicates
-		querySet = getUniqueQuerySet(querySet);
+		querySet = getUniqueQuerySet(stripBlacklistedTerms(querySet));
 		
 		// DEBUG
 		// System.out.format("Query %s: %s%n", queryLookupService.getName(), querySet);
diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt
index ec15f8a6..3570cbbf 100644
--- a/website/data/query-blacklist.txt
+++ b/website/data/query-blacklist.txt
@@ -46,6 +46,7 @@
 ^HVDVD_TS$
 ^In.Progress$
 ^Incoming$
+^I|II|III$
 ^jukebox$
 ^MD0_DATA$
 ^media$
diff --git a/website/data/release-groups.txt b/website/data/release-groups.txt
index ada07ba1..1bce29d3 100644
--- a/website/data/release-groups.txt
+++ b/website/data/release-groups.txt
@@ -1494,7 +1494,7 @@ PAPAi
 papi
 PAROVOZ
 PARTICLE
-Pate
+PATE
 PaTHe
 PaYxXx
 PC