Change BasicSupport to use jsoup

[fanfix.git] / src / be / nikiroo / fanfix / supported / InfoReader.java

diff --git a/src/be/nikiroo/fanfix/supported/InfoReader.java b/src/be/nikiroo/fanfix/supported/InfoReader.java
index 466a88539bd375e236376b24f3d0fa5772b7489d..5203cc86107017c6fa3b3a236fe56f869def7c8c 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/InfoReader.java
+++ b/src/be/nikiroo/fanfix/supported/InfoReader.java
@@ -56,18 +56,22 @@ public class InfoReader {
                meta.setType(getInfoTag(in, "TYPE"));
                meta.setImageDocument(getInfoTagBoolean(in, "IMAGES_DOCUMENT", false));
                if (withCover) {
-                       meta.setCover(BasicSupport.getImage(null, sourceInfoFile,
-                                       getInfoTag(in, "COVER")));
+                       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);
-                                       meta.setCover(BasicSupport.getImage(null, sourceInfoFile,
-                                                       info + ext));
+                                                       + Instance.getConfig()
+                                                                       .getString(Config.IMAGE_FORMAT_COVER)
+                                                                       .toLowerCase();
+                                       meta.setCover(BasicSupportHelper.getImage(null,
+                                                       sourceInfoFile, info + ext));
                                }
                        }
                }
@@ -80,7 +84,7 @@ public class InfoReader {
                meta.setFakeCover(Boolean.parseBoolean(getInfoTag(in, "FAKE_COVER")));
 
                if (withCover && meta.getCover() == null) {
-                       meta.setCover(BasicSupport.getDefaultCover(meta.getSubject()));
+                       meta.setCover(BasicSupportHelper.getDefaultCover(meta.getSubject()));
                }
 
                return meta;
@@ -134,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("'")