X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=9c83e62f76ceb388125cbc73d8769b296513b211;hb=4452446c58411c3f8e13f1fb5c3eecd0e9140d15;hp=e8743b63cd9d18ca0ef0ba3316aa204433b4bf34;hpb=505be508ae7d3fb48122be548b310a238cfb91eb;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index e8743b6..9c83e62 100644
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -3,12 +3,15 @@ package be.nikiroo.fanfix.library;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
 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 +28,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;
 	}
 
@@ -62,7 +64,7 @@ public class CacheLibrary extends BasicLibrary {
 		}
 
 		pg.done();
-		return metas;
+		return new ArrayList<MetaData>(metas);
 	}
 
 	@Override
@@ -95,7 +97,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();
@@ -315,15 +317,7 @@ public class CacheLibrary extends BasicLibrary {
 		invalidateInfo(luid);
 	}
 
-	/**
-	 * Check if the {@link Story} denoted by this Library UID is present in the
-	 * cache.
-	 * 
-	 * @param luid
-	 *            the Library UID
-	 * 
-	 * @return TRUE if it is
-	 */
+	@Override
 	public boolean isCached(String luid) {
 		try {
 			return cacheLib.getInfo(luid) != null;
@@ -332,18 +326,7 @@ public class CacheLibrary extends BasicLibrary {
 		}
 	}
 
-	/**
-	 * Clear the {@link Story} from the cache.
-	 * <p>
-	 * The next time we try to retrieve the {@link Story}, it may be required to
-	 * cache it again.
-	 * 
-	 * @param luid
-	 *            the story to clear
-	 * 
-	 * @throws IOException
-	 *             in case of I/O error
-	 */
+	@Override
 	public void clearFromCache(String luid) throws IOException {
 		if (isCached(luid)) {
 			cacheLib.delete(luid);