git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 51cf732a966cbb7b70e3941f7cf2eee00c2a18ff..c70cc4123d3e05970d9a36ea29d0da089ecbb98c 100644
(file)
--- a/
src/be/nikiroo/fanfix/output/Cbz.java
+++ b/
src/be/nikiroo/fanfix/output/Cbz.java
@@
-1,8
+1,10
@@
package be.nikiroo.fanfix.output;
package be.nikiroo.fanfix.output;
+import java.io.BufferedWriter;
import java.io.File;
import java.io.File;
-import java.io.File
Writer
;
+import java.io.File
OutputStream
;
import java.io.IOException;
import java.io.IOException;
+import java.io.OutputStreamWriter;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Paragraph;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Paragraph;
@@
-16,31
+18,39
@@
class Cbz extends BasicOutput {
public File process(Story story, File targetDir, String targetName)
throws IOException {
String targetNameOrig = targetName;
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();
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);
- IOUtils.writeSmallFile(dir, "version", "3.0");
+ InfoCover.writeInfo(dir, targetNameOrig, story.getMeta());
+ if (story.getMeta() != null && !story.getMeta().isFakeCover()) {
+ InfoCover.writeCover(dir, targetNameOrig, story.getMeta());
+ }
- try {
- super.process(story, targetDir, targetNameOrig);
+ IOUtils.writeSmallFile(dir, "version", "3.0");
+
+ try {
+ super.process(story, targetDir, targetNameOrig);
+ } finally {
+ }
+
+ IOUtils.zip(dir, target, true);
} finally {
} finally {
+ IOUtils.deltree(dir);
}
}
- IOUtils.zip(dir, target, true);
- IOUtils.deltree(dir);
-
return target;
}
@Override
return target;
}
@Override
- p
rotected String getDefaultExtension(
) {
+ p
ublic String getDefaultExtension(boolean readerTarget
) {
return ".cbz";
}
return ".cbz";
}
@@
-56,18
+66,18
@@
class Cbz extends BasicOutput {
}
}
}
}
- FileWriter writer = new FileWriter(new File(dir, "URL"));
+ BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(
+ new FileOutputStream(new File(dir, "URL")), "UTF-8"));
try {
if (meta != null) {
writer.write(meta.getUuid());
}
try {
if (meta != null) {
writer.write(meta.getUuid());
}
- writer.write("\n\n");
- writer.write(builder.toString());
} finally {
writer.close();
}
} finally {
writer.close();
}
- writer = new FileWriter(new File(dir, "SUMMARY"));
+ writer = new BufferedWriter(new OutputStreamWriter(
+ new FileOutputStream(new File(dir, "SUMMARY")), "UTF-8"));
try {
String title = "";
if (meta != null && meta.getTitle() != null) {
try {
String title = "";
if (meta != null && meta.getTitle() != null) {