X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FLocalLibrary.java;h=9ebff72c2151d7d6f6e7e0f6cf86fafc42911aed;hb=c8d48938ca540d7b619a2c19bd76623d689b72cb;hp=838c97cf3e8b55363ab4683b07596c6857b74ac0;hpb=9b863b20370118c95c6801b73dda951c7e507871;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/library/LocalLibrary.java b/src/be/nikiroo/fanfix/library/LocalLibrary.java
index 838c97c..9ebff72 100644
--- a/src/be/nikiroo/fanfix/library/LocalLibrary.java
+++ b/src/be/nikiroo/fanfix/library/LocalLibrary.java
@@ -3,6 +3,7 @@ package be.nikiroo.fanfix.library;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -122,6 +123,10 @@ public class LocalLibrary extends BasicLibrary {
 	public Image getCover(String luid) {
 		MetaData meta = getInfo(luid);
 		if (meta != null) {
+			if (meta.getCover() != null) {
+				return meta.getCover();
+			}
+
 			File[] files = getStories(null).get(meta);
 			if (files != null) {
 				File infoFile = files[0];
@@ -140,11 +145,11 @@ public class LocalLibrary extends BasicLibrary {
 
 	@Override
 	protected synchronized void updateInfo(MetaData meta) {
-		deleteInfo();
+		invalidateInfo();
 	}
 
 	@Override
-	protected void deleteInfo(String luid) {
+	protected void invalidateInfo(String luid) {
 		stories = null;
 		sourceCovers = null;
 	}
@@ -194,8 +199,8 @@ public class LocalLibrary extends BasicLibrary {
 				try {
 					String name = relatedFile.getName().replaceFirst(
 							"\\.info$", "");
-					InfoCover.writeInfo(newDir, name, meta);
 					relatedFile.delete();
+					InfoCover.writeInfo(newDir, name, meta);
 					relatedFile.getParentFile().delete();
 				} catch (IOException e) {
 					Instance.getTraceHandler().error(e);
@@ -206,17 +211,41 @@ public class LocalLibrary extends BasicLibrary {
 			}
 		}
 
-		deleteInfo();
+		invalidateInfo();
 	}
 
 	@Override
-	public Image getSourceCover(String source) {
+	public synchronized Image getCustomSourceCover(String source) {
 		if (sourceCovers == null) {
-			getStories(null);
+			sourceCovers = new HashMap<String, Image>();
 		}
 
-		if (!sourceCovers.containsKey(source)) {
-			sourceCovers.put(source, super.getSourceCover(source));
+		Image img = sourceCovers.get(source);
+		if (img != null) {
+			return img;
+		}
+
+		File coverDir = new File(baseDir, source);
+		if (coverDir.isDirectory()) {
+			File cover = new File(coverDir, ".cover.png");
+			if (cover.exists()) {
+				InputStream in;
+				try {
+					in = new FileInputStream(cover);
+					try {
+						sourceCovers.put(source, new Image(in));
+					} finally {
+						in.close();
+					}
+				} catch (FileNotFoundException e) {
+					e.printStackTrace();
+				} catch (IOException e) {
+					Instance.getTraceHandler().error(
+							new IOException(
+									"Cannot load the existing custom source cover: "
+											+ cover, e));
+				}
+			}
 		}
 
 		return sourceCovers.get(source);
@@ -224,18 +253,28 @@ public class LocalLibrary extends BasicLibrary {
 
 	@Override
 	public void setSourceCover(String source, String luid) {
-		if (sourceCovers == null) {
-			getStories(null);
-		}
+		setSourceCover(source, getCover(luid));
+	}
 
-		sourceCovers.put(source, getCover(luid));
-		File cover = new File(getExpectedDir(source), ".cover");
+	/**
+	 * Fix the source cover to the given story cover.
+	 * 
+	 * @param source
+	 *            the source to change
+	 * @param coverImage
+	 *            the cover image
+	 */
+	synchronized void setSourceCover(String source, Image coverImage) {
+		File dir = getExpectedDir(source);
+		dir.mkdirs();
+		File cover = new File(dir, ".cover");
 		try {
-			Instance.getCache().saveAsImage(sourceCovers.get(source), cover,
-					true);
+			Instance.getCache().saveAsImage(coverImage, cover, true);
+			if (sourceCovers != null) {
+				sourceCovers.put(source, coverImage);
+			}
 		} catch (IOException e) {
 			Instance.getTraceHandler().error(e);
-			sourceCovers.remove(source);
 		}
 	}
 
@@ -286,7 +325,7 @@ public class LocalLibrary extends BasicLibrary {
 					pg.add(1);
 				}
 
-				deleteInfo();
+				invalidateInfo();
 				pg.done();
 				return;
 			}
@@ -427,7 +466,7 @@ public class LocalLibrary extends BasicLibrary {
 	 * {@link LocalLibrary#baseDir}.
 	 * <p>
 	 * Will use a cached list when possible (see
-	 * {@link BasicLibrary#deleteInfo()}).
+	 * {@link BasicLibrary#invalidateInfo()}).
 	 * 
 	 * @param pg
 	 *            the optional {@link Progress}
@@ -444,7 +483,6 @@ public class LocalLibrary extends BasicLibrary {
 
 		if (stories == null) {
 			stories = new HashMap<MetaData, File[]>();
-			sourceCovers = new HashMap<String, Image>();
 
 			lastId = 0;
 
@@ -473,13 +511,11 @@ public class LocalLibrary extends BasicLibrary {
 					pgDirs.addProgress(pgFiles, 100);
 					pgDirs.setName("Loading from: " + dir.getName());
 
-					String source = null;
 					for (File infoFile : infoFiles) {
 						pgFiles.setName(infoFile.getName());
 						try {
 							MetaData meta = InfoReader
 									.readMeta(infoFile, false);
-							source = meta.getSource();
 							try {
 								int id = Integer.parseInt(meta.getLuid());
 								if (id > lastId) {
@@ -506,20 +542,6 @@ public class LocalLibrary extends BasicLibrary {
 						pgFiles.add(1);
 					}
 
-					File cover = new File(dir, ".cover.png");
-					if (cover.exists()) {
-						try {
-							InputStream in = new FileInputStream(cover);
-							try {
-								sourceCovers.put(source, new Image(in));
-							} finally {
-								in.close();
-							}
-						} catch (IOException e) {
-							Instance.getTraceHandler().error(e);
-						}
-					}
-
 					pgFiles.setName(null);
 				}
 
@@ -530,28 +552,4 @@ public class LocalLibrary extends BasicLibrary {
 		pg.done();
 		return stories;
 	}
-
-	/**
-	 * Fix the source cover to the given story cover.
-	 * 
-	 * @param source
-	 *            the source to change
-	 * @param coverImage
-	 *            the cover image
-	 */
-	void setSourceCover(String source, Image coverImage) {
-		if (sourceCovers == null) {
-			getStories(null);
-		}
-
-		sourceCovers.put(source, coverImage);
-		File cover = new File(getExpectedDir(source), ".cover");
-		try {
-			Instance.getCache().saveAsImage(sourceCovers.get(source), cover,
-					true);
-		} catch (IOException e) {
-			Instance.getTraceHandler().error(e);
-			sourceCovers.remove(source);
-		}
-	}
 }