Fix tests:

[fanfix.git] / src / be / nikiroo / fanfix / output / Cbz.java

diff --git a/src/be/nikiroo/fanfix/output/Cbz.java b/src/be/nikiroo/fanfix/output/Cbz.java
index 8d59ae883a7586d966440cb6aff738ce83e6739a..4a89d9b92a54551845ab57dc653f79dd17229d01 100644 (file)
--- a/src/be/nikiroo/fanfix/output/Cbz.java
+++ b/src/be/nikiroo/fanfix/output/Cbz.java
@@ -25,25 +25,31 @@ class Cbz extends BasicOutput {
                dir = File.createTempFile("fanfic-reader-cbz-dir", ".wip");
                dir.delete();
                dir.mkdir();
+               try {
+                       // will also save the images! (except the cover -> false)
+                       BasicOutput
+                                       .getOutput(OutputType.TEXT, isWriteInfo(), isWriteCover())
+                                       // Force cover to FALSE:
+                                       .setType(OutputType.TEXT, isWriteInfo(), false)
+                                       .process(story, dir, targetNameOrig);
+
+                       try {
+                               super.process(story, targetDir, targetNameOrig);
+                       } finally {
+                       }
 
-               // will also save the images!
-               new InfoText().process(story, dir, targetNameOrig);
-
-               InfoCover.writeInfo(dir, targetNameOrig, story.getMeta());
-               if (story.getMeta() != null && !story.getMeta().isFakeCover()) {
-                       InfoCover.writeCover(dir, targetNameOrig, story.getMeta());
-               }
+                       InfoCover.writeInfo(dir, targetNameOrig, story.getMeta());
+                       if (story.getMeta() != null && !story.getMeta().isFakeCover()) {
+                               InfoCover.writeCover(dir, targetNameOrig, story.getMeta());
+                       }
 
-               IOUtils.writeSmallFile(dir, "version", "3.0");
+                       IOUtils.writeSmallFile(dir, "version", "3.0");
 
-               try {
-                       super.process(story, targetDir, targetNameOrig);
+                       IOUtils.zip(dir, target, true);
                } finally {
+                       IOUtils.deltree(dir);
                }
 
-               IOUtils.zip(dir, target, true);
-               IOUtils.deltree(dir);
-
                return target;
        }
 
@@ -70,8 +76,6 @@ class Cbz extends BasicOutput {
                        if (meta != null) {
                                writer.write(meta.getUuid());
                        }
-                       writer.write("\n\n");
-                       writer.write(builder.toString());
                } finally {
                        writer.close();
                }