From: Niki Roo Date: Fri, 10 Aug 2018 17:39:20 +0000 (+0200) Subject: try+1 X-Git-Tag: fanfix-1.8.0~8 X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=30478c5b1ece61284679af0d2194f1d8627a7b79;p=fanfix.git try+1 --- diff --git a/src/be/nikiroo/fanfix/supported/Epub.java b/src/be/nikiroo/fanfix/supported/Epub.java index 356e3a8..e5261d3 100644 --- a/src/be/nikiroo/fanfix/supported/Epub.java +++ b/src/be/nikiroo/fanfix/supported/Epub.java @@ -210,7 +210,6 @@ class Epub extends InfoText { if (cover != null) { meta.setCover(cover); } else { -System.out.println(">>> " + getSourceFileOriginal()); meta.setCover(InfoReader .getCoverByName(getSourceFileOriginal().toURI() .toURL())); diff --git a/src/be/nikiroo/fanfix/supported/InfoReader.java b/src/be/nikiroo/fanfix/supported/InfoReader.java index 80f8739..369b324 100644 --- a/src/be/nikiroo/fanfix/supported/InfoReader.java +++ b/src/be/nikiroo/fanfix/supported/InfoReader.java @@ -91,17 +91,31 @@ public class InfoReader { * @return the cover if present, NULL if not */ public static Image getCoverByName(URL sourceInfoFile) { - 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(); - return BasicSupportHelper - .getImage(null, sourceInfoFile, info + ext); + Image cover = null; + + File basefile = new File(sourceInfoFile.getFile()); + + String ext = "." + + Instance.getConfig().getString(Config.IMAGE_FORMAT_COVER) + .toLowerCase(); + + // Without removing ext + cover = BasicSupportHelper.getImage(null, sourceInfoFile, + basefile.getAbsolutePath() + ext); + + // Try without ext + String name = basefile.getName(); + int pos = name.lastIndexOf("."); + if (cover == null && pos > 0) { + name = name.substring(0, pos); + basefile = new File(basefile.getParent(), basefile.getName()); + +System.out.println(">>> " + basefile); + cover = BasicSupportHelper.getImage(null, sourceInfoFile, + basefile.getAbsolutePath() + ext); } - return null; + return cover; } private static boolean getInfoTagBoolean(InputStream in, String key,