Add new tests for conversion (that now fail...)

[nikiroo-utils.git] / src / be / nikiroo / fanfix / output / BasicOutput.java

diff --git a/src/be/nikiroo/fanfix/output/BasicOutput.java b/src/be/nikiroo/fanfix/output/BasicOutput.java
index 03218bcdf8f22f80404261f41998c3a19dd36722..a1aedca663c8586eb48a8d79f1afb67efb907ae5 100644 (file)
--- a/src/be/nikiroo/fanfix/output/BasicOutput.java
+++ b/src/be/nikiroo/fanfix/output/BasicOutput.java
@@ -79,9 +79,10 @@ public abstract class BasicOutput {
                 * The default extension to add to the output files.
                 * 
                 * @param readerTarget
-                *            the target to point to to read the {@link Story} (for
-                *            instance, the main entry point if this {@link Story} is in
-                *            a directory bundle)
+                *            TRUE to point to the main {@link Story} entry point for a
+                *            reader (for instance, the main entry point if this
+                *            {@link Story} is in a directory bundle), FALSE to point to
+                *            the main file even if it is a directory for instance
                 * 
                 * @return the extension
                 */
@@ -284,9 +285,10 @@ public abstract class BasicOutput {
         * The default extension to add to the output files.
         * 
         * @param readerTarget
-        *            the target to point to to read the {@link Story} (for
-        *            instance, the main entry point if this {@link Story} is in a
-        *            directory bundle)
+        *            TRUE to point to the main {@link Story} entry point for a
+        *            reader (for instance, the main entry point if this
+        *            {@link Story} is in a directory bundle), FALSE to point to the
+        *            main file even if it is a directory for instance
         * 
         * @return the extension
         */
@@ -328,16 +330,12 @@ public abstract class BasicOutput {
 
                String chapterNameNum = String.format("%03d", 0);
                String paragraphNumber = String.format("%04d", 0);
-               imageName = paragraphNumber + "_" + chapterNameNum + ".png";
+               imageName = paragraphNumber + "_" + chapterNameNum;
 
                if (story.getMeta() != null) {
                        story.getMeta().setType("" + getType());
                }
 
-               System.out.println(story.getMeta().getTitle() + " -> write cover: "
-                               + writeCover);
-               new Exception().printStackTrace();
-
                if (writeCover) {
                        InfoCover.writeCover(targetDir, targetName, story.getMeta());
                }
@@ -380,13 +378,13 @@ public abstract class BasicOutput {
 
                int num = 0;
                String paragraphNumber = String.format("%04d", num++);
-               imageName = chapterNameNum + "_" + paragraphNumber + ".png";
+               imageName = chapterNameNum + "_" + paragraphNumber;
 
                writeChapterHeader(chap);
                int i = 1;
                for (Paragraph para : chap) {
                        paragraphNumber = String.format("%04d", num++);
-                       imageName = chapterNameNum + "_" + paragraphNumber + ".png";
+                       imageName = chapterNameNum + "_" + paragraphNumber;
                        writeParagraph(para);
                        if (chapPg != null) {
                                chapPg.setProgress(i++);