X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=inline;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Foutput%2FBasicOutput.java;h=1342eb03016189535039fedf322f41cadcb92ff7;hb=bee7dffea9ef8d3312eee90993a9faaeac6c1127;hp=2e77eaebdc6d13de7d24bd42e19061b28131bc41;hpb=08fe2e33007063e30fe22dc1d290f8afaa18eb1d;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/output/BasicOutput.java b/src/be/nikiroo/fanfix/output/BasicOutput.java index 2e77eae..1342eb0 100644 --- a/src/be/nikiroo/fanfix/output/BasicOutput.java +++ b/src/be/nikiroo/fanfix/output/BasicOutput.java @@ -2,13 +2,16 @@ package be.nikiroo.fanfix.output; import java.io.File; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.bundles.StringId; import be.nikiroo.fanfix.data.Chapter; import be.nikiroo.fanfix.data.Paragraph; -import be.nikiroo.fanfix.data.Story; import be.nikiroo.fanfix.data.Paragraph.ParagraphType; +import be.nikiroo.fanfix.data.Story; +import be.nikiroo.utils.ui.Progress; /** * This class is the base class used by the other output classes. It can be used @@ -36,7 +39,12 @@ public abstract class BasicOutput { /** ZIP with (PNG) images */ CBZ, /** LaTeX file with "book" template */ - LATEX; + LATEX, + /** HTML files in a dedicated directory */ + HTML, + + ; + public String toString() { return super.toString().toLowerCase(); } @@ -58,6 +66,20 @@ public abstract class BasicOutput { return desc; } + /** + * The default extension to add to the output files. + * + * @return the extension + */ + public String getDefaultExtension() { + BasicOutput output = BasicOutput.getOutput(this, false); + if (output != null) { + return output.getDefaultExtension(); + } + + return null; + } + /** * Call {@link OutputType#valueOf(String.toUpperCase())}. * @@ -73,7 +95,7 @@ public abstract class BasicOutput { /** * Call {@link OutputType#valueOf(String.toUpperCase())} but return NULL - * for NULL instead of raising exception. + * for NULL and empty instead of raising an exception. * * @param typeName * the possible type name @@ -81,7 +103,7 @@ public abstract class BasicOutput { * @return NULL or the type */ public static OutputType valueOfNullOkUC(String typeName) { - if (typeName == null) { + if (typeName == null || typeName.isEmpty()) { return null; } @@ -116,6 +138,8 @@ public abstract class BasicOutput { private OutputType type; private boolean writeCover; private boolean writeInfo; + private Progress storyPg; + private Progress chapPg; /** * Process the {@link Story} into the given target. @@ -125,6 +149,8 @@ public abstract class BasicOutput { * @param target * the target where to save to (will not necessary be taken as is * by the processor, for instance an extension can be added) + * @param pg + * the optional progress reporter * * @return the actual main target saved, which can be slightly different * that the input one @@ -132,7 +158,10 @@ public abstract class BasicOutput { * @throws IOException * in case of I/O error */ - public File process(Story story, String target) throws IOException { + public File process(Story story, String target, Progress pg) + throws IOException { + storyPg = pg; + target = new File(target).getAbsolutePath(); File targetDir = new File(target).getParentFile(); String targetName = new File(target).getName(); @@ -161,6 +190,7 @@ public abstract class BasicOutput { * the target filename (will not necessary be taken as is by the * processor, for instance an extension can be added) * + * * @return the actual main target saved, which can be slightly different * that the input one * @@ -208,12 +238,10 @@ public abstract class BasicOutput { /** * The default extension to add to the output files. - *
- * Cannot be NULL! * * @return the extension */ - protected String getDefaultExtension() { + public String getDefaultExtension() { return ""; } @@ -236,10 +264,20 @@ public abstract class BasicOutput { } protected void writeStory(Story story) throws IOException { + if (storyPg == null) { + storyPg = new Progress(0, story.getChapters().size() + 2); + } else { + storyPg.setMinMax(0, story.getChapters().size() + 2); + } + String chapterNameNum = String.format("%03d", 0); String paragraphNumber = String.format("%04d", 0); imageName = paragraphNumber + "_" + chapterNameNum + ".png"; + if (story.getMeta() != null) { + story.getMeta().setType("" + getType()); + } + if (writeCover) { InfoCover.writeCover(targetDir, targetName, story.getMeta()); } @@ -247,11 +285,28 @@ public abstract class BasicOutput { InfoCover.writeInfo(targetDir, targetName, story.getMeta()); } - writeStoryHeader(story); + storyPg.setProgress(1); + + List