From b8802bb2d35898d5bbaa4aeec1d20c6e95697fb7 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Thu, 10 Jan 2013 16:38:17 +0000
Subject: [PATCH] + preliminary support for audio identification via AcoustID

---
 source/ehcache.xml                                |   4 ++--
 .../net/sourceforge/filebot/Settings.properties   |   1 +
 source/net/sourceforge/filebot/WebServices.java   |   4 +++-
 .../filebot/resources/search.acoustid.png         | Bin 0 -> 701 bytes
 .../filebot/ui/rename/RenamePanel.java            |   4 ++++
 5 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 source/net/sourceforge/filebot/resources/search.acoustid.png

diff --git a/source/ehcache.xml b/source/ehcache.xml
index 48ac5abf..3553c5ed 100644
--- a/source/ehcache.xml
+++ b/source/ehcache.xml
@@ -23,8 +23,8 @@
 	Short-lived (48 hours) persistent cache for web responses.
 	-->
 	<cache name="web-datasource"
-		maxElementsInMemory="120"
-		maxElementsOnDisk="1200"
+		maxElementsInMemory="200"
+		maxElementsOnDisk="5000"
 		eternal="false"
 		timeToIdleSeconds="172800"
 		timeToLiveSeconds="172800"
diff --git a/source/net/sourceforge/filebot/Settings.properties b/source/net/sourceforge/filebot/Settings.properties
index d92719fa..aad30ad9 100644
--- a/source/net/sourceforge/filebot/Settings.properties
+++ b/source/net/sourceforge/filebot/Settings.properties
@@ -18,3 +18,4 @@ thetvdb.apikey: 58B4AA94C59AD656
 themoviedb.apikey: 5a6edae568130bf10617b6d45be99f13
 serienjunkies.apikey: 9fbhw9uebfiwvbefzuwv
 fanart.tv.apikey: 780b986b22c35e6f7a134a2f392c2deb
+acoustid.apikey: 0B3qZnQc
diff --git a/source/net/sourceforge/filebot/WebServices.java b/source/net/sourceforge/filebot/WebServices.java
index 165eb529..05a48b62 100644
--- a/source/net/sourceforge/filebot/WebServices.java
+++ b/source/net/sourceforge/filebot/WebServices.java
@@ -20,6 +20,7 @@ import java.util.concurrent.Future;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.sourceforge.filebot.audio.AcoustID;
 import net.sourceforge.filebot.media.MediaDetection;
 import net.sourceforge.filebot.web.AnidbClient;
 import net.sourceforge.filebot.web.EpisodeListProvider;
@@ -61,8 +62,9 @@ public final class WebServices {
 	public static final SubsceneSubtitleClient Subscene = new SubsceneSubtitleClient();
 	public static final SublightSubtitleClient Sublight = new SublightSubtitleClient();
 	
-	// fanart.tv
+	// misc
 	public static final FanartTV FanartTV = new FanartTV(Settings.getApplicationProperty("fanart.tv.apikey"));
+	public static final AcoustID AcoustID = new AcoustID(Settings.getApplicationProperty("acoustid.apikey"));
 	
 	
 	public static EpisodeListProvider[] getEpisodeListProviders() {
diff --git a/source/net/sourceforge/filebot/resources/search.acoustid.png b/source/net/sourceforge/filebot/resources/search.acoustid.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8916ceb0c5c0f7f2eb6801aa52e5834fbd60f2f
GIT binary patch
literal 701
zcmV;u0z&<XP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10y;@VK~y-6os&;UlW`ozpWoj1WwW)M4x0a{ImyhHhlIeyQHOM3
z5s1(sFcA;CNEGU!lMw{oI(Y~@m?XHl3{Bjj$RL$u9efL+@DFuqp|a_w?%(@9ostNB
zjlS?bJrAGL^8ra1eaK?*8s#P!+=LJ|tJ^&U;Ob!=LjVg4J<R1!?<_Ch{x3jYQBiGr
zeO;{2&0YIvz;tD08H5l3kV~b`WnwYJB9USMCjlTRM4lnQQe6B{?diD-0GZ9rGqTO5
zZ_Lh00P2FW+-!Bb-vV$R2zVvLu`N|?-HS#a0VvER5*N!mI<&3DMUmdv@E&)$?(eRx
zU5cyfgQr3$`+#>14d($M1>DNU<0qn1Q`R4olYZ*D!`0rtBP1#PZFsmjxw3Kvk|e(L
z_unZHA_SmDh7e-6qGIA>XJ?qeSw~%6d~<%@zB)MQ7mAY2_jo?ZR;y{LukW(i;Yc_e
z8~J@?B;W4!)&uY%peVHgfMaGegF@(WRox!9*|vj{#Bg<Wg5;B+$<!MFxZw9^qT%r4
z=Zd1Qg+hBIZ<s_jYj*m4pQ&k(N=lIL@kE3yzoDkVQdMOE@Kw|GmwN!pT3a<|Q`69?
zwzghZOUo>Pso#^lFkN5&`h8bdhUC2<&^Ze5Lw9$Eq>m&<%gZBrF1PT<j0;F&f79cD
zJ-NF2f@J9!P%{j0X<#5lvXUeii`hwD|J#KF1qlGsGg(gmoSE4nX*QDS&|ti@bUK?%
jE*)j7QD`A~^C-YCdj+`wC3M!u00000NkvXXu0mjf2WUFc

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 98ed6d38..b05fb137 100644
--- a/source/net/sourceforge/filebot/ui/rename/RenamePanel.java
+++ b/source/net/sourceforge/filebot/ui/rename/RenamePanel.java
@@ -256,6 +256,10 @@ public class RenamePanel extends JComponent {
 			actionPopup.add(new AutoCompleteAction(it.getName(), it.getIcon(), new MovieHashMatcher(it)));
 		}
 		
+		actionPopup.addSeparator();
+		actionPopup.addDescription(new JLabel("Music Mode:"));
+		actionPopup.add(new AutoCompleteAction("AcoustID", ResourceManager.getIcon("search.acoustid"), new AudioFingerprintMatcher(WebServices.AcoustID)));
+		
 		actionPopup.addSeparator();
 		actionPopup.addDescription(new JLabel("Options:"));