X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=977331f33ecf0783084f730414b0862dd1de86c1;hb=9e2fad3600cd08eca73d45cb5c991d98095842aa;hp=28f568210bbcf137a1690989cad15fac50ae72e7;hpb=0fa0fe9552e57bf05d8dd295a9d96d2364730c4e;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index 28f5682..977331f 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;
 
 /**
@@ -82,8 +83,8 @@ public class CacheLibrary extends BasicLibrary {
 		if (!isCached(luid)) {
 			try {
 				cacheLib.imprt(lib, luid, pgImport);
+				updateInfo(cacheLib.getInfo(luid));
 				pgImport.done();
-				clearCache();
 			} catch (IOException e) {
 				Instance.getTraceHandler().error(e);
 			}
@@ -100,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);
 		}
@@ -110,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);
 	}
@@ -122,10 +123,33 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	protected void clearCache() {
-		metas = null;
-		cacheLib.clearCache();
-		lib.clearCache();
+	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
@@ -145,7 +169,7 @@ public class CacheLibrary extends BasicLibrary {
 		story = lib.save(story, luid, pgLib);
 		story = cacheLib.save(story, story.getMeta().getLuid(), pgCacheLib);
 
-		clearCache();
+		updateInfo(story.getMeta());
 
 		return story;
 	}
@@ -156,7 +180,11 @@ public class CacheLibrary extends BasicLibrary {
 			cacheLib.delete(luid);
 		}
 		lib.delete(luid);
-		clearCache();
+
+		MetaData meta = getInfo(luid);
+		if (meta != null) {
+			metas.remove(meta);
+		}
 	}
 
 	@Override
@@ -172,13 +200,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();
 	}
 
@@ -207,10 +242,30 @@ public class CacheLibrary extends BasicLibrary {
 	public void clearFromCache(String luid) throws IOException {
 		if (isCached(luid)) {
 			cacheLib.delete(luid);
-			clearCache();
 		}
 	}
 
+	@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
 	// BasicLibrary: