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

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index ea1fd70..8f6e9c2 100644
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -66,33 +66,27 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@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);
+	public synchronized MetaData getInfo(String luid) {
+		MetaData info = cacheLib.getInfo(luid);
+		if (info == null) {
+			info = lib.getInfo(luid);
+		}
 
-		return super.getStory(luid, cachedMeta, pg);
+		return info;
 	}
 
 	@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 {
@@ -107,6 +101,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();
 
@@ -251,10 +270,7 @@ public class CacheLibrary extends BasicLibrary {
 		}
 		lib.delete(luid);
 
-		MetaData meta = getInfo(luid);
-		if (meta != null) {
-			metas.remove(meta);
-		}
+		invalidateInfo(luid);
 	}
 
 	@Override
@@ -287,6 +303,8 @@ public class CacheLibrary extends BasicLibrary {
 		meta.setTitle(newTitle);
 		meta.setAuthor(newAuthor);
 		pg.done();
+
+		invalidateInfo(luid);
 	}
 
 	/**