X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=8f6e9c29a24bfd128c64e5fe69e90c98a53ac4e3;hb=3828c808ecfff13b78c1b2c077f74d6e81799ec0;hp=c8721ddae3719cae169e00112efc1308d76177a1;hpb=c3b229a10b147a2ca104a13ad0b43e49549b4ed9;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java index c8721dd..8f6e9c2 100644 --- a/src/be/nikiroo/fanfix/library/CacheLibrary.java +++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java @@ -66,19 +66,27 @@ public class CacheLibrary extends BasicLibrary { } @Override - public synchronized File getFile(final String luid, Progress pg) { + public synchronized MetaData getInfo(String luid) { + 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) { 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 { @@ -93,6 +101,31 @@ 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) { + 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(); @@ -117,7 +150,27 @@ 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 + 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 @@ -133,12 +186,31 @@ public class CacheLibrary extends BasicLibrary { 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, 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) { @@ -154,7 +226,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 +237,8 @@ public class CacheLibrary extends BasicLibrary { } } - cacheLib.deleteInfo(luid); - lib.deleteInfo(luid); + cacheLib.invalidateInfo(luid); + lib.invalidateInfo(luid); } @Override @@ -198,15 +270,12 @@ public class CacheLibrary extends BasicLibrary { } lib.delete(luid); - MetaData meta = getInfo(luid); - if (meta != null) { - metas.remove(meta); - } + 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(); } @@ -223,15 +292,19 @@ 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(); + + invalidateInfo(luid); } /**