cached lib can now getStory()

[fanfix.git] / src / be / nikiroo / fanfix / library / CacheLibrary.java

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index c8721ddae3719cae169e00112efc1308d76177a1..ea1fd707913ba0b6696e732a64f38cc3d9cfcdbc 100644 (file)
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -65,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) {
@@ -117,7 +131,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 +167,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 +207,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 +218,8 @@ public class CacheLibrary extends BasicLibrary {
                        }
                }
 
-               cacheLib.deleteInfo(luid);
-               lib.deleteInfo(luid);
+               cacheLib.invalidateInfo(luid);
+               lib.invalidateInfo(luid);
        }
 
        @Override
@@ -205,8 +258,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 +276,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();
        }