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

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index 9c83e62..a3c3b5e 100644
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TreeSet;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.UiConfig;
@@ -21,22 +22,29 @@ import be.nikiroo.utils.Progress;
  * @author niki
  */
 public class CacheLibrary extends BasicLibrary {
-	private List<MetaData> metas;
+	private List<MetaData> metasReal;
+	private List<MetaData> metasMixed;
+	private Object metasLock = new Object();
+
 	private BasicLibrary lib;
 	private LocalLibrary cacheLib;
 
 	/**
 	 * 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 config   the configuration used to know which kind of default
-	 *                 {@link OutputType} to use for images and non-images stories
+	 * @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, UiConfigBundle config) {
+	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);
@@ -59,22 +67,32 @@ public class CacheLibrary extends BasicLibrary {
 			pg = new Progress();
 		}
 
-		if (metas == null) {
-			metas = lib.getMetas(pg);
-		}
+		List<MetaData> copy;
+		synchronized (metasLock) {
+			// We make sure that cached metas have precedence
+			if (metasMixed == null) {
+				if (metasReal == null) {
+					metasReal = lib.getMetas(pg);
+				}
 
-		pg.done();
-		return new ArrayList<MetaData>(metas);
-	}
+				metasMixed = new ArrayList<MetaData>();
+				TreeSet<String> cachedLuids = new TreeSet<String>();
+				for (MetaData cachedMeta : cacheLib.getMetas(null)) {
+					metasMixed.add(cachedMeta);
+					cachedLuids.add(cachedMeta.getLuid());
+				}
+				for (MetaData realMeta : metasReal) {
+					if (!cachedLuids.contains(realMeta.getLuid())) {
+						metasMixed.add(realMeta);
+					}
+				}
+			}
 
-	@Override
-	public synchronized MetaData getInfo(String luid) throws IOException {
-		MetaData info = cacheLib.getInfo(luid);
-		if (info == null) {
-			info = lib.getInfo(luid);
+			copy = new ArrayList<MetaData>(metasMixed);
 		}
 
-		return info;
+		pg.done();
+		return copy;
 	}
 
 	@Override
@@ -94,7 +112,7 @@ public class CacheLibrary extends BasicLibrary {
 		if (!isCached(luid)) {
 			try {
 				cacheLib.imprt(lib, luid, pgImport);
-				updateInfo(cacheLib.getInfo(luid));
+				updateMetaCache(metasMixed, cacheLib.getInfo(luid));
 				pgImport.done();
 			} catch (IOException e) {
 				Instance.getInstance().getTraceHandler().error(e);
@@ -215,42 +233,78 @@ public class CacheLibrary extends BasicLibrary {
 		cacheLib.setAuthorCover(author, getCover(luid));
 	}
 
+	/**
+	 * Invalidate the {@link Story} cache (when the content has changed, but we
+	 * already have it) with the new given meta.
+	 * <p>
+	 * <b>Make sure to always use {@link MetaData} from the cached library in
+	 * priority, here.</b>
+	 * 
+	 * @param meta
+	 *            the {@link Story} to clear from the cache
+	 * 
+	 * @throws IOException
+	 *             in case of IOException
+	 */
 	@Override
+	@Deprecated
 	protected void updateInfo(MetaData meta) throws IOException {
+		throw new IOException(
+				"This method is not supported in a CacheLibrary, please use updateMetaCache");
+	}
+
+	// relplace the meta in Metas by Meta, add it if needed
+	// return TRUE = added
+	private boolean updateMetaCache(List<MetaData> metas, MetaData meta) {
 		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;
+			synchronized (metasLock) {
+				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);
+				if (!changed) {
+					metas.add(meta);
+					return true;
+				}
 			}
 		}
 
-		cacheLib.updateInfo(meta);
-		lib.updateInfo(meta);
+		return false;
 	}
 
 	@Override
 	protected void invalidateInfo(String luid) {
 		if (luid == null) {
-			metas = null;
-		} else if (metas != null) {
-			for (int i = 0; i < metas.size(); i++) {
-				if (metas.get(i).getLuid().equals(luid)) {
-					metas.remove(i--);
-				}
+			synchronized (metasLock) {
+				metasReal = null;
+				metasMixed = null;
 			}
+		} else {
+			invalidateInfo(metasReal, luid);
+			invalidateInfo(metasMixed, luid);
 		}
 
 		cacheLib.invalidateInfo(luid);
 		lib.invalidateInfo(luid);
 	}
 
+	// luid cannot be null
+	private void invalidateInfo(List<MetaData> metas, String luid) {
+		if (metas != null) {
+			synchronized (metasLock) {
+				for (int i = 0; i < metas.size(); i++) {
+					if (metas.get(i).getLuid().equals(luid)) {
+						metas.remove(i--);
+					}
+				}
+			}
+		}
+	}
+
 	@Override
 	public synchronized Story save(Story story, String luid, Progress pg)
 			throws IOException {
@@ -266,9 +320,10 @@ public class CacheLibrary extends BasicLibrary {
 		pg.addProgress(pgCacheLib, 1);
 
 		story = lib.save(story, luid, pgLib);
-		story = cacheLib.save(story, story.getMeta().getLuid(), pgCacheLib);
+		updateMetaCache(metasReal, story.getMeta());
 
-		updateInfo(story.getMeta());
+		story = cacheLib.save(story, story.getMeta().getLuid(), pgCacheLib);
+		updateMetaCache(metasMixed, story.getMeta());
 
 		return story;
 	}
@@ -314,7 +369,12 @@ public class CacheLibrary extends BasicLibrary {
 		meta.setAuthor(newAuthor);
 		pg.done();
 
-		invalidateInfo(luid);
+		if (isCached(luid)) {
+			updateMetaCache(metasMixed, meta);
+			updateMetaCache(metasReal, lib.getInfo(luid));
+		} else {
+			updateMetaCache(metasReal, meta);
+		}
 	}
 
 	@Override
@@ -346,10 +406,11 @@ public class CacheLibrary extends BasicLibrary {
 		pg.addProgress(pgCache, 3);
 
 		MetaData meta = lib.imprt(url, pgImprt);
-		updateInfo(meta);
-		
+		updateMetaCache(metasReal, meta);
+		metasMixed = null;
+
 		clearFromCache(meta.getLuid());
-		
+
 		pg.done();
 		return meta;
 	}