X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=0f283183b620006188040d0e59c84b3025e7f9e7;hb=3989dfc5ced262e3c8d07fc796ec06ce5513c6b8;hp=977331f33ecf0783084f730414b0862dd1de86c1;hpb=9e2fad3600cd08eca73d45cb5c991d98095842aa;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java index 977331f..0f28318 100644 --- a/src/be/nikiroo/fanfix/library/CacheLibrary.java +++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java @@ -112,14 +112,71 @@ public class CacheLibrary extends BasicLibrary { @Override public Image getSourceCover(String source) { - // no cache for the source cover + Image custom = getCustomSourceCover(source); + if (custom != null) { + return custom; + } + + Image cached = cacheLib.getSourceCover(source); + if (cached != null) { + return cached; + } + return lib.getSourceCover(source); } + @Override + public Image getAuthorCover(String author) { + Image custom = getCustomSourceCover(author); + if (custom != null) { + return custom; + } + + Image cached = cacheLib.getSourceCover(author); + if (cached != null) { + return cached; + } + + return lib.getSourceCover(author); + + } + + @Override + public Image getCustomSourceCover(String source) { + Image custom = cacheLib.getCustomSourceCover(source); + if (custom == null) { + custom = lib.getCustomSourceCover(source); + if (custom != null) { + cacheLib.setSourceCover(source, custom); + } + } + + return custom; + } + + @Override + public Image getCustomAuthorCover(String author) { + Image custom = cacheLib.getCustomAuthorCover(author); + if (custom == null) { + custom = lib.getCustomAuthorCover(author); + if (custom != null) { + cacheLib.setAuthorCover(author, custom); + } + } + + return custom; + } + @Override public void setSourceCover(String source, String luid) { lib.setSourceCover(source, luid); - cacheLib.setSourceCover(source, getSourceCover(source)); + cacheLib.setSourceCover(source, getCover(luid)); + } + + @Override + public void setAuthorCover(String author, String luid) { + lib.setAuthorCover(author, luid); + cacheLib.setAuthorCover(author, getCover(luid)); } @Override @@ -137,7 +194,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) { @@ -148,8 +205,8 @@ public class CacheLibrary extends BasicLibrary { } } - cacheLib.deleteInfo(luid); - lib.deleteInfo(luid); + cacheLib.invalidateInfo(luid); + lib.invalidateInfo(luid); } @Override @@ -188,8 +245,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(); } @@ -206,14 +263,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(); } @@ -232,6 +291,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