X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=7f4bb370d5a4fb0ad98e1c4c0882390cb5374512;hb=e272f05fd49f01e9fb6bd71c7b74a32839bbcc38;hp=f665e383cad2f43f6c0b1807d56e5fdb69705b13;hpb=03c1cedeecd924073580fff4a8e6665dd5cf8cd5;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index f665e38..7f4bb37 100644
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -3,6 +3,7 @@ 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;
@@ -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);
 			}
@@ -117,10 +123,31 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	protected void clearCache() {
-		metas = null;
-		cacheLib.clearCache();
-		lib.clearCache();
+	protected void invalidateInfo(String luid) {
+		List<MetaData> metas = this.metas;
+
+		if (luid == null) {
+			this.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)) {
+					if (meta != null) {
+						metas.set(i, meta);
+						meta = null;
+					} else {
+						metas.remove(i--);
+					}
+				}
+			}
+
+			if (meta != null) {
+				metas.add(meta);
+			}
+		}
+
+		cacheLib.invalidateInfo(luid);
+		lib.invalidateInfo(luid);
 	}
 
 	@Override
@@ -138,9 +165,9 @@ public class CacheLibrary extends BasicLibrary {
 		pg.addProgress(pgCacheLib, 1);
 
 		story = lib.save(story, luid, pgLib);
-		story = cacheLib.save(story, luid, pgCacheLib);
+		story = cacheLib.save(story, story.getMeta().getLuid(), pgCacheLib);
 
-		clearCache();
+		invalidateInfo(story.getMeta().getLuid());
 
 		return story;
 	}
@@ -151,7 +178,15 @@ public class CacheLibrary extends BasicLibrary {
 			cacheLib.delete(luid);
 		}
 		lib.delete(luid);
-		clearCache();
+
+		List<MetaData> metas = this.metas;
+		if (metas != null) {
+			for (int i = 0; i < metas.size(); i++) {
+				if (metas.get(i).getLuid().equals(luid)) {
+					metas.set(i, lib.getInfo(luid));
+				}
+			}
+		}
 	}
 
 	@Override
@@ -167,13 +202,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();
 	}
 
@@ -202,8 +244,27 @@ 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);
+
+		pg.done();
+		return story;
 	}
 
 	// All the following methods are only used by Save and Delete in