X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FInfoReader.java;h=5203cc86107017c6fa3b3a236fe56f869def7c8c;hb=0ffa47548f474c1330d8d723300d9aa7a4894736;hp=6f1a7a50002281710613293125731f35ed0f75e0;hpb=a9eb3f46dd83115e7a549e96e800b932162b68ad;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/supported/InfoReader.java b/src/be/nikiroo/fanfix/supported/InfoReader.java
index 6f1a7a5..5203cc8 100644
--- a/src/be/nikiroo/fanfix/supported/InfoReader.java
+++ b/src/be/nikiroo/fanfix/supported/InfoReader.java
@@ -9,12 +9,15 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
+import be.nikiroo.fanfix.Instance;
+import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.utils.MarkableFileInputStream;
 
 // not complete: no "description" tag
 public class InfoReader {
-	public static MetaData readMeta(File infoFile) throws IOException {
+	public static MetaData readMeta(File infoFile, boolean withCover)
+			throws IOException {
 		if (infoFile == null) {
 			throw new IOException("File is null");
 		}
@@ -23,20 +26,20 @@ public class InfoReader {
 			InputStream in = new MarkableFileInputStream(new FileInputStream(
 					infoFile));
 			try {
-				return createMeta(infoFile.toURI().toURL(), in);
+				return createMeta(infoFile.toURI().toURL(), in, withCover);
 			} finally {
 				in.close();
 				in = null;
 			}
-		} else {
-			throw new FileNotFoundException(
-					"File given as argument does not exists: "
-							+ infoFile.getAbsolutePath());
 		}
+
+		throw new FileNotFoundException(
+				"File given as argument does not exists: "
+						+ infoFile.getAbsolutePath());
 	}
 
-	private static MetaData createMeta(URL sourceInfoFile, InputStream in)
-			throws IOException {
+	private static MetaData createMeta(URL sourceInfoFile, InputStream in,
+			boolean withCover) throws IOException {
 		MetaData meta = new MetaData();
 
 		meta.setTitle(getInfoTag(in, "TITLE"));
@@ -52,8 +55,26 @@ public class InfoReader {
 		meta.setSubject(getInfoTag(in, "SUBJECT"));
 		meta.setType(getInfoTag(in, "TYPE"));
 		meta.setImageDocument(getInfoTagBoolean(in, "IMAGES_DOCUMENT", false));
-		meta.setCover(BasicSupport.getImage(null, sourceInfoFile,
-				getInfoTag(in, "COVER")));
+		if (withCover) {
+			String infoTag = getInfoTag(in, "COVER");
+			if (infoTag != null && !infoTag.trim().isEmpty()) {
+				meta.setCover(BasicSupportHelper.getImage(null, sourceInfoFile,
+						infoTag));
+			}
+			// Second chance: try to check for a cover next to the info file
+			if (meta.getCover() == null) {
+				String info = sourceInfoFile.getFile().toString();
+				if (info.endsWith(".info")) {
+					info = info.substring(0, info.length() - ".info".length());
+					String ext = "."
+							+ Instance.getConfig()
+									.getString(Config.IMAGE_FORMAT_COVER)
+									.toLowerCase();
+					meta.setCover(BasicSupportHelper.getImage(null,
+							sourceInfoFile, info + ext));
+				}
+			}
+		}
 		try {
 			meta.setWords(Long.parseLong(getInfoTag(in, "WORDCOUNT")));
 		} catch (NumberFormatException e) {
@@ -62,8 +83,8 @@ public class InfoReader {
 		meta.setCreationDate(getInfoTag(in, "CREATION_DATE"));
 		meta.setFakeCover(Boolean.parseBoolean(getInfoTag(in, "FAKE_COVER")));
 
-		if (meta.getCover() == null) {
-			meta.setCover(BasicSupport.getDefaultCover(meta.getSubject()));
+		if (withCover && meta.getCover() == null) {
+			meta.setCover(BasicSupportHelper.getDefaultCover(meta.getSubject()));
 		}
 
 		return meta;
@@ -117,7 +138,7 @@ public class InfoReader {
 
 		if (in != null) {
 			in.reset();
-			String value = BasicSupport.getLine(in, key, 0);
+			String value = BasicSupport_Deprecated.getLine(in, key, 0);
 			if (value != null && !value.isEmpty()) {
 				value = value.trim().substring(key.length() - 1).trim();
 				if (value.startsWith("'") && value.endsWith("'")