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
Merge branch 'master' into subtree
[nikiroo-utils.git]
/
supported
/
Cbz.java
diff --git
a/supported/Cbz.java
b/supported/Cbz.java
index 22e436a22188b6e0442ba5f21c977ca0ddaed90c..76b66aba7c75fa24317eb4daca6ff75854658326 100644
(file)
--- a/
supported/Cbz.java
+++ b/
supported/Cbz.java
@@
-71,7
+71,7
@@
class Cbz extends Epub {
pgMeta.done(); // 10%
pgMeta.done(); // 10%
- File tmpDir = Instance.getTempFiles().createTempDir("info-text");
+ File tmpDir = Instance.get
Instance().get
TempFiles().createTempDir("info-text");
String basename = null;
Map<String, Image> images = new HashMap<String, Image>();
String basename = null;
Map<String, Image> images = new HashMap<String, Image>();
@@
-97,7
+97,7
@@
class Cbz extends Epub {
try {
images.put(uuid, new Image(zipIn));
} catch (Exception e) {
try {
images.put(uuid, new Image(zipIn));
} catch (Exception e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
}
if (pg.getProgress() < 85) {
}
if (pg.getProgress() < 85) {
@@
-114,9
+114,7
@@
class Cbz extends Epub {
}
String ext = "."
}
String ext = "."
- + Instance.getConfig()
- .getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER)
- .toLowerCase();
+ + Instance.getInstance().getConfig().getString(Config.FILE_FORMAT_IMAGE_FORMAT_COVER).toLowerCase();
String coverName = meta.getUuid() + "_" + basename + ext;
Image cover = images.get(coverName);
images.remove(coverName);
String coverName = meta.getUuid() + "_" + basename + ext;
Image cover = images.get(coverName);
images.remove(coverName);
@@
-176,7
+174,7
@@
class Cbz extends Epub {
chap.getParagraphs().add(
new Paragraph(images.get(uuid)));
} catch (Exception e) {
chap.getParagraphs().add(
new Paragraph(images.get(uuid)));
} catch (Exception e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
}
}
}
}
}
}