X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=ea1fd707913ba0b6696e732a64f38cc3d9cfcdbc;hb=60f723111f3f7f5bd60760afa7d0b645406b48d7;hp=a9063308f8faf2ca0741c22b0e2cb21ea198ef96;hpb=b56c9d60fe4ed9470881ebf6221acb0a52997291;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index a906330..ea1fd70 100644
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -65,6 +65,20 @@ public class CacheLibrary extends BasicLibrary {
 		return metas;
 	}
 
+	@Override
+	public synchronized Story getStory(String luid, MetaData meta, Progress pg) {
+		String normal = Instance.getUiConfig().getString(
+				UiConfig.GUI_NON_IMAGES_DOCUMENT_TYPE);
+		String images = Instance.getUiConfig().getString(
+				UiConfig.GUI_IMAGES_DOCUMENT_TYPE);
+		String type = meta.isImageDocument() ? images : normal;
+
+		MetaData cachedMeta = meta.clone();
+		cachedMeta.setType(type);
+
+		return super.getStory(luid, cachedMeta, pg);
+	}
+
 	@Override
 	public synchronized File getFile(final String luid, Progress pg) {
 		if (pg == null) {
@@ -112,14 +126,70 @@ public class CacheLibrary extends BasicLibrary {
 
 	@Override
 	public Image getSourceCover(String source) {
-		// no cache for the source cover
+		Image custom = getCustomSourceCover(source);
+		if (custom != null) {
+			return custom;
+		}
+
+		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
+	public Image getCustomSourceCover(String source) {
+		Image custom = cacheLib.getCustomSourceCover(source);
+		if (custom == null) {
+			custom = lib.getCustomSourceCover(source);
+			if (custom != null) {
+				cacheLib.setSourceCover(source, custom);
+			}
+		}
+
+		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
@@ -137,7 +207,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) {
@@ -148,8 +218,8 @@ public class CacheLibrary extends BasicLibrary {
 			}
 		}
 
-		cacheLib.deleteInfo(luid);
-		lib.deleteInfo(luid);
+		cacheLib.invalidateInfo(luid);
+		lib.invalidateInfo(luid);
 	}
 
 	@Override
@@ -188,8 +258,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();
 		}
@@ -206,14 +276,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();
 	}
 
@@ -232,6 +304,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
@@ -242,7 +317,6 @@ public class CacheLibrary extends BasicLibrary {
 	public void clearFromCache(String luid) throws IOException {
 		if (isCached(luid)) {
 			cacheLib.delete(luid);
-			deleteInfo(luid);
 		}
 	}