X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FInfoReader.java;h=5203cc86107017c6fa3b3a236fe56f869def7c8c;hb=0ffa47548f474c1330d8d723300d9aa7a4894736;hp=ccffd7c9d27205713cfe6e623b3a8c4c56532aac;hpb=2a25f7814eec9854022f1c9dee188bfbdb955591;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/supported/InfoReader.java b/src/be/nikiroo/fanfix/supported/InfoReader.java index ccffd7c..5203cc8 100644 --- a/src/be/nikiroo/fanfix/supported/InfoReader.java +++ b/src/be/nikiroo/fanfix/supported/InfoReader.java @@ -56,8 +56,11 @@ 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(); @@ -67,8 +70,8 @@ public class InfoReader { + Instance.getConfig() .getString(Config.IMAGE_FORMAT_COVER) .toLowerCase(); - meta.setCover(BasicSupport.getImage(null, sourceInfoFile, - info + ext)); + meta.setCover(BasicSupportHelper.getImage(null, + sourceInfoFile, info + ext)); } } } @@ -81,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; @@ -135,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("'")