From d33a907f2f7b0823a17fbf2689dcc378fe730a8c Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Tue, 24 Jul 2012 19:54:26 +0000
Subject: [PATCH] * use proper caches

---
 source/ehcache.xml                                 |  6 +++---
 source/net/sourceforge/filebot/web/IMDbClient.java |  8 ++++++++
 source/net/sourceforge/filebot/web/TMDbClient.java | 10 +++++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/source/ehcache.xml b/source/ehcache.xml
index 161c4275..1dea759d 100644
--- a/source/ehcache.xml
+++ b/source/ehcache.xml
@@ -34,14 +34,14 @@
 	/>
 	
 	<!--
-	Short-lived (48 hours) persistent disk cache for full web pages
+	Long-lived (1 week) persistent disk cache for full web pages
 	-->
 	<cache name="web-data-diskcache"
 		maxElementsInMemory="50"
 		maxElementsOnDisk="5000"
 		eternal="false"
-		timeToIdleSeconds="172800"
-		timeToLiveSeconds="172800"
+		timeToIdleSeconds="604800"
+		timeToLiveSeconds="604800"
 		overflowToDisk="true"
 		diskPersistent="true"
 		memoryStoreEvictionPolicy="LRU"
diff --git a/source/net/sourceforge/filebot/web/IMDbClient.java b/source/net/sourceforge/filebot/web/IMDbClient.java
index c9f28850..fbed96f3 100644
--- a/source/net/sourceforge/filebot/web/IMDbClient.java
+++ b/source/net/sourceforge/filebot/web/IMDbClient.java
@@ -28,6 +28,8 @@ import java.util.regex.Pattern;
 
 import javax.swing.Icon;
 
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.CacheManager;
 import net.sourceforge.filebot.ResourceManager;
 import net.sourceforge.filebot.web.TMDbClient.MovieInfo;
 import net.sourceforge.filebot.web.TMDbClient.MovieInfo.MovieProperty;
@@ -195,6 +197,12 @@ public class IMDbClient implements MovieIdentificationService {
 				}
 				return attr;
 			}
+			
+			
+			@Override
+			protected Cache getCache() {
+				return CacheManager.getInstance().getCache("web-data-diskcache");
+			}
 		};
 		
 		return data.get();
diff --git a/source/net/sourceforge/filebot/web/TMDbClient.java b/source/net/sourceforge/filebot/web/TMDbClient.java
index f35f880e..fbe64bd3 100644
--- a/source/net/sourceforge/filebot/web/TMDbClient.java
+++ b/source/net/sourceforge/filebot/web/TMDbClient.java
@@ -27,6 +27,8 @@ import java.util.logging.Logger;
 
 import javax.swing.Icon;
 
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.CacheManager;
 import net.sourceforge.filebot.ResourceManager;
 import net.sourceforge.filebot.web.TMDbClient.MovieInfo.MovieProperty;
 import net.sourceforge.filebot.web.TMDbClient.Person.PersonProperty;
@@ -42,7 +44,7 @@ public class TMDbClient implements MovieIdentificationService {
 	private static final String version = "3";
 	
 	private static final FloodLimit SEARCH_LIMIT = new FloodLimit(10, 12, TimeUnit.SECONDS);
-	private static final FloodLimit REQUEST_LIMIT = new FloodLimit(30, 12, TimeUnit.SECONDS);
+	private static final FloodLimit REQUEST_LIMIT = new FloodLimit(20, 12, TimeUnit.SECONDS);
 	
 	private final String apikey;
 	
@@ -242,6 +244,12 @@ public class TMDbClient implements MovieIdentificationService {
 				}
 				return super.fetchData(url, lastModified);
 			}
+			
+			
+			@Override
+			protected Cache getCache() {
+				return CacheManager.getInstance().getCache("web-data-diskcache");
+			}
 		};
 		
 		return (JSONObject) JSONValue.parse(json.get());