From 64c3d7710070fffbab65048c9f07d5a234e3c73e Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Thu, 14 Nov 2013 13:24:30 +0000
Subject: [PATCH] * enable use ID3 Tags as datasource in GUI

---
 .../filebot/resources/search.mediainfo.png    | Bin 0 -> 488 bytes
 .../filebot/ui/rename/RenamePanel.java        |   5 +++-
 .../sourceforge/filebot/web/ID3Lookup.java    |  26 ++++++++----------
 3 files changed, 15 insertions(+), 16 deletions(-)
 create mode 100644 source/net/sourceforge/filebot/resources/search.mediainfo.png

diff --git a/source/net/sourceforge/filebot/resources/search.mediainfo.png b/source/net/sourceforge/filebot/resources/search.mediainfo.png
new file mode 100644
index 0000000000000000000000000000000000000000..eab4d7690cfc5419739ea30b1f55193d9634437c
GIT binary patch
literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00056Nkl<ZIE{^y
zF=&%P9L0a{vk4-hgkXY$h-hhyu2lkx2#Sb;W);ccP(c(Nog5t<#5y=gvMHjVpo>`q
zi$kfq$zV`Hq%<X(OjW+;kPE~w;lqQ2yZ^oakK^4tzL$3NczODFA?FvinVdiblz?Nv
ziR8I$B4D1;$dMSfW7`|H*MLn)Pb4i(YNCmCoCG9bpMYhcA?ez<K9|-cDI2c8*Y;D}
zLrIr_wxqu8XHgo!_O|U+;D@A-l1jEe11rE|Nrjn!a=Dx<7K>*jl>+D;@EUj%B##(*
zc54c-uyAm(TCIMm)oQIwCi6|w$#C=#Sdw%u_^}0CoC5TEz1#VGzEG)DsMqUR;BL6Z
z2CxYn57Mu|;uN6Y|GBHtXwdC;X*QbxJJWoc<-vo&VDP8aY7xgVz&(KA$8O+#(Cq^{
zQ_pDogQO$vcKa-_7D5DY16a5HR?=ah0IbZ+f$a{^8Sf>X0?q>$LTMQo0{8znNPBD_
z4YdQnP2jTatyF;RZD4f*I1ju6uG@YN|3*1Am68qtcYv$5*T?la;1{DGIh@fHF>-!C
ekhOg!srd`A2f442>Ou|x0000<MNUMnLSTaT|KVEz

literal 0
HcmV?d00001

diff --git a/source/net/sourceforge/filebot/ui/rename/RenamePanel.java b/source/net/sourceforge/filebot/ui/rename/RenamePanel.java
index f5b2203f..11a41260 100644
--- a/source/net/sourceforge/filebot/ui/rename/RenamePanel.java
+++ b/source/net/sourceforge/filebot/ui/rename/RenamePanel.java
@@ -61,6 +61,7 @@ import net.sourceforge.filebot.web.EpisodeListProvider;
 import net.sourceforge.filebot.web.Movie;
 import net.sourceforge.filebot.web.MovieFormat;
 import net.sourceforge.filebot.web.MovieIdentificationService;
+import net.sourceforge.filebot.web.MusicIdentificationService;
 import net.sourceforge.filebot.web.SortOrder;
 import net.sourceforge.tuned.PreferencesMap.PreferencesEntry;
 import net.sourceforge.tuned.ui.ActionPopup;
@@ -300,7 +301,9 @@ public class RenamePanel extends JComponent {
 
 		actionPopup.addSeparator();
 		actionPopup.addDescription(new JLabel("Music Mode:"));
-		actionPopup.add(new AutoCompleteAction(WebServices.AcoustID.getName(), WebServices.AcoustID.getIcon(), new AudioFingerprintMatcher(WebServices.AcoustID)));
+		for (MusicIdentificationService it : WebServices.getMusicIdentificationServices()) {
+			actionPopup.add(new AutoCompleteAction(it.getName(), it.getIcon(), new AudioFingerprintMatcher(it)));
+		}
 
 		actionPopup.addSeparator();
 		actionPopup.addDescription(new JLabel("Options:"));
diff --git a/source/net/sourceforge/filebot/web/ID3Lookup.java b/source/net/sourceforge/filebot/web/ID3Lookup.java
index 8e44d23a..da0301d9 100644
--- a/source/net/sourceforge/filebot/web/ID3Lookup.java
+++ b/source/net/sourceforge/filebot/web/ID3Lookup.java
@@ -1,7 +1,5 @@
-
 package net.sourceforge.filebot.web;
 
-
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
@@ -9,43 +7,41 @@ import java.util.Map;
 
 import javax.swing.Icon;
 
+import net.sourceforge.filebot.ResourceManager;
 import net.sourceforge.filebot.mediainfo.MediaInfo;
 import net.sourceforge.filebot.mediainfo.MediaInfo.StreamKind;
 
-
 public class ID3Lookup implements MusicIdentificationService {
-	
+
 	@Override
 	public String getName() {
-		return "ID3";
+		return "ID3 Tags";
 	}
-	
-	
+
 	@Override
 	public Icon getIcon() {
-		return null;
+		return ResourceManager.getIcon("search.mediainfo");
 	}
-	
-	
+
 	@Override
 	public Map<File, AudioTrack> lookup(Iterable<File> files) throws Exception {
 		Map<File, AudioTrack> info = new HashMap<File, AudioTrack>();
-		
+
 		MediaInfo mediaInfo = new MediaInfo();
 		for (File f : files) {
 			if (!mediaInfo.open(f)) {
 				throw new IOException("MediaInfo failed to open file: " + f);
 			}
-			
+
 			String artist = mediaInfo.get(StreamKind.General, 0, "Performer");
 			String title = mediaInfo.get(StreamKind.General, 0, "Title");
 			String album = mediaInfo.get(StreamKind.General, 0, "Album");
 			mediaInfo.close();
-			
+
 			info.put(f, new AudioTrack(artist, title, album));
 		}
-		
+
 		return info;
 	}
-	
+
 }