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

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index ea1fd70..bafaf94 100644
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -67,32 +67,16 @@ 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);
-
-		return super.getStory(luid, cachedMeta, pg);
-	}
-
-	@Override
-	public synchronized File getFile(final String luid, 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 +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();