From aa0ba708484fbc3ee95075cbc008da9f6f7664ba Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Sun, 3 Feb 2019 01:56:01 +0700
Subject: [PATCH] Use Guava Cache for in-memory caches

---
 .../net/filebot/format/MediaBindingBean.java  | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/source/net/filebot/format/MediaBindingBean.java b/source/net/filebot/format/MediaBindingBean.java
index 4be50741..f9608d8b 100644
--- a/source/net/filebot/format/MediaBindingBean.java
+++ b/source/net/filebot/format/MediaBindingBean.java
@@ -36,11 +36,16 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.regex.Pattern;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+
 import net.filebot.ApplicationFolder;
 import net.filebot.Language;
 import net.filebot.MediaTypes;
@@ -60,7 +65,6 @@ import net.filebot.mediainfo.MediaInfoException;
 import net.filebot.similarity.Normalization;
 import net.filebot.similarity.SimilarityComparator;
 import net.filebot.util.FileUtilities;
-import net.filebot.util.WeakValueHashMap;
 import net.filebot.web.AudioTrack;
 import net.filebot.web.Episode;
 import net.filebot.web.EpisodeFormat;
@@ -79,8 +83,6 @@ public class MediaBindingBean {
 	private final File mediaFile;
 	private final Map<File, ?> context;
 
-	private MediaInfo mediaInfo;
-
 	public MediaBindingBean(Object infoObject, File mediaFile) {
 		this(infoObject, mediaFile, null);
 	}
@@ -1212,24 +1214,19 @@ public class MediaBindingBean {
 		return null;
 	}
 
-	private static final Map<File, MediaInfo> sharedMediaInfoObjects = synchronizedMap(new WeakValueHashMap<File, MediaInfo>(64));
+	private static final Cache<File, MediaInfo> mediaInfoCache = CacheBuilder.newBuilder().expireAfterAccess(5, TimeUnit.MINUTES).build();
 
 	private synchronized MediaInfo getMediaInfo() {
-		// lazy initialize
-		if (mediaInfo == null) {
-			// use inferred media file (e.g. actual movie file instead of subtitle file)
-			File inferredMediaFile = getInferredMediaFile();
+		// use inferred media file (e.g. actual movie file instead of subtitle file)
+		File inferredMediaFile = getInferredMediaFile();
 
-			mediaInfo = sharedMediaInfoObjects.computeIfAbsent(inferredMediaFile, f -> {
-				try {
-					return new MediaInfo().open(f);
-				} catch (IOException e) {
-					throw new MediaInfoException(e.getMessage());
-				}
+		try {
+			return mediaInfoCache.get(inferredMediaFile, () -> {
+				return new MediaInfo().open(inferredMediaFile);
 			});
+		} catch (ExecutionException e) {
+			throw new MediaInfoException(e.getCause().getMessage());
 		}
-
-		return mediaInfo;
 	}
 
 	private Integer identityIndexOf(Iterable<?> c, Object o) {