small cached lib fixes

[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 0f283183b620006188040d0e59c84b3025e7f9e7..bafaf9461a65b60a66a760eee66a9c3fa5d275bd 100644 (file)
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -66,19 +66,17 @@ public class CacheLibrary extends BasicLibrary {
        }
 
        @Override
-       public synchronized File getFile(final String luid, Progress pg) {
+       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 +91,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();
 
@@ -127,18 +150,17 @@ public class CacheLibrary extends BasicLibrary {
 
        @Override
        public Image getAuthorCover(String author) {
-               Image custom = getCustomSourceCover(author);
+               Image custom = getCustomAuthorCover(author);
                if (custom != null) {
                        return custom;
                }
 
-               Image cached = cacheLib.getSourceCover(author);
+               Image cached = cacheLib.getAuthorCover(author);
                if (cached != null) {
                        return cached;
                }
 
-               return lib.getSourceCover(author);
-
+               return lib.getAuthorCover(author);
        }
 
        @Override
@@ -153,7 +175,7 @@ public class CacheLibrary extends BasicLibrary {
 
                return custom;
        }
-       
+
        @Override
        public Image getCustomAuthorCover(String author) {
                Image custom = cacheLib.getCustomAuthorCover(author);