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
Small fixes: update check, epub:
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
supported
/
Epub.java
diff --git
a/src/be/nikiroo/fanfix/supported/Epub.java
b/src/be/nikiroo/fanfix/supported/Epub.java
index 47da1ac2259abbb313788583ba4420ba1dae8134..bd5c7191a86fe687942a6411c4291ff9010ad060 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/Epub.java
+++ b/
src/be/nikiroo/fanfix/supported/Epub.java
@@
-15,6
+15,7
@@
import java.util.zip.ZipInputStream;
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.utils.IOUtils;
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.ImageUtils;
import be.nikiroo.utils.MarkableFileInputStream;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.MarkableFileInputStream;
import be.nikiroo.utils.Progress;
@@
-96,7
+97,7
@@
class Epub extends InfoText {
if (!entry.isDirectory()
&& entry.getName().startsWith(getDataPrefix())) {
String entryLName = entry.getName().toLowerCase();
if (!entry.isDirectory()
&& entry.getName().startsWith(getDataPrefix())) {
String entryLName = entry.getName().toLowerCase();
-
+
boolean imageEntry = false;
for (String ext : getImageExt(false)) {
if (entryLName.endsWith(ext)) {
boolean imageEntry = false;
for (String ext : getImageExt(false)) {
if (entryLName.endsWith(ext)) {
@@
-114,7
+115,7
@@
class Epub extends InfoText {
// Cover
if (getCover()) {
try {
// Cover
if (getCover()) {
try {
- cover = I
OUtils.toImage
(zipIn);
+ cover = I
mageUtils.fromStream
(zipIn);
} catch (Exception e) {
Instance.syserr(e);
}
} catch (Exception e) {
Instance.syserr(e);
}
@@
-140,7
+141,7
@@
class Epub extends InfoText {
}
if (tmpInfo.exists()) {
}
if (tmpInfo.exists()) {
- meta = InfoReader.readMeta(tmpInfo);
+ meta = InfoReader.readMeta(tmpInfo
, true
);
if (cover != null) {
meta.setCover(cover);
}
if (cover != null) {
meta.setCover(cover);
}
@@
-165,7
+166,10
@@
class Epub extends InfoText {
tmp = null;
tmp = null;
- fakeIn.close();
+ if (fakeIn != null) {
+ fakeIn.close();
+ }
+
super.close();
}
super.close();
}