X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=cccfedba0cfd29ec755034b9197f7a7495dd0b38;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=019acd210d1fb3b2263db468e2c21e6e6bfd1d69;hpb=0bb51c9c66697fe63ba066715207deabbcc1d479;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index 019acd2..cccfedb 100644
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -7,8 +7,10 @@ import java.util.List;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.UiConfig;
+import be.nikiroo.fanfix.bundles.UiConfigBundle;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.fanfix.output.BasicOutput.OutputType;
 import be.nikiroo.utils.Image;
 import be.nikiroo.utils.Progress;
 
@@ -25,19 +27,18 @@ public class CacheLibrary extends BasicLibrary {
 	/**
 	 * Create a cache library around the given one.
 	 * <p>
-	 * It will return the same result, but those will be saved to disk at the
-	 * same time to be fetched quicker the next time.
+	 * It will return the same result, but those will be saved to disk at the same
+	 * time to be fetched quicker the next time.
 	 * 
-	 * @param cacheDir
-	 *            the cache directory where to save the files to disk
-	 * @param lib
-	 *            the original library to wrap
+	 * @param cacheDir the cache directory where to save the files to disk
+	 * @param lib      the original library to wrap
+	 * @param config   the configuration used to know which kind of default
+	 *                 {@link OutputType} to use for images and non-images stories
 	 */
-	public CacheLibrary(File cacheDir, BasicLibrary lib) {
-		this.cacheLib = new LocalLibrary(cacheDir, Instance.getUiConfig()
-				.getString(UiConfig.GUI_NON_IMAGES_DOCUMENT_TYPE), Instance
-				.getUiConfig().getString(UiConfig.GUI_IMAGES_DOCUMENT_TYPE),
-				true);
+	public CacheLibrary(File cacheDir, BasicLibrary lib, UiConfigBundle config) {
+		this.cacheLib = new LocalLibrary(cacheDir, //
+				config.getString(UiConfig.GUI_NON_IMAGES_DOCUMENT_TYPE),
+				config.getString(UiConfig.GUI_IMAGES_DOCUMENT_TYPE), true);
 		this.lib = lib;
 	}
 
@@ -95,7 +96,7 @@ public class CacheLibrary extends BasicLibrary {
 				updateInfo(cacheLib.getInfo(luid));
 				pgImport.done();
 			} catch (IOException e) {
-				Instance.getTraceHandler().error(e);
+				Instance.getInstance().getTraceHandler().error(e);
 			}
 
 			pgImport.done();
@@ -216,11 +217,17 @@ public class CacheLibrary extends BasicLibrary {
 	@Override
 	protected void updateInfo(MetaData meta) throws IOException {
 		if (meta != null && metas != null) {
+			boolean changed = false;
 			for (int i = 0; i < metas.size(); i++) {
 				if (metas.get(i).getLuid().equals(meta.getLuid())) {
 					metas.set(i, meta);
+					changed = true;
 				}
 			}
+
+			if (!changed) {
+				metas.add(meta);
+			}
 		}
 
 		cacheLib.updateInfo(meta);
@@ -345,7 +352,7 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public Story imprt(URL url, Progress pg) throws IOException {
+	public MetaData imprt(URL url, Progress pg) throws IOException {
 		if (pg == null) {
 			pg = new Progress();
 		}
@@ -356,13 +363,13 @@ public class CacheLibrary extends BasicLibrary {
 		pg.addProgress(pgImprt, 7);
 		pg.addProgress(pgCache, 3);
 
-		Story story = lib.imprt(url, pgImprt);
-		cacheLib.save(story, story.getMeta().getLuid(), pgCache);
-
-		updateInfo(story.getMeta());
-
+		MetaData meta = lib.imprt(url, pgImprt);
+		updateInfo(meta);
+		
+		clearFromCache(meta.getLuid());
+		
 		pg.done();
-		return story;
+		return meta;
 	}
 
 	// All the following methods are only used by Save and Delete in