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, Remote:
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
output
/
Epub.java
diff --git
a/src/be/nikiroo/fanfix/output/Epub.java
b/src/be/nikiroo/fanfix/output/Epub.java
index 89bff66274ee3057125cbfa93169fed836869ee2..48da65a293704fc5eb13c9ee69ac17975b9d2f34 100644
(file)
--- a/
src/be/nikiroo/fanfix/output/Epub.java
+++ b/
src/be/nikiroo/fanfix/output/Epub.java
@@
-6,7
+6,6
@@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStreamWriter;
-import java.net.URL;
import javax.imageio.ImageIO;
import javax.imageio.ImageIO;
@@
-45,7
+44,9
@@
class Epub extends BasicOutput {
// "Originals"
File data = new File(tmpDir, "DATA");
data.mkdir();
// "Originals"
File data = new File(tmpDir, "DATA");
data.mkdir();
- new InfoText().process(story, data, targetNameOrig);
+ BasicOutput.getOutput(OutputType.TEXT, isWriteInfo(), isWriteCover())
+ .process(story, data, targetNameOrig);
+ InfoCover.writeInfo(data, targetNameOrig, story.getMeta());
IOUtils.writeSmallFile(data, "version", "3.0");
super.process(story, targetDir, targetNameOrig);
IOUtils.writeSmallFile(data, "version", "3.0");
super.process(story, targetDir, targetNameOrig);
@@
-208,7
+209,7
@@
class Epub extends BasicOutput {
break;
case IMAGE:
File file = new File(images, getCurrentImageBestName(false));
break;
case IMAGE:
File file = new File(images, getCurrentImageBestName(false));
- Instance.getCache().saveAsImage(
new URL(para.getContent()
), file);
+ Instance.getCache().saveAsImage(
para.getContentImage(
), file);
writer.write(" <img class='page-image' src='images/"
+ getCurrentImageBestName(false) + "'/>");
break;
writer.write(" <img class='page-image' src='images/"
+ getCurrentImageBestName(false) + "'/>");
break;