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
update nikiroo-utils
[nikiroo-utils.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 7ac3efc78703f7fb9e4a27fc2668c04c541965ad..ae26574340c58cc9e19d54889f70fb77dadf272a 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/Epub.java
+++ b/
src/be/nikiroo/fanfix/supported/Epub.java
@@
-17,7
+17,7
@@
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.utils.IOUtils;
import be.nikiroo.utils.Image;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.utils.IOUtils;
import be.nikiroo.utils.Image;
-import be.nikiroo.utils.MarkableFileInputStream;
+import be.nikiroo.utils.
streams.
MarkableFileInputStream;
import be.nikiroo.utils.StringUtils;
/**
import be.nikiroo.utils.StringUtils;
/**
@@
-27,8
+27,6
@@
import be.nikiroo.utils.StringUtils;
* @author niki
*/
class Epub extends InfoText {
* @author niki
*/
class Epub extends InfoText {
- private File sourceFileOriginal;
-
private MetaData meta;
private File tmpDir;
private String desc;
private MetaData meta;
private File tmpDir;
private String desc;
@@
-36,13
+34,8
@@
class Epub extends InfoText {
private URL fakeSource;
private InputStream fakeIn;
private URL fakeSource;
private InputStream fakeIn;
- @Override
- public String getSourceName() {
- return "epub";
- }
-
public File getSourceFileOriginal() {
public File getSourceFileOriginal() {
- return s
ourceFileOriginal
;
+ return s
uper.getSourceFile()
;
}
@Override
}
@Override
@@
-61,7
+54,19
@@
class Epub extends InfoText {
@Override
protected InputStream getInput() {
@Override
protected InputStream getInput() {
- return fakeIn;
+ if (fakeIn != null) {
+ try {
+ fakeIn.reset();
+ } catch (IOException e) {
+ Instance.getTraceHandler()
+ .error(new IOException(
+ "Cannot reset the Epub Text stream", e));
+ }
+
+ return fakeIn;
+ }
+
+ return null;
}
@Override
}
@Override
@@
-169,15
+174,11
@@
class Epub extends InfoText {
}
if (tmp.exists()) {
}
if (tmp.exists()) {
- this.fakeIn = new MarkableFileInputStream(new FileInputStream(
- tmp));
+ this.fakeIn = new MarkableFileInputStream(tmp);
}
if (tmpInfo.exists()) {
meta = InfoReader.readMeta(tmpInfo, true);
}
if (tmpInfo.exists()) {
meta = InfoReader.readMeta(tmpInfo, true);
- if (cover != null) {
- meta.setCover(cover);
- }
tmpInfo.delete();
} else {
if (title == null || title.isEmpty()) {
tmpInfo.delete();
} else {
if (title == null || title.isEmpty()) {
@@
-191,13
+192,23
@@
class Epub extends InfoText {
meta = new MetaData();
meta.setLang("en");
meta.setTags(new ArrayList<String>());
meta = new MetaData();
meta.setLang("en");
meta.setTags(new ArrayList<String>());
- meta.setSource(getSourceName());
+ meta.setSource(get
Type().get
SourceName());
meta.setUuid(url);
meta.setUrl(url);
meta.setTitle(title);
meta.setAuthor(author);
meta.setImageDocument(isImagesDocumentByDefault());
}
meta.setUuid(url);
meta.setUrl(url);
meta.setTitle(title);
meta.setAuthor(author);
meta.setImageDocument(isImagesDocumentByDefault());
}
+
+ if (meta.getCover() == null) {
+ if (cover != null) {
+ meta.setCover(cover);
+ } else {
+ meta.setCover(InfoReader
+ .getCoverByName(getSourceFileOriginal().toURI()
+ .toURL()));
+ }
+ }
} finally {
if (zipIn != null) {
zipIn.close();
} finally {
if (zipIn != null) {
zipIn.close();