Fixed.

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

diff --git a/src/be/nikiroo/fanfix/library/BasicLibrary.java b/src/be/nikiroo/fanfix/library/BasicLibrary.java
index 9e7d4644494e5b51d871091868c3c1e47d882f53..ee7ee8d48c225994343579efec3f2f381be9eabc 100644 (file)
--- a/src/be/nikiroo/fanfix/library/BasicLibrary.java
+++ b/src/be/nikiroo/fanfix/library/BasicLibrary.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;
@@ -15,7 +14,8 @@ import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.output.BasicOutput;
 import be.nikiroo.fanfix.output.BasicOutput.OutputType;
 import be.nikiroo.fanfix.supported.BasicSupport;
-import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
+import be.nikiroo.fanfix.supported.SupportType;
+import be.nikiroo.utils.Image;
 import be.nikiroo.utils.Progress;
 
 /**
@@ -89,7 +89,7 @@ abstract public class BasicLibrary {
         * 
         * @return the cover image
         */
-       public abstract BufferedImage getCover(String luid);
+       public abstract Image getCover(String luid);
 
        /**
         * Return the cover image associated to this source.
@@ -101,7 +101,7 @@ abstract public class BasicLibrary {
         * 
         * @return the cover image or NULL
         */
-       public BufferedImage getSourceCover(String source) {
+       public Image getSourceCover(String source) {
                List<MetaData> metas = getListBySource(source);
                if (metas.size() > 0) {
                        return getCover(metas.get(0).getLuid());
@@ -135,19 +135,29 @@ abstract public class BasicLibrary {
         * Invalidate the {@link Story} cache (when the content should be re-read
         * because it was changed).
         */
-       protected void invalidateInfo() {
-               invalidateInfo(null);
+       protected void deleteInfo() {
+               deleteInfo(null);
        }
 
        /**
-        * Invalidate the {@link Story} cache (when the content should be re-read
-        * because it was changed).
+        * Invalidate the {@link Story} cache (when the content is removed).
+        * <p>
+        * All the cache can be deleted if NULL is passed as meta.
         * 
         * @param luid
-        *            the luid of the {@link Story} to clear from the cache, or NULL
+        *            the LUID of the {@link Story} to clear from the cache, or NULL
         *            for all stories
         */
-       protected abstract void invalidateInfo(String luid);
+       protected abstract void deleteInfo(String luid);
+
+       /**
+        * Invalidate the {@link Story} cache (when the content has changed, but we
+        * already have it) with the new given meta.
+        * 
+        * @param meta
+        *            the {@link Story} to clear from the cache
+        */
+       protected abstract void updateInfo(MetaData meta);
 
        /**
         * Return the next LUID that can be used.
@@ -343,8 +353,9 @@ abstract public class BasicLibrary {
                                                        .getType());
                                        URL url = file.toURI().toURL();
                                        if (type != null) {
-                                               story = BasicSupport.getSupport(type).process(url,
-                                                               pgProcess);
+                                               story = BasicSupport.getSupport(type, url) //
+                                                               .process(pgProcess);
+
                                                // Because we do not want to clear the meta cache:
                                                meta.setCover(story.getMeta().getCover());
                                                story.setMeta(meta);
@@ -392,7 +403,7 @@ abstract public class BasicLibrary {
                        throw new UnknownHostException("" + url);
                }
 
-               return save(support.process(url, pg), null);
+               return save(support.process(pg), null);
        }
 
        /**
@@ -507,6 +518,7 @@ abstract public class BasicLibrary {
         */
        public synchronized Story save(Story story, String luid, Progress pg)
                        throws IOException {
+
                // Do not change the original metadata, but change the original story
                MetaData meta = story.getMeta().clone();
                story.setMeta(meta);
@@ -521,9 +533,9 @@ abstract public class BasicLibrary {
                        delete(luid);
                }
 
-               doSave(story, pg);
+               story = doSave(story, pg);
 
-               invalidateInfo(luid);
+               updateInfo(story.getMeta());
 
                return story;
        }
@@ -539,7 +551,7 @@ abstract public class BasicLibrary {
         */
        public synchronized void delete(String luid) throws IOException {
                doDelete(luid);
-               invalidateInfo(luid);
+               deleteInfo(luid);
        }
 
        /**