Refactor SimilarityComparator simple usage

source/net/filebot/format/MediaBindingBean.java

@@ -938,7 +938,7 @@ public class MediaBindingBean {
 
 			// still no good match found -> just take the most probable video from the same folder
 			if (videos.size() > 0) {
-				sort(videos, new SimilarityComparator<File, String>(FileUtilities.getName(getMediaFile()), FileUtilities::getName));
+				sort(videos, SimilarityComparator.compareTo(getMediaFile(), FileUtilities::getName));
 				return videos.get(0);
 			}
 		}

source/net/filebot/similarity/SimilarityComparator.java

@@ -9,6 +9,10 @@ import java.util.function.Function;
 
 public class SimilarityComparator<T, P> implements Comparator<T> {
 
+	public static <T, S extends CharSequence> SimilarityComparator<T, S> compareTo(T value, Function<T, S> mapper) {
+		return new SimilarityComparator<T, S>(new NameSimilarityMetric(), singleton(mapper.apply(value)), mapper.andThen(Collections::singleton));
+	}
+
 	protected SimilarityMetric metric;
 	protected Collection<P> paragon;
 
@@ -20,10 +24,6 @@ public class SimilarityComparator<T, P> implements Comparator<T> {
 		this.mapper = mapper;
 	}
 
-	public SimilarityComparator(P paragon, Function<T, P> mapper) {
-		this(new NameSimilarityMetric(), singleton(paragon), mapper.andThen(Collections::singleton));
-	}
-
 	@Override
 	public int compare(T o1, T o2) {
 		return Double.compare(getSimilarity(o2), getSimilarity(o1));

test/net/filebot/similarity/SimilarityComparatorTest.java

@@ -27,7 +27,7 @@ public class SimilarityComparatorTest {
 
 	@Test
 	public void defaultUsage() {
-		SimilarityComparator<String, String> c = new SimilarityComparator<String, String>("Hello", String::toString);
+		SimilarityComparator<String, String> c = SimilarityComparator.compareTo("Hello", String::toString);
 
 		List<String> phrases = generateWords();
 		phrases.sort(c);