X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=019acd210d1fb3b2263db468e2c21e6e6bfd1d69;hb=0bb51c9c66697fe63ba066715207deabbcc1d479;hp=2ef5b1ebaf1febb82fd2566290deb2648f794138;hpb=1b9a09a2d3ddd4558c9f440392e50504421ddb2e;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java index 2ef5b1e..019acd2 100644 --- a/src/be/nikiroo/fanfix/library/CacheLibrary.java +++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java @@ -1,6 +1,5 @@ package be.nikiroo.fanfix.library; -import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.net.URL; @@ -10,6 +9,7 @@ import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.bundles.UiConfig; import be.nikiroo.fanfix.data.MetaData; import be.nikiroo.fanfix.data.Story; +import be.nikiroo.utils.Image; import be.nikiroo.utils.Progress; /** @@ -52,7 +52,7 @@ public class CacheLibrary extends BasicLibrary { } @Override - protected List getMetas(Progress pg) { + protected List getMetas(Progress pg) throws IOException { if (pg == null) { pg = new Progress(); } @@ -66,25 +66,34 @@ public class CacheLibrary extends BasicLibrary { } @Override - public synchronized File getFile(final String luid, Progress pg) { + public synchronized MetaData getInfo(String luid) throws IOException { + MetaData info = cacheLib.getInfo(luid); + if (info == null) { + info = lib.getInfo(luid); + } + + return info; + } + + @Override + public synchronized Story getStory(String luid, MetaData meta, Progress pg) + throws IOException { if (pg == null) { pg = new Progress(); } Progress pgImport = new Progress(); Progress pgGet = new Progress(); - Progress pgRecall = new Progress(); - pg.setMinMax(0, 5); + pg.setMinMax(0, 4); pg.addProgress(pgImport, 3); pg.addProgress(pgGet, 1); - pg.addProgress(pgRecall, 1); if (!isCached(luid)) { try { cacheLib.imprt(lib, luid, pgImport); + updateInfo(cacheLib.getInfo(luid)); pgImport.done(); - clearCache(); } catch (IOException e) { Instance.getTraceHandler().error(e); } @@ -93,6 +102,32 @@ public class CacheLibrary extends BasicLibrary { pgGet.done(); } + String type = cacheLib.getOutputType(meta.isImageDocument()); + MetaData cachedMeta = meta.clone(); + cachedMeta.setType(type); + + return cacheLib.getStory(luid, cachedMeta, pg); + } + + @Override + public synchronized File getFile(final String luid, Progress pg) + throws IOException { + if (pg == null) { + pg = new Progress(); + } + + Progress pgGet = new Progress(); + Progress pgRecall = new Progress(); + + pg.setMinMax(0, 5); + pg.addProgress(pgGet, 4); + pg.addProgress(pgRecall, 1); + + if (!isCached(luid)) { + getStory(luid, pgGet); + pgGet.done(); + } + File file = cacheLib.getFile(luid, pgRecall); pgRecall.done(); @@ -101,7 +136,7 @@ public class CacheLibrary extends BasicLibrary { } @Override - public BufferedImage getCover(final String luid) { + public Image getCover(final String luid) throws IOException { if (isCached(luid)) { return cacheLib.getCover(luid); } @@ -111,22 +146,101 @@ public class CacheLibrary extends BasicLibrary { } @Override - public BufferedImage getSourceCover(String source) { - // no cache for the source cover + public Image getSourceCover(String source) throws IOException { + 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 void setSourceCover(String source, String luid) { + public Image getAuthorCover(String author) throws IOException { + Image custom = getCustomAuthorCover(author); + if (custom != null) { + return custom; + } + + Image cached = cacheLib.getAuthorCover(author); + if (cached != null) { + return cached; + } + + return lib.getAuthorCover(author); + } + + @Override + public Image getCustomSourceCover(String source) throws IOException { + 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) throws IOException { + 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) throws IOException { lib.setSourceCover(source, luid); - cacheLib.setSourceCover(source, getSourceCover(source)); + cacheLib.setSourceCover(source, getCover(luid)); + } + + @Override + public void setAuthorCover(String author, String luid) throws IOException { + lib.setAuthorCover(author, luid); + cacheLib.setAuthorCover(author, getCover(luid)); } @Override - protected void clearCache() { - metas = null; - cacheLib.clearCache(); - lib.clearCache(); + protected void updateInfo(MetaData meta) throws IOException { + if (meta != null && metas != null) { + for (int i = 0; i < metas.size(); i++) { + if (metas.get(i).getLuid().equals(meta.getLuid())) { + metas.set(i, meta); + } + } + } + + cacheLib.updateInfo(meta); + lib.updateInfo(meta); + } + + @Override + protected void invalidateInfo(String luid) { + if (luid == null) { + metas = null; + } else if (metas != null) { + for (int i = 0; i < metas.size(); i++) { + if (metas.get(i).getLuid().equals(luid)) { + metas.remove(i--); + } + } + } + + cacheLib.invalidateInfo(luid); + lib.invalidateInfo(luid); } @Override @@ -146,7 +260,7 @@ public class CacheLibrary extends BasicLibrary { story = lib.save(story, luid, pgLib); story = cacheLib.save(story, story.getMeta().getLuid(), pgCacheLib); - clearCache(); + updateInfo(story.getMeta()); return story; } @@ -157,12 +271,13 @@ public class CacheLibrary extends BasicLibrary { cacheLib.delete(luid); } lib.delete(luid); - clearCache(); + + invalidateInfo(luid); } @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(); } @@ -173,16 +288,25 @@ public class CacheLibrary extends BasicLibrary { pg.addProgress(pgCache, 1); pg.addProgress(pgOrig, 1); + MetaData meta = getInfo(luid); + if (meta == null) { + throw new IOException("Story not found: " + luid); + } + if (isCached(luid)) { - cacheLib.changeSource(luid, newSource, pgCache); + cacheLib.changeSTA(luid, newSource, newTitle, newAuthor, pgCache); } pgCache.done(); - lib.changeSource(luid, newSource, pgOrig); - pgOrig.done(); - getInfo(luid).setSource(newSource); + lib.changeSTA(luid, newSource, newTitle, newAuthor, pgOrig); + pgOrig.done(); + meta.setSource(newSource); + meta.setTitle(newTitle); + meta.setAuthor(newAuthor); pg.done(); + + invalidateInfo(luid); } /** @@ -195,11 +319,18 @@ public class CacheLibrary extends BasicLibrary { * @return TRUE if it is */ public boolean isCached(String luid) { - return cacheLib.getInfo(luid) != null; + try { + return cacheLib.getInfo(luid) != null; + } catch (IOException e) { + return false; + } } /** * 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 @@ -210,7 +341,6 @@ public class CacheLibrary extends BasicLibrary { public void clearFromCache(String luid) throws IOException { if (isCached(luid)) { cacheLib.delete(luid); - clearCache(); } } @@ -229,6 +359,8 @@ public class CacheLibrary extends BasicLibrary { Story story = lib.imprt(url, pgImprt); cacheLib.save(story, story.getMeta().getLuid(), pgCache); + updateInfo(story.getMeta()); + pg.done(); return story; }