X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=918b763ff376b9a07075aceb41bff4023936f5e5;hb=c8d48938ca540d7b619a2c19bd76623d689b72cb;hp=8b1a3c7e65ea570bf01407f73dea984956cadc97;hpb=0dc195ded76734e34d0f84727d80bf439d3f4271;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java index 8b1a3c7..918b763 100644 --- a/src/be/nikiroo/fanfix/library/CacheLibrary.java +++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java @@ -117,7 +117,12 @@ public class CacheLibrary extends BasicLibrary { return custom; } - return cacheLib.getSourceCover(source); + Image cached = cacheLib.getSourceCover(source); + if (cached != null) { + return cached; + } + + return lib.getSourceCover(source); } @Override @@ -154,7 +159,7 @@ public class CacheLibrary extends BasicLibrary { } @Override - protected void deleteInfo(String luid) { + protected void invalidateInfo(String luid) { if (luid == null) { metas = null; } else if (metas != null) { @@ -165,8 +170,8 @@ public class CacheLibrary extends BasicLibrary { } } - cacheLib.deleteInfo(luid); - lib.deleteInfo(luid); + cacheLib.invalidateInfo(luid); + lib.invalidateInfo(luid); } @Override @@ -205,8 +210,8 @@ public class CacheLibrary extends BasicLibrary { } @Override - public synchronized void changeSource(String luid, String newSource, - Progress pg) throws IOException { + protected synchronized void changeSTA(String luid, String newSource, + String newTitle, String newAuthor, Progress pg) throws IOException { if (pg == null) { pg = new Progress(); } @@ -223,14 +228,16 @@ public class CacheLibrary extends BasicLibrary { } if (isCached(luid)) { - cacheLib.changeSource(luid, newSource, pgCache); + cacheLib.changeSTA(luid, newSource, newTitle, newAuthor, pgCache); } pgCache.done(); - lib.changeSource(luid, newSource, pgOrig); + lib.changeSTA(luid, newSource, newTitle, newAuthor, pgOrig); pgOrig.done(); meta.setSource(newSource); + meta.setTitle(newTitle); + meta.setAuthor(newAuthor); pg.done(); } @@ -249,6 +256,9 @@ public class CacheLibrary extends BasicLibrary { /** * Clear the {@link Story} from the cache. + *

+ * The next time we try to retrieve the {@link Story}, it may be required to + * cache it again. * * @param luid * the story to clear