X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=ea1fd707913ba0b6696e732a64f38cc3d9cfcdbc;hb=60f723111f3f7f5bd60760afa7d0b645406b48d7;hp=38fb7b3193e1b13da59e2abc285d2a6bd0461dfa;hpb=085a2f9a3a811a910de7c3011eb6f5ef2ab18aa0;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java index 38fb7b3..ea1fd70 100644 --- a/src/be/nikiroo/fanfix/library/CacheLibrary.java +++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java @@ -1,14 +1,15 @@ package be.nikiroo.fanfix.library; -import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import java.net.URL; import java.util.List; 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; /** @@ -45,6 +46,11 @@ public class CacheLibrary extends BasicLibrary { return lib.getLibraryName(); } + @Override + public Status getStatus() { + return lib.getStatus(); + } + @Override protected List getMetas(Progress pg) { if (pg == null) { @@ -59,6 +65,20 @@ public class CacheLibrary extends BasicLibrary { return metas; } + @Override + public synchronized Story getStory(String luid, MetaData meta, Progress pg) { + String normal = Instance.getUiConfig().getString( + UiConfig.GUI_NON_IMAGES_DOCUMENT_TYPE); + String images = Instance.getUiConfig().getString( + UiConfig.GUI_IMAGES_DOCUMENT_TYPE); + String type = meta.isImageDocument() ? images : normal; + + MetaData cachedMeta = meta.clone(); + cachedMeta.setType(type); + + return super.getStory(luid, cachedMeta, pg); + } + @Override public synchronized File getFile(final String luid, Progress pg) { if (pg == null) { @@ -77,10 +97,10 @@ public class CacheLibrary extends BasicLibrary { if (!isCached(luid)) { try { cacheLib.imprt(lib, luid, pgImport); + updateInfo(cacheLib.getInfo(luid)); pgImport.done(); - clearCache(); } catch (IOException e) { - Instance.syserr(e); + Instance.getTraceHandler().error(e); } pgImport.done(); @@ -95,7 +115,7 @@ public class CacheLibrary extends BasicLibrary { } @Override - public BufferedImage getCover(final String luid) { + public Image getCover(final String luid) { if (isCached(luid)) { return cacheLib.getCover(luid); } @@ -105,29 +125,122 @@ public class CacheLibrary extends BasicLibrary { } @Override - public BufferedImage getSourceCover(String source) { - // no cache for the source cover + public Image getSourceCover(String source) { + 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 = 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) { + 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 + protected void updateInfo(MetaData meta) { + 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 clearCache() { - metas = null; - cacheLib.clearCache(); - lib.clearCache(); + 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 public synchronized Story save(Story story, String luid, Progress pg) throws IOException { - story = lib.save(story, luid, pg); - clearCache(); + Progress pgLib = new Progress(); + Progress pgCacheLib = new Progress(); + + if (pg == null) { + pg = new Progress(); + } + + pg.setMinMax(0, 2); + pg.addProgress(pgLib, 1); + pg.addProgress(pgCacheLib, 1); + + story = lib.save(story, luid, pgLib); + story = cacheLib.save(story, story.getMeta().getLuid(), pgCacheLib); + + updateInfo(story.getMeta()); + return story; } @@ -137,12 +250,16 @@ public class CacheLibrary extends BasicLibrary { cacheLib.delete(luid); } lib.delete(luid); - clearCache(); + + MetaData meta = getInfo(luid); + if (meta != null) { + metas.remove(meta); + } } @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(); } @@ -153,11 +270,22 @@ public class CacheLibrary extends BasicLibrary { pg.addProgress(pgCache, 1); pg.addProgress(pgOrig, 1); - cacheLib.changeSource(luid, newSource, pgCache); + MetaData meta = getInfo(luid); + if (meta == null) { + throw new IOException("Story not found: " + luid); + } + + if (isCached(luid)) { + 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(); } @@ -176,6 +304,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 @@ -184,8 +315,30 @@ public class CacheLibrary extends BasicLibrary { * in case of I/O error */ public void clearFromCache(String luid) throws IOException { - cacheLib.delete(luid); - clearCache(); + if (isCached(luid)) { + cacheLib.delete(luid); + } + } + + @Override + public Story imprt(URL url, Progress pg) throws IOException { + if (pg == null) { + pg = new Progress(); + } + + Progress pgImprt = new Progress(); + Progress pgCache = new Progress(); + pg.setMinMax(0, 10); + pg.addProgress(pgImprt, 7); + pg.addProgress(pgCache, 3); + + Story story = lib.imprt(url, pgImprt); + cacheLib.save(story, story.getMeta().getLuid(), pgCache); + + updateInfo(story.getMeta()); + + pg.done(); + return story; } // All the following methods are only used by Save and Delete in