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
Version 3.0.1
[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 e5261d36b7a9e291ebfd16b303f22cf51d9b35db..82af11855fdc299226fe2f52ca536f17a07d1d00 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/Epub.java
+++ b/
src/be/nikiroo/fanfix/supported/Epub.java
@@
-1,7
+1,6
@@
package be.nikiroo.fanfix.supported;
import java.io.File;
package be.nikiroo.fanfix.supported;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
@@
-17,8
+16,8
@@
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.StringUtils;
import be.nikiroo.utils.StringUtils;
+import be.nikiroo.utils.streams.MarkableFileInputStream;
/**
* 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
@@
-34,11
+33,6
@@
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() {
return super.getSourceFile();
}
public File getSourceFileOriginal() {
return super.getSourceFile();
}
@@
-117,7
+111,7
@@
class Epub extends InfoText {
String entryLName = entry.getName().toLowerCase();
boolean imageEntry = false;
String entryLName = entry.getName().toLowerCase();
boolean imageEntry = false;
- for (String ext :
BasicSupport
Images.getImageExt(false)) {
+ for (String ext :
bs
Images.getImageExt(false)) {
if (entryLName.endsWith(ext)) {
imageEntry = true;
}
if (entryLName.endsWith(ext)) {
imageEntry = true;
}
@@
-179,8
+173,7
@@
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()) {
}
if (tmpInfo.exists()) {
@@
-198,7
+191,7
@@
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.setUuid(url);
meta.setUrl(url);
meta.setTitle(title);