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

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index 7f4bb37..977331f 100644
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -1,6 +1,5 @@
 package be.nikiroo.fanfix.library;
 
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -10,6 +9,7 @@ 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;
 
 /**
@@ -83,8 +83,8 @@ public class CacheLibrary extends BasicLibrary {
 		if (!isCached(luid)) {
 			try {
 				cacheLib.imprt(lib, luid, pgImport);
+				updateInfo(cacheLib.getInfo(luid));
 				pgImport.done();
-				invalidateInfo(luid);
 			} catch (IOException e) {
 				Instance.getTraceHandler().error(e);
 			}
@@ -101,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);
 		}
@@ -111,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);
 	}
@@ -123,31 +123,33 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	protected void invalidateInfo(String luid) {
-		List<MetaData> metas = this.metas;
+	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) {
-			this.metas = 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)) {
-					if (meta != null) {
-						metas.set(i, meta);
-						meta = null;
-					} else {
-						metas.remove(i--);
-					}
+					metas.remove(i--);
 				}
 			}
-
-			if (meta != null) {
-				metas.add(meta);
-			}
 		}
 
-		cacheLib.invalidateInfo(luid);
-		lib.invalidateInfo(luid);
+		cacheLib.deleteInfo(luid);
+		lib.deleteInfo(luid);
 	}
 
 	@Override
@@ -167,7 +169,7 @@ public class CacheLibrary extends BasicLibrary {
 		story = lib.save(story, luid, pgLib);
 		story = cacheLib.save(story, story.getMeta().getLuid(), pgCacheLib);
 
-		invalidateInfo(story.getMeta().getLuid());
+		updateInfo(story.getMeta());
 
 		return story;
 	}
@@ -179,13 +181,9 @@ public class CacheLibrary extends BasicLibrary {
 		}
 		lib.delete(luid);
 
-		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));
-				}
-			}
+		MetaData meta = getInfo(luid);
+		if (meta != null) {
+			metas.remove(meta);
 		}
 	}
 
@@ -244,7 +242,6 @@ public class CacheLibrary extends BasicLibrary {
 	public void clearFromCache(String luid) throws IOException {
 		if (isCached(luid)) {
 			cacheLib.delete(luid);
-			invalidateInfo(luid);
 		}
 	}
 
@@ -263,6 +260,8 @@ public class CacheLibrary extends BasicLibrary {
 		Story story = lib.imprt(url, pgImprt);
 		cacheLib.save(story, story.getMeta().getLuid(), pgCache);
 
+		updateInfo(story.getMeta());
+
 		pg.done();
 		return story;
 	}