From 27694a1373c09fa3f2634dfaec4cc944dff3ea5f Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Fri, 10 Aug 2018 20:06:15 +0200 Subject: [PATCH] try+1 --- src/be/nikiroo/fanfix/library/BasicLibrary.java | 1 + src/be/nikiroo/fanfix/supported/Cbz.java | 8 +++++++- src/be/nikiroo/fanfix/supported/InfoReader.java | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/be/nikiroo/fanfix/library/BasicLibrary.java b/src/be/nikiroo/fanfix/library/BasicLibrary.java index 58bd873a..6a2b95a6 100644 --- a/src/be/nikiroo/fanfix/library/BasicLibrary.java +++ b/src/be/nikiroo/fanfix/library/BasicLibrary.java @@ -355,6 +355,7 @@ abstract public class BasicLibrary { if (type != null) { story = BasicSupport.getSupport(type, url) // .process(pgProcess); +System.out.println("after process: "+story); // Because we do not want to clear the meta cache: meta.setCover(story.getMeta().getCover()); story.setMeta(meta); diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java index 948a2d65..3b90769c 100644 --- a/src/be/nikiroo/fanfix/supported/Cbz.java +++ b/src/be/nikiroo/fanfix/supported/Cbz.java @@ -72,6 +72,8 @@ class Cbz extends Epub { pg.addProgress(pgMeta, 10); Story story = processMeta(true, pgMeta); MetaData meta = story.getMeta(); + +System.out.println("Meta from Cbz support: "+meta); pgMeta.done(); // 10% @@ -130,6 +132,9 @@ class Cbz extends Epub { Story origStory = getStoryFromTxt(tmpDir, basename); if (origStory != null) { story.setChapters(origStory.getChapters()); + if (origStory.getMeta().getCover() == null) { + origStory.getMeta().setCover(story.getMeta().getCover()); + } story.setMeta(origStory.getMeta()); } else { story.setChapters(new ArrayList()); @@ -153,7 +158,8 @@ class Cbz extends Epub { meta.setCover(images.get(imagesList.get(0))); meta.setFakeCover(true); } - + +System.out.println("Meta from Cbz support at end: "+meta); } finally { IOUtils.deltree(tmpDir); if (zipIn != null) { diff --git a/src/be/nikiroo/fanfix/supported/InfoReader.java b/src/be/nikiroo/fanfix/supported/InfoReader.java index f589e6f3..817345e0 100644 --- a/src/be/nikiroo/fanfix/supported/InfoReader.java +++ b/src/be/nikiroo/fanfix/supported/InfoReader.java @@ -110,7 +110,6 @@ public class InfoReader { name = name.substring(0, pos); basefile = new File(basefile.getParent(), name); -System.out.println(">>> " + basefile); cover = BasicSupportHelper.getImage(null, sourceInfoFile, basefile.getAbsolutePath() + ext); } -- 2.27.0