Update nikiroo-utils, bugfixes:

[nikiroo-utils.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 2c9dbc3f42df74d1942b0595e1184726b93d6156..c70cc4123d3e05970d9a36ea29d0da089ecbb98c 100644 (file)
--- a/src/be/nikiroo/fanfix/output/Cbz.java
+++ b/src/be/nikiroo/fanfix/output/Cbz.java
@@ -18,34 +18,39 @@ class Cbz extends BasicOutput {
        public File process(Story story, File targetDir, String targetName)
                        throws IOException {
                String targetNameOrig = targetName;
-               targetName += getDefaultExtension();
+               targetName += getDefaultExtension(false);
 
                File target = new File(targetDir, targetName);
 
                dir = File.createTempFile("fanfic-reader-cbz-dir", ".wip");
                dir.delete();
                dir.mkdir();
+               try {
+                       // will also save the images!
+                       new InfoText().process(story, dir, targetNameOrig);
 
-               // will also save the images!
-               new InfoText().process(story, dir, targetNameOrig);
-               InfoCover.writeInfo(dir, targetNameOrig, story.getMeta());
-               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);
+                       try {
+                               super.process(story, targetDir, targetNameOrig);
+                       } finally {
+                       }
+
+                       IOUtils.zip(dir, target, true);
                } finally {
+                       IOUtils.deltree(dir);
                }
 
-               IOUtils.zip(dir, target, true);
-               IOUtils.deltree(dir);
-
                return target;
        }
 
        @Override
-       public String getDefaultExtension() {
+       public String getDefaultExtension(boolean readerTarget) {
                return ".cbz";
        }
 
@@ -67,8 +72,6 @@ class Cbz extends BasicOutput {
                        if (meta != null) {
                                writer.write(meta.getUuid());
                        }
-                       writer.write("\n\n");
-                       writer.write(builder.toString());
                } finally {
                        writer.close();
                }