X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FGuiReaderBook.java;h=29f4c49783a0a727d7c9f08011ee5c8408617c9c;hb=14b574483b51d3859acef6a269f8841b5a4eb5f8;hp=6475bd9736cf2ebe975a92295f2513317bf386ed;hpb=211f7ddb50f68aa8a999023ef6d63d5756bdace6;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/reader/GuiReaderBook.java b/src/be/nikiroo/fanfix/reader/GuiReaderBook.java
index 6475bd9..29f4c49 100644
--- a/src/be/nikiroo/fanfix/reader/GuiReaderBook.java
+++ b/src/be/nikiroo/fanfix/reader/GuiReaderBook.java
@@ -103,7 +103,7 @@ class GuiReaderBook extends JPanel {
 	 * @param reader
 	 *            the associated reader
 	 * @param meta
-	 *            the story {@link MetaData}
+	 *            the story {@link MetaData} or source (if no LUID)
 	 * @param cached
 	 *            TRUE if it is locally cached
 	 * @param seeWordCount
@@ -128,6 +128,8 @@ class GuiReaderBook extends JPanel {
 
 		if (optSecondary != null && !optSecondary.isEmpty()) {
 			optSecondary = "(" + optSecondary + ")";
+		} else {
+			optSecondary = "";
 		}
 
 		icon = new JLabel(generateCoverIcon(meta));
@@ -362,31 +364,39 @@ class GuiReaderBook extends JPanel {
 	 * Generate a cover icon based upon the given {@link MetaData}.
 	 * 
 	 * @param meta
-	 *            the {@link MetaData} about the target {@link Story}
+	 *            the {@link MetaData} about the target {@link Story} or source
+	 *            (if no LUID)
 	 * 
 	 * @return the icon
 	 */
 	private ImageIcon generateCoverIcon(MetaData meta) {
-		String id = meta.getUuid() + ".thumb_" + SPINE_WIDTH + "x"
-				+ COVER_WIDTH + "+" + SPINE_HEIGHT + "+" + COVER_HEIGHT + "@"
-				+ HOFFSET;
 		BufferedImage resizedImage = null;
-
-		InputStream in = Instance.getCache().getFromCache(id);
-		if (in != null) {
-			try {
-				resizedImage = ImageUtils.fromStream(in);
-				in.close();
-				in = null;
-			} catch (IOException e) {
-				Instance.syserr(e);
+		String id = null;
+
+		if (meta.getLuid() != null) {
+			id = meta.getUuid() + ".thumb_" + SPINE_WIDTH + "x" + COVER_WIDTH
+					+ "+" + SPINE_HEIGHT + "+" + COVER_HEIGHT + "@" + HOFFSET;
+			InputStream in = Instance.getCache().getFromCache(id);
+			if (in != null) {
+				try {
+					resizedImage = ImageUtils.fromStream(in);
+					in.close();
+					in = null;
+				} catch (IOException e) {
+					Instance.syserr(e);
+				}
 			}
 		}
 
 		if (resizedImage == null) {
 			try {
-				BufferedImage cover = reader.getLibrary().getCover(
-						meta.getLuid());
+				BufferedImage cover = null;
+				if (meta.getLuid() == null) {
+					cover = reader.getLibrary()
+							.getSourceCover(meta.getSource());
+				} else {
+					cover = reader.getLibrary().getCover(meta.getLuid());
+				}
 
 				resizedImage = new BufferedImage(SPINE_WIDTH + COVER_WIDTH,
 						SPINE_HEIGHT + COVER_HEIGHT + HOFFSET,
@@ -404,13 +414,15 @@ class GuiReaderBook extends JPanel {
 				}
 				g.dispose();
 
-				ByteArrayOutputStream out = new ByteArrayOutputStream();
-				ImageIO.write(resizedImage, "png", out);
-				byte[] imageBytes = out.toByteArray();
-				in = new ByteArrayInputStream(imageBytes);
-				Instance.getCache().addToCache(in, id);
-				in.close();
-				in = null;
+				if (id != null) {
+					ByteArrayOutputStream out = new ByteArrayOutputStream();
+					ImageIO.write(resizedImage, "png", out);
+					byte[] imageBytes = out.toByteArray();
+					InputStream in = new ByteArrayInputStream(imageBytes);
+					Instance.getCache().addToCache(in, id);
+					in.close();
+					in = null;
+				}
 			} catch (MalformedURLException e) {
 				Instance.syserr(e);
 			} catch (IOException e) {