X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FBasicLibrary.java;h=58bd873a25175f38a0385bc525db340f226d2db8;hb=bb7021f2b3f1bf32d6ec7ad521ae7ae8d1810c57;hp=8c86fc90e5baf2449689f2857f1f86ff52877cd8;hpb=16a81ef7656c5c692fb831927e75edde25dd77a0;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/BasicLibrary.java b/src/be/nikiroo/fanfix/library/BasicLibrary.java
index 8c86fc9..58bd873 100644
--- a/src/be/nikiroo/fanfix/library/BasicLibrary.java
+++ b/src/be/nikiroo/fanfix/library/BasicLibrary.java
@@ -14,7 +14,7 @@ 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;
 
@@ -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,8 @@ 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 +402,7 @@ abstract public class BasicLibrary {
 			throw new UnknownHostException("" + url);
 		}
 
-		return save(support.process(url, pg), null);
+		return save(support.process(pg), null);
 	}
 
 	/**
@@ -507,6 +517,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 +532,9 @@ abstract public class BasicLibrary {
 			delete(luid);
 		}
 
-		doSave(story, pg);
+		story = doSave(story, pg);
 
-		invalidateInfo(luid);
+		updateInfo(story.getMeta());
 
 		return story;
 	}
@@ -539,7 +550,7 @@ abstract public class BasicLibrary {
 	 */
 	public synchronized void delete(String luid) throws IOException {
 		doDelete(luid);
-		invalidateInfo(luid);
+		deleteInfo(luid);
 	}
 
 	/**