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 f6a0b410338a3a1a7635601be402054fe5c761d1..bd5c7191a86fe687942a6411c4291ff9010ad060 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/Epub.java
+++ b/
src/be/nikiroo/fanfix/supported/Epub.java
@@
-12,12
+12,12
@@
import java.util.Map.Entry;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import javax.imageio.ImageIO;
-
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.MarkableFileInputStream;
+import be.nikiroo.utils.Progress;
/**
* Support class for EPUB files created with this program (as we need some
/**
* Support class for EPUB files created with this program (as we need some
@@
-62,22
+62,22
@@
class Epub extends InfoText {
}
@Override
}
@Override
- protected List<Entry<String, URL>> getChapters(URL source, InputStream in
)
- throws IOException {
+ protected List<Entry<String, URL>> getChapters(URL source, InputStream in
,
+
Progress pg)
throws IOException {
if (fakeIn != null) {
fakeIn.reset();
if (fakeIn != null) {
fakeIn.reset();
- return super.getChapters(fakeSource, fakeIn);
+ return super.getChapters(fakeSource, fakeIn
, pg
);
}
return null;
}
@Override
}
return null;
}
@Override
- protected String getChapterContent(URL source, InputStream in, int number
)
- throws IOException {
+ protected String getChapterContent(URL source, InputStream in, int number
,
+
Progress pg)
throws IOException {
if (fakeIn != null) {
fakeIn.reset();
if (fakeIn != null) {
fakeIn.reset();
- return super.getChapterContent(fakeSource, fakeIn, number);
+ return super.getChapterContent(fakeSource, fakeIn, number
, pg
);
}
return null;
}
return null;
@@
-97,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)) {
@@
-115,7
+115,7
@@
class Epub extends InfoText {
// Cover
if (getCover()) {
try {
// Cover
if (getCover()) {
try {
- cover = Image
IO.read
(zipIn);
+ cover = Image
Utils.fromStream
(zipIn);
} catch (Exception e) {
Instance.syserr(e);
}
} catch (Exception e) {
Instance.syserr(e);
}
@@
-141,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);
}
@@
-166,7
+166,10
@@
class Epub extends InfoText {
tmp = null;
tmp = null;
- fakeIn.close();
+ if (fakeIn != null) {
+ fakeIn.close();
+ }
+
super.close();
}
super.close();
}