X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=ee22e3439cc6d38001b6c36885106641fba0112a;hb=678390e0f81b5337bd20ec59df9cf75bff9824e9;hp=da6f56d3fa8fac1a097ad6df9ee47ac3f0dc5b42;hpb=62c63b0724f4bc45999cb2e7186b4b3ada479a0a;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index da6f56d..ee22e34 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) {
@@ -78,7 +84,7 @@ public class CacheLibrary extends BasicLibrary {
 			try {
 				cacheLib.imprt(lib, luid, pgImport);
 				pgImport.done();
-				clearCache();
+				invalidateInfo(luid);
 			} catch (IOException e) {
 				Instance.getTraceHandler().error(e);
 			}
@@ -95,7 +101,7 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public BufferedImage getCover(final String luid) {
+	public Image getCover(final String luid) {
 		if (isCached(luid)) {
 			return cacheLib.getCover(luid);
 		}
@@ -105,7 +111,7 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public BufferedImage getSourceCover(String source) {
+	public Image getSourceCover(String source) {
 		// no cache for the source cover
 		return lib.getSourceCover(source);
 	}
@@ -117,17 +123,45 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	protected void clearCache() {
-		metas = null;
-		cacheLib.clearCache();
-		lib.clearCache();
+	protected void invalidateInfo(String luid) {
+		if (luid == null) {
+			metas = null;
+		} else if (metas != null) {
+			MetaData meta = lib.getInfo(luid);
+			for (int i = 0; i < metas.size(); i++) {
+				if (metas.get(i).getLuid().equals(luid)) {
+					metas.remove(i--);
+				}
+			}
+
+			if (meta != null) {
+				metas.add(meta);
+			}
+		}
+
+		cacheLib.invalidateInfo(luid);
+		lib.invalidateInfo(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);
+
+		invalidateInfo(story.getMeta().getLuid());
+
 		return story;
 	}
 
@@ -137,7 +171,11 @@ public class CacheLibrary extends BasicLibrary {
 			cacheLib.delete(luid);
 		}
 		lib.delete(luid);
-		clearCache();
+
+		MetaData meta = getInfo(luid);
+		if (meta != null) {
+			metas.remove(meta);
+		}
 	}
 
 	@Override
@@ -153,13 +191,20 @@ public class CacheLibrary extends BasicLibrary {
 		pg.addProgress(pgCache, 1);
 		pg.addProgress(pgOrig, 1);
 
+		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();
 	}
 
@@ -188,10 +233,31 @@ public class CacheLibrary extends BasicLibrary {
 	public void clearFromCache(String luid) throws IOException {
 		if (isCached(luid)) {
 			cacheLib.delete(luid);
-			clearCache();
+			invalidateInfo(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);
+
+		invalidateInfo(story.getMeta().getLuid());
+
+		pg.done();
+		return story;
+	}
+
 	// All the following methods are only used by Save and Delete in
 	// BasicLibrary: