X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=f665e383cad2f43f6c0b1807d56e5fdb69705b13;hb=03c1cedeecd924073580fff4a8e6665dd5cf8cd5;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..f665e38 100644
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -78,11 +78,9 @@ public class CacheLibrary extends BasicLibrary {
 			try {
 				cacheLib.imprt(lib, luid, pgImport);
 				pgImport.done();
-				Story story = cacheLib.getStory(luid, pgGet);
-				metas.remove(story.getMeta());
-				metas.add(story.getMeta());
+				clearCache();
 			} catch (IOException e) {
-				Instance.syserr(e);
+				Instance.getTraceHandler().error(e);
 			}
 
 			pgImport.done();
@@ -98,14 +96,26 @@ public class CacheLibrary extends BasicLibrary {
 
 	@Override
 	public BufferedImage getCover(final String luid) {
-		// Retrieve it from the cache if possible:
 		if (isCached(luid)) {
 			return cacheLib.getCover(luid);
 		}
 
+		// We could update the cache here, but it's not easy
 		return lib.getCover(luid);
 	}
 
+	@Override
+	public BufferedImage getSourceCover(String source) {
+		// no cache for the source cover
+		return lib.getSourceCover(source);
+	}
+
+	@Override
+	public void setSourceCover(String source, String luid) {
+		lib.setSourceCover(source, luid);
+		cacheLib.setSourceCover(source, getSourceCover(source));
+	}
+
 	@Override
 	protected void clearCache() {
 		metas = null;
@@ -116,24 +126,34 @@ public class CacheLibrary extends BasicLibrary {
 	@Override
 	public synchronized Story save(Story story, String luid, Progress pg)
 			throws IOException {
-		story = lib.save(story, luid, pg);
+		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, luid, pgCacheLib);
+
 		clearCache();
+
 		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);
-	}
-
 	@Override
 	public synchronized void changeSource(String luid, String newSource,
 			Progress pg) throws IOException {
@@ -147,7 +167,9 @@ public class CacheLibrary extends BasicLibrary {
 		pg.addProgress(pgCache, 1);
 		pg.addProgress(pgOrig, 1);
 
-		cacheLib.changeSource(luid, newSource, pgCache);
+		if (isCached(luid)) {
+			cacheLib.changeSource(luid, newSource, pgCache);
+		}
 		pgCache.done();
 		lib.changeSource(luid, newSource, pgOrig);
 		pgOrig.done();
@@ -178,8 +200,10 @@ 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);
+			clearCache();
+		}
 	}
 
 	// All the following methods are only used by Save and Delete in