X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FCacheLibrary.java;h=e128da525b6616befc61a5917119a3e70f1e2b26;hb=b6b657954954280c9ab0efcec67f3fe4a3ae0945;hp=74af1b682c3ac21a982a7af0407b7e58edb322c4;hpb=585ae2b8eb73f844fff4205fab2d4625830bec54;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index 74af1b6..e128da5 100644
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -52,7 +52,7 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	protected List<MetaData> getMetas(Progress pg) {
+	protected List<MetaData> getMetas(Progress pg) throws IOException {
 		if (pg == null) {
 			pg = new Progress();
 		}
@@ -66,28 +66,28 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public synchronized Story getStory(String luid, MetaData meta, Progress pg) {
-		String type = cacheLib.getOutputType(meta.isImageDocument());
-		MetaData cachedMeta = meta.clone();
-		cachedMeta.setType(type);
+	public synchronized MetaData getInfo(String luid) throws IOException {
+		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)
+			throws IOException {
 		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 {
@@ -102,6 +102,32 @@ 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)
+			throws IOException {
+		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();
 
@@ -110,7 +136,7 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public Image getCover(final String luid) {
+	public Image getCover(final String luid) throws IOException {
 		if (isCached(luid)) {
 			return cacheLib.getCover(luid);
 		}
@@ -120,7 +146,7 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public Image getSourceCover(String source) {
+	public Image getSourceCover(String source) throws IOException {
 		Image custom = getCustomSourceCover(source);
 		if (custom != null) {
 			return custom;
@@ -135,7 +161,7 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public Image getAuthorCover(String author) {
+	public Image getAuthorCover(String author) throws IOException {
 		Image custom = getCustomAuthorCover(author);
 		if (custom != null) {
 			return custom;
@@ -150,7 +176,7 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public Image getCustomSourceCover(String source) {
+	public Image getCustomSourceCover(String source) throws IOException {
 		Image custom = cacheLib.getCustomSourceCover(source);
 		if (custom == null) {
 			custom = lib.getCustomSourceCover(source);
@@ -163,7 +189,7 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public Image getCustomAuthorCover(String author) {
+	public Image getCustomAuthorCover(String author) throws IOException {
 		Image custom = cacheLib.getCustomAuthorCover(author);
 		if (custom == null) {
 			custom = lib.getCustomAuthorCover(author);
@@ -176,19 +202,19 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public void setSourceCover(String source, String luid) {
+	public void setSourceCover(String source, String luid) throws IOException {
 		lib.setSourceCover(source, luid);
 		cacheLib.setSourceCover(source, getCover(luid));
 	}
 
 	@Override
-	public void setAuthorCover(String author, String luid) {
+	public void setAuthorCover(String author, String luid) throws IOException {
 		lib.setAuthorCover(author, luid);
 		cacheLib.setAuthorCover(author, getCover(luid));
 	}
 
 	@Override
-	protected void updateInfo(MetaData meta) {
+	protected void updateInfo(MetaData meta) throws IOException {
 		if (meta != null && metas != null) {
 			for (int i = 0; i < metas.size(); i++) {
 				if (metas.get(i).getLuid().equals(meta.getLuid())) {
@@ -246,10 +272,7 @@ public class CacheLibrary extends BasicLibrary {
 		}
 		lib.delete(luid);
 
-		MetaData meta = getInfo(luid);
-		if (meta != null) {
-			metas.remove(meta);
-		}
+		invalidateInfo(luid);
 	}
 
 	@Override
@@ -282,6 +305,8 @@ public class CacheLibrary extends BasicLibrary {
 		meta.setTitle(newTitle);
 		meta.setAuthor(newAuthor);
 		pg.done();
+
+		invalidateInfo(luid);
 	}
 
 	/**
@@ -294,7 +319,11 @@ public class CacheLibrary extends BasicLibrary {
 	 * @return TRUE if it is
 	 */
 	public boolean isCached(String luid) {
-		return cacheLib.getInfo(luid) != null;
+		try {
+			return cacheLib.getInfo(luid) != null;
+		} catch (IOException e) {
+			return false;
+		}
 	}
 
 	/**
@@ -316,7 +345,7 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public Story imprt(URL url, Progress pg) throws IOException {
+	public MetaData imprt(URL url, Progress pg) throws IOException {
 		if (pg == null) {
 			pg = new Progress();
 		}
@@ -327,13 +356,13 @@ public class CacheLibrary extends BasicLibrary {
 		pg.addProgress(pgImprt, 7);
 		pg.addProgress(pgCache, 3);
 
-		Story story = lib.imprt(url, pgImprt);
-		cacheLib.save(story, story.getMeta().getLuid(), pgCache);
-
-		updateInfo(story.getMeta());
+		MetaData meta = lib.imprt(url, pgImprt);
+		updateInfo(meta);
+		
+		clearFromCache(meta.getLuid());
 
 		pg.done();
-		return story;
+		return meta;
 	}
 
 	// All the following methods are only used by Save and Delete in