From e90f970b803deb13166bd9387dd5d4844922d7b9 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Wed, 10 Aug 2011 04:02:41 +0000
Subject: [PATCH] * misc: strict-mode for matcher

---
 source/net/sourceforge/filebot/similarity/Matcher.java | 10 ++++++++--
 .../filebot/ui/panel/rename/MatchAction.java           |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/source/net/sourceforge/filebot/similarity/Matcher.java b/source/net/sourceforge/filebot/similarity/Matcher.java
index 8f436144..9c0ba2a5 100644
--- a/source/net/sourceforge/filebot/similarity/Matcher.java
+++ b/source/net/sourceforge/filebot/similarity/Matcher.java
@@ -23,15 +23,17 @@ public class Matcher<V, C> {
 	private final List<V> values;
 	private final List<C> candidates;
 	
+	private final boolean strict;
 	private final SimilarityMetric[] metrics;
 	
 	private final DisjointMatchCollection<V, C> disjointMatchCollection;
 	
 
-	public Matcher(Collection<? extends V> values, Collection<? extends C> candidates, SimilarityMetric[] metrics) {
+	public Matcher(Collection<? extends V> values, Collection<? extends C> candidates, boolean strict, SimilarityMetric[] metrics) {
 		this.values = new LinkedList<V>(values);
 		this.candidates = new LinkedList<C>(candidates);
 		
+		this.strict = strict;
 		this.metrics = metrics.clone();
 		
 		this.disjointMatchCollection = new DisjointMatchCollection<V, C>();
@@ -88,8 +90,12 @@ public class Matcher<V, C> {
 
 	protected void deepMatch(Collection<Match<V, C>> possibleMatches, int level) throws InterruptedException {
 		if (level >= metrics.length || possibleMatches.isEmpty()) {
+			// add the first possible match if non-strict, otherwise ignore ambiguous matches
+			if (!strict) {
+				disjointMatchCollection.addAll(possibleMatches);
+			}
+			
 			// no further refinement possible
-			disjointMatchCollection.addAll(possibleMatches);
 			return;
 		}
 		
diff --git a/source/net/sourceforge/filebot/ui/panel/rename/MatchAction.java b/source/net/sourceforge/filebot/ui/panel/rename/MatchAction.java
index 7051ba71..9b380963 100644
--- a/source/net/sourceforge/filebot/ui/panel/rename/MatchAction.java
+++ b/source/net/sourceforge/filebot/ui/panel/rename/MatchAction.java
@@ -98,7 +98,7 @@ class MatchAction extends AbstractAction {
 
 		public BackgroundMatcher(MatchModel<Object, File> model, SimilarityMetric[] metrics) {
 			// match names against files
-			this.matcher = new Matcher<Object, File>(model.values(), model.candidates(), metrics);
+			this.matcher = new Matcher<Object, File>(model.values(), model.candidates(), false, metrics);
 		}