Bug fixes regarding cache miss/hit

[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 7f4bb370d5a4fb0ad98e1c4c0882390cb5374512..ee22e3439cc6d38001b6c36885106641fba0112a 100644 (file)
--- 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;
 
 /**
@@ -101,7 +101,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);
                }
@@ -111,7 +111,7 @@ public class CacheLibrary extends BasicLibrary {
        }
 
        @Override
-       public BufferedImage getSourceCover(String source) {
+       public Image getSourceCover(String source) {
                // no cache for the source cover
                return lib.getSourceCover(source);
        }
@@ -124,20 +124,13 @@ public class CacheLibrary extends BasicLibrary {
 
        @Override
        protected void invalidateInfo(String luid) {
-               List<MetaData> metas = this.metas;
-
                if (luid == null) {
-                       this.metas = null;
+                       metas = null;
                } else if (metas != null) {
                        MetaData meta = lib.getInfo(luid);
                        for (int i = 0; i < metas.size(); i++) {
                                if (metas.get(i).getLuid().equals(luid)) {
-                                       if (meta != null) {
-                                               metas.set(i, meta);
-                                               meta = null;
-                                       } else {
-                                               metas.remove(i--);
-                                       }
+                                       metas.remove(i--);
                                }
                        }
 
@@ -179,13 +172,9 @@ public class CacheLibrary extends BasicLibrary {
                }
                lib.delete(luid);
 
-               List<MetaData> metas = this.metas;
-               if (metas != null) {
-                       for (int i = 0; i < metas.size(); i++) {
-                               if (metas.get(i).getLuid().equals(luid)) {
-                                       metas.set(i, lib.getInfo(luid));
-                               }
-                       }
+               MetaData meta = getInfo(luid);
+               if (meta != null) {
+                       metas.remove(meta);
                }
        }
 
@@ -263,6 +252,8 @@ public class CacheLibrary extends BasicLibrary {
                Story story = lib.imprt(url, pgImprt);
                cacheLib.save(story, story.getMeta().getLuid(), pgCache);
 
+               invalidateInfo(story.getMeta().getLuid());
+
                pg.done();
                return story;
        }