From 451424153fcc75dff28a568c098e5228fa71a820 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Wed, 6 Apr 2016 18:56:30 +0000
Subject: [PATCH] Support ID3 with AcoustID fallback

---
 .../ui/rename/AudioFingerprintMatcher.java    | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/source/net/filebot/ui/rename/AudioFingerprintMatcher.java b/source/net/filebot/ui/rename/AudioFingerprintMatcher.java
index 71d70a9a..0f4af82c 100644
--- a/source/net/filebot/ui/rename/AudioFingerprintMatcher.java
+++ b/source/net/filebot/ui/rename/AudioFingerprintMatcher.java
@@ -6,9 +6,10 @@ import static net.filebot.util.FileUtilities.*;
 import java.awt.Component;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map.Entry;
 
 import net.filebot.similarity.Match;
 import net.filebot.web.AudioTrack;
@@ -17,25 +18,25 @@ import net.filebot.web.SortOrder;
 
 class AudioFingerprintMatcher implements AutoCompleteMatcher {
 
-	private MusicIdentificationService service;
+	private MusicIdentificationService[] services;
 
-	public AudioFingerprintMatcher(MusicIdentificationService service) {
-		this.service = service;
+	public AudioFingerprintMatcher(MusicIdentificationService... services) {
+		this.services = services;
 	}
 
 	@Override
-	public List<Match<File, ?>> match(List<File> files, boolean strict, SortOrder order, Locale locale, boolean autodetection, Component parent) throws Exception {
+	public List<Match<File, ?>> match(Collection<File> files, boolean strict, SortOrder order, Locale locale, boolean autodetection, Component parent) throws Exception {
 		List<Match<File, ?>> matches = new ArrayList<Match<File, ?>>();
-		List<File> audioFiles = filter(files, AUDIO_FILES, VIDEO_FILES);
+		LinkedHashSet<File> remaining = new LinkedHashSet<File>(filter(files, AUDIO_FILES, VIDEO_FILES));
 
-		// check audio files against AcoustID
-		if (audioFiles.size() > 0) {
-			for (Entry<File, AudioTrack> it : service.lookup(audioFiles).entrySet()) {
-				if (it.getKey().exists() && it.getValue() != null) {
-					AudioTrack track = it.getValue().clone();
-					matches.add(new Match<File, AudioTrack>(it.getKey(), track));
+		// check audio files against all services
+		for (int i = 0; i < services.length && remaining.size() > 0; i++) {
+			services[i].lookup(remaining).forEach((k, v) -> {
+				if (v != null) {
+					matches.add(new Match<File, AudioTrack>(k, v.clone()));
+					remaining.remove(k);
 				}
-			}
+			});
 		}
 
 		return matches;