X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=a550740bafa7a9105d271ef9dd7df53515651d6e;hb=cf45a4c44b472d0e1bbbcbc9891020366e99364c;hp=40128979ee4dcfdf318272077a99c014ab396097;hpb=ff05b8284e6e415b13d3543650075d0f7cd27ff5;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index 4012897..a550740 100644
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -1,14 +1,15 @@
 package be.nikiroo.fanfix.library;
 
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 import java.util.List;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.UiConfig;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.utils.Image;
 import be.nikiroo.utils.Progress;
 
 /**
@@ -45,6 +46,11 @@ public class CacheLibrary extends BasicLibrary {
 		return lib.getLibraryName();
 	}
 
+	@Override
+	public Status getStatus() {
+		return lib.getStatus();
+	}
+
 	@Override
 	protected List<MetaData> getMetas(Progress pg) {
 		if (pg == null) {
@@ -77,12 +83,10 @@ public class CacheLibrary extends BasicLibrary {
 		if (!isCached(luid)) {
 			try {
 				cacheLib.imprt(lib, luid, pgImport);
+				updateInfo(cacheLib.getInfo(luid));
 				pgImport.done();
-				Story story = cacheLib.getStory(luid, pgGet);
-				metas.remove(story.getMeta());
-				metas.add(story.getMeta());
 			} catch (IOException e) {
-				Instance.syserr(e);
+				Instance.getTraceHandler().error(e);
 			}
 
 			pgImport.done();
@@ -97,41 +101,112 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public BufferedImage getCover(final String luid) {
-		// Retrieve it from the cache if possible:
+	public Image getCover(final String luid) {
 		if (isCached(luid)) {
 			return cacheLib.getCover(luid);
 		}
 
+		// We could update the cache here, but it's not easy
 		return lib.getCover(luid);
 	}
 
 	@Override
-	protected void clearCache() {
-		metas = null;
-		cacheLib.clearCache();
-		lib.clearCache();
+	public Image getSourceCover(String source) {
+		Image custom = getCustomSourceCover(source);
+		if (custom != null) {
+			return custom;
+		}
+
+		Image cached = cacheLib.getSourceCover(source);
+		if (cached != null) {
+			return cached;
+		}
+
+		return lib.getSourceCover(source);
+	}
+
+	@Override
+	public Image getCustomSourceCover(String source) {
+		Image custom = cacheLib.getCustomSourceCover(source);
+		if (custom == null) {
+			custom = lib.getCustomSourceCover(source);
+			if (custom != null) {
+				cacheLib.setSourceCover(source, custom);
+			}
+		}
+
+		return custom;
+	}
+
+	@Override
+	public void setSourceCover(String source, String luid) {
+		lib.setSourceCover(source, luid);
+		cacheLib.setSourceCover(source, getCover(luid));
+	}
+
+	@Override
+	protected void updateInfo(MetaData meta) {
+		if (meta != null && metas != null) {
+			for (int i = 0; i < metas.size(); i++) {
+				if (metas.get(i).getLuid().equals(meta.getLuid())) {
+					metas.set(i, meta);
+				}
+			}
+		}
+
+		cacheLib.updateInfo(meta);
+		lib.updateInfo(meta);
+	}
+
+	@Override
+	protected void deleteInfo(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--);
+				}
+			}
+		}
+
+		cacheLib.deleteInfo(luid);
+		lib.deleteInfo(luid);
 	}
 
 	@Override
 	public synchronized Story save(Story story, String luid, Progress pg)
 			throws IOException {
-		story = lib.save(story, luid, pg);
-		clearCache();
+		Progress pgLib = new Progress();
+		Progress pgCacheLib = new Progress();
+
+		if (pg == null) {
+			pg = new Progress();
+		}
+
+		pg.setMinMax(0, 2);
+		pg.addProgress(pgLib, 1);
+		pg.addProgress(pgCacheLib, 1);
+
+		story = lib.save(story, luid, pgLib);
+		story = cacheLib.save(story, story.getMeta().getLuid(), pgCacheLib);
+
+		updateInfo(story.getMeta());
+
 		return story;
 	}
 
 	@Override
 	public synchronized void delete(String luid) throws IOException {
-		cacheLib.delete(luid);
+		if (isCached(luid)) {
+			cacheLib.delete(luid);
+		}
 		lib.delete(luid);
-		clearCache();
-	}
 
-	@Override
-	public void setSourceCover(String source, String luid) {
-		cacheLib.setSourceCover(source, luid);
-		lib.setSourceCover(source, luid);
+		MetaData meta = getInfo(luid);
+		if (meta != null) {
+			metas.remove(meta);
+		}
 	}
 
 	@Override
@@ -147,11 +222,20 @@ public class CacheLibrary extends BasicLibrary {
 		pg.addProgress(pgCache, 1);
 		pg.addProgress(pgOrig, 1);
 
-		cacheLib.changeSource(luid, newSource, pgCache);
+		MetaData meta = getInfo(luid);
+		if (meta == null) {
+			throw new IOException("Story not found: " + luid);
+		}
+
+		if (isCached(luid)) {
+			cacheLib.changeSource(luid, newSource, pgCache);
+		}
 		pgCache.done();
+
 		lib.changeSource(luid, newSource, pgOrig);
 		pgOrig.done();
 
+		meta.setSource(newSource);
 		pg.done();
 	}
 
@@ -170,6 +254,9 @@ 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
@@ -178,8 +265,30 @@ public class CacheLibrary extends BasicLibrary {
 	 *             in case of I/O error
 	 */
 	public void clearFromCache(String luid) throws IOException {
-		cacheLib.delete(luid);
-		clearCache();
+		if (isCached(luid)) {
+			cacheLib.delete(luid);
+		}
+	}
+
+	@Override
+	public Story imprt(URL url, Progress pg) throws IOException {
+		if (pg == null) {
+			pg = new Progress();
+		}
+
+		Progress pgImprt = new Progress();
+		Progress pgCache = new Progress();
+		pg.setMinMax(0, 10);
+		pg.addProgress(pgImprt, 7);
+		pg.addProgress(pgCache, 3);
+
+		Story story = lib.imprt(url, pgImprt);
+		cacheLib.save(story, story.getMeta().getLuid(), pgCache);
+
+		updateInfo(story.getMeta());
+
+		pg.done();
+		return story;
 	}
 
 	// All the following methods are only used by Save and Delete in