git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '77d3a60869e7a780c6ae069e51530e1eacece5e2'
[fanfix.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 b56cc339285e4f64c83401b5ba79cfe50bb068fc..b7401d3922b2c182fd2ff1840ff1182986bd54cc 100644
(file)
--- a/
src/be/nikiroo/fanfix/output/Epub.java
+++ b/
src/be/nikiroo/fanfix/output/Epub.java
@@
-136,8
+136,12
@@
class Epub extends BasicOutput {
// OPS/images
if (story.getMeta() != null && story.getMeta().getCover() != null) {
File file = new File(images, "cover");
// OPS/images
if (story.getMeta() != null && story.getMeta().getCover() != null) {
File file = new File(images, "cover");
- Instance.getCache().saveAsImage(story.getMeta().getCover(), file,
- true);
+ try {
+ Instance.getCache().saveAsImage(story.getMeta().getCover(),
+ file, true);
+ } catch (Exception e) {
+ Instance.getTraceHandler().error(e);
+ }
}
// OPS/* except chapters
}
// OPS/* except chapters
@@
-437,7
+441,8
@@
class Epub extends BasicOutput {
if (story.getMeta() != null && story.getMeta().getCover() != null) {
String format = Instance.getConfig()
if (story.getMeta() != null && story.getMeta().getCover() != null) {
String format = Instance.getConfig()
- .getString(Config.IMAGE_FORMAT_COVER).toLowerCase();
+ .getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER)
+ .toLowerCase();
builder.append("\n <item id=\"cover\" href=\"images/cover."
+ format + "\" media-type=\"image/png\"/>");
}
builder.append("\n <item id=\"cover\" href=\"images/cover."
+ format + "\" media-type=\"image/png\"/>");
}
@@
-483,7
+488,7
@@
class Epub extends BasicOutput {
}
String format = Instance.getConfig()
}
String format = Instance.getConfig()
- .getString(Config.IMAGE_FORMAT_COVER).toLowerCase();
+ .getString(Config.
FILE_FORMAT_
IMAGE_FORMAT_COVER).toLowerCase();
builder.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
builder.append("\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">");
builder.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
builder.append("\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">");