moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-08-13 17:03:45 -04:00
Code Issues Releases Wiki Activity

Fix regression issue: com.google.common.cache.CacheLoader$InvalidCacheLoadException: CacheLoader returned null for key

Browse Source
This commit is contained in:
Reinhard Pointner 2019-02-05 12:57:04 +07:00
parent 241931f28b
commit 8deb784419
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/net/filebot/similarity/EpisodeMatcher.java
View File

@ -2,12 +2,12 @@ package net.filebot.similarity;
import static java.util.Arrays.*; import static java.util.Arrays.*;
import static java.util.Collections.*; import static java.util.Collections.*;
import static net.filebot.Logging.*;
import static net.filebot.web.EpisodeUtilities.*; import static net.filebot.web.EpisodeUtilities.*;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.IdentityHashMap; import java.util.IdentityHashMap;
import java.util.List; import java.util.List;
@ -15,7 +15,13 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.function.Function; import java.util.function.Function;
import java.util.logging.Level;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import net.filebot.media.SmartSeasonEpisodeMatcher; import net.filebot.media.SmartSeasonEpisodeMatcher;
import net.filebot.similarity.SeasonEpisodeMatcher.SxE; import net.filebot.similarity.SeasonEpisodeMatcher.SxE;
@ -85,23 +91,18 @@ public class EpisodeMatcher extends Matcher<File, Object> {
} }
private final SeasonEpisodeMatcher seasonEpisodeMatcher = new SmartSeasonEpisodeMatcher(SeasonEpisodeMatcher.LENIENT_SANITY, false); private final SeasonEpisodeMatcher seasonEpisodeMatcher = new SmartSeasonEpisodeMatcher(SeasonEpisodeMatcher.LENIENT_SANITY, false);
private final Map<File, Set<SxE>> transformCache = synchronizedMap(new HashMap<File, Set<SxE>>(64, 4)); private final Cache<File, Set<SxE>> parseEpisodeIdentiferCache = CacheBuilder.newBuilder().expireAfterAccess(5, TimeUnit.MINUTES).build();
private Set<SxE> parseEpisodeIdentifer(File file) { private Set<SxE> parseEpisodeIdentifer(File file) {
Set<SxE> result = transformCache.get(file); try {
if (result != null) { return parseEpisodeIdentiferCache.get(file, () -> {
return result;
}
List<SxE> sxe = seasonEpisodeMatcher.match(file.getName()); List<SxE> sxe = seasonEpisodeMatcher.match(file.getName());
if (sxe != null) { return sxe == null ? emptySet() : new HashSet<SxE>(sxe);
result = new HashSet<SxE>(sxe); });
} else { } catch (ExecutionException e) {
result = emptySet(); debug.log(Level.SEVERE, e, e::toString);
} }
return emptySet();
transformCache.put(file, result);
return result;
} }
private Set<Integer> normalizeIdentifierSet(Set<SxE> numbers) { private Set<Integer> normalizeIdentifierSet(Set<SxE> numbers) {