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 branch 'subtree'
[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 e3280d124fcfde473df65bb415805eaefbfab468..fc2dc8c982127210c308d6a9dc70a20b667162eb 100644
(file)
--- a/
src/be/nikiroo/fanfix/output/Epub.java
+++ b/
src/be/nikiroo/fanfix/output/Epub.java
@@
-36,7
+36,7
@@
class Epub extends BasicOutput {
String targetNameOrig = targetName;
targetName += getDefaultExtension(false);
String targetNameOrig = targetName;
targetName += getDefaultExtension(false);
- tmpDir = Instance.getTempFiles().createTempDir("fanfic-reader-epub");
+ tmpDir = Instance.get
Instance().get
TempFiles().createTempDir("fanfic-reader-epub");
tmpDir.delete();
if (!tmpDir.mkdir()) {
tmpDir.delete();
if (!tmpDir.mkdir()) {
@@
-136,8
+136,11
@@
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.getInstance().getCache().saveAsImage(story.getMeta().getCover(), file, true);
+ } catch (Exception e) {
+ Instance.getInstance().getTraceHandler().error(e);
+ }
}
// OPS/* except chapters
}
// OPS/* except chapters
@@
-242,8
+245,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(para.getContentImage(), file,
- nextParaIsCover);
+ Instance.getInstance().getCache().saveAsImage(para.getContentImage(), file, nextParaIsCover);
writer.write(" <img alt='page image' class='page-image' src='images/"
+ getCurrentImageBestName(false) + "'/>");
break;
writer.write(" <img alt='page image' class='page-image' src='images/"
+ getCurrentImageBestName(false) + "'/>");
break;
@@
-354,11
+356,10
@@
class Epub extends BasicOutput {
private void generateNcx(Chapter chap, StringBuilder builder, int navPoint) {
String name;
if (chap.getName() != null && !chap.getName().isEmpty()) {
private void generateNcx(Chapter chap, StringBuilder builder, int navPoint) {
String name;
if (chap.getName() != null && !chap.getName().isEmpty()) {
- name = Instance.get
Trans().getString(StringId.CHAPTER_NAMED
,
- chap.getN
umber(), chap.getN
ame());
+ name = Instance.get
Instance().getTrans().getString(StringId.CHAPTER_NAMED, chap.getNumber()
,
+ chap.getName());
} else {
} else {
- name = Instance.getTrans().getString(StringId.CHAPTER_UNNAMED,
- chap.getNumber());
+ name = Instance.getInstance().getTrans().getString(StringId.CHAPTER_UNNAMED, chap.getNumber());
}
String nnn = String.format("%03d", (navPoint - 2));
}
String nnn = String.format("%03d", (navPoint - 2));
@@
-436,8
+437,9
@@
class Epub extends BasicOutput {
builder.append("\n <!-- Images -->");
if (story.getMeta() != null && story.getMeta().getCover() != null) {
builder.append("\n <!-- Images -->");
if (story.getMeta() != null && story.getMeta().getCover() != null) {
- String format = Instance.getConfig()
- .getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER).toLowerCase();
+ String format = Instance.getInstance().getConfig()
+ .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\"/>");
}
@@
-482,7
+484,7
@@
class Epub extends BasicOutput {
author = meta.getAuthor();
}
author = meta.getAuthor();
}
- String format = Instance.getConfig()
+ String format = Instance.get
Instance().get
Config()
.getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER).toLowerCase();
builder.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
.getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER).toLowerCase();
builder.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");