X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=bafaf9461a65b60a66a760eee66a9c3fa5d275bd;hb=d4449e9632aac4c20bdb9183cabb37b377270c41;hp=29920e8902b0090354ae7d82680fe7d4bdf866d3;hpb=e1de8087ab1623f7624018af905ea3bb0ef45802;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index 29920e8..bafaf94 100644
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -66,19 +66,17 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public synchronized File getFile(final String luid, Progress pg) {
+	public synchronized Story getStory(String luid, MetaData meta, Progress pg) {
 		if (pg == null) {
 			pg = new Progress();
 		}
 
 		Progress pgImport = new Progress();
 		Progress pgGet = new Progress();
-		Progress pgRecall = new Progress();
 
-		pg.setMinMax(0, 5);
+		pg.setMinMax(0, 4);
 		pg.addProgress(pgImport, 3);
 		pg.addProgress(pgGet, 1);
-		pg.addProgress(pgRecall, 1);
 
 		if (!isCached(luid)) {
 			try {
@@ -93,6 +91,31 @@ public class CacheLibrary extends BasicLibrary {
 			pgGet.done();
 		}
 
+		String type = cacheLib.getOutputType(meta.isImageDocument());
+		MetaData cachedMeta = meta.clone();
+		cachedMeta.setType(type);
+
+		return cacheLib.getStory(luid, cachedMeta, pg);
+	}
+
+	@Override
+	public synchronized File getFile(final String luid, Progress pg) {
+		if (pg == null) {
+			pg = new Progress();
+		}
+
+		Progress pgGet = new Progress();
+		Progress pgRecall = new Progress();
+
+		pg.setMinMax(0, 5);
+		pg.addProgress(pgGet, 4);
+		pg.addProgress(pgRecall, 1);
+
+		if (!isCached(luid)) {
+			getStory(luid, pgGet);
+			pgGet.done();
+		}
+
 		File file = cacheLib.getFile(luid, pgRecall);
 		pgRecall.done();
 
@@ -117,7 +140,27 @@ public class CacheLibrary extends BasicLibrary {
 			return custom;
 		}
 
-		return cacheLib.getSourceCover(source);
+		Image cached = cacheLib.getSourceCover(source);
+		if (cached != null) {
+			return cached;
+		}
+
+		return lib.getSourceCover(source);
+	}
+
+	@Override
+	public Image getAuthorCover(String author) {
+		Image custom = getCustomAuthorCover(author);
+		if (custom != null) {
+			return custom;
+		}
+
+		Image cached = cacheLib.getAuthorCover(author);
+		if (cached != null) {
+			return cached;
+		}
+
+		return lib.getAuthorCover(author);
 	}
 
 	@Override
@@ -133,10 +176,29 @@ public class CacheLibrary extends BasicLibrary {
 		return custom;
 	}
 
+	@Override
+	public Image getCustomAuthorCover(String author) {
+		Image custom = cacheLib.getCustomAuthorCover(author);
+		if (custom == null) {
+			custom = lib.getCustomAuthorCover(author);
+			if (custom != null) {
+				cacheLib.setAuthorCover(author, custom);
+			}
+		}
+
+		return custom;
+	}
+
 	@Override
 	public void setSourceCover(String source, String luid) {
 		lib.setSourceCover(source, luid);
-		cacheLib.setSourceCover(source, getSourceCover(source));
+		cacheLib.setSourceCover(source, getCover(luid));
+	}
+
+	@Override
+	public void setAuthorCover(String author, String luid) {
+		lib.setAuthorCover(author, luid);
+		cacheLib.setAuthorCover(author, getCover(luid));
 	}
 
 	@Override
@@ -154,7 +216,7 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	protected void deleteInfo(String luid) {
+	protected void invalidateInfo(String luid) {
 		if (luid == null) {
 			metas = null;
 		} else if (metas != null) {
@@ -165,8 +227,8 @@ public class CacheLibrary extends BasicLibrary {
 			}
 		}
 
-		cacheLib.deleteInfo(luid);
-		lib.deleteInfo(luid);
+		cacheLib.invalidateInfo(luid);
+		lib.invalidateInfo(luid);
 	}
 
 	@Override
@@ -205,8 +267,8 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public synchronized void changeSource(String luid, String newSource,
-			Progress pg) throws IOException {
+	protected synchronized void changeSTA(String luid, String newSource,
+			String newTitle, String newAuthor, Progress pg) throws IOException {
 		if (pg == null) {
 			pg = new Progress();
 		}
@@ -223,14 +285,16 @@ public class CacheLibrary extends BasicLibrary {
 		}
 
 		if (isCached(luid)) {
-			cacheLib.changeSource(luid, newSource, pgCache);
+			cacheLib.changeSTA(luid, newSource, newTitle, newAuthor, pgCache);
 		}
 		pgCache.done();
 
-		lib.changeSource(luid, newSource, pgOrig);
+		lib.changeSTA(luid, newSource, newTitle, newAuthor, pgOrig);
 		pgOrig.done();
 
 		meta.setSource(newSource);
+		meta.setTitle(newTitle);
+		meta.setAuthor(newAuthor);
 		pg.done();
 	}
 
@@ -249,6 +313,9 @@ public class CacheLibrary extends BasicLibrary {
 
 	/**
 	 * Clear the {@link Story} from the cache.
+	 * <p>
+	 * The next time we try to retrieve the {@link Story}, it may be required to
+	 * cache it again.
 	 * 
 	 * @param luid
 	 *            the story to clear