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
Merge branch 'subtree'
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
supported
/
EHentai.java
diff --git
a/src/be/nikiroo/fanfix/supported/EHentai.java
b/src/be/nikiroo/fanfix/supported/EHentai.java
index 9ed4e89e60996c6683876e543803ca55581117ad..03c1557432194187cb54e2b43e9f4239d42c1668 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/EHentai.java
+++ b/
src/be/nikiroo/fanfix/supported/EHentai.java
@@
-26,11
+26,6
@@
import be.nikiroo.utils.StringUtils;
* @author niki
*/
class EHentai extends BasicSupport_Deprecated {
* @author niki
*/
class EHentai extends BasicSupport_Deprecated {
- @Override
- public String getSourceName() {
- return "e-hentai.org";
- }
-
@Override
protected MetaData getMeta(URL source, InputStream in) throws IOException {
MetaData meta = new MetaData();
@Override
protected MetaData getMeta(URL source, InputStream in) throws IOException {
MetaData meta = new MetaData();
@@
-39,9
+34,9
@@
class EHentai extends BasicSupport_Deprecated {
meta.setAuthor(getAuthor(reset(in)));
meta.setDate(getDate(reset(in)));
meta.setTags(getTags(reset(in)));
meta.setAuthor(getAuthor(reset(in)));
meta.setDate(getDate(reset(in)));
meta.setTags(getTags(reset(in)));
- meta.setSource(getSourceName());
+ meta.setSource(get
Type().get
SourceName());
meta.setUrl(source.toString());
meta.setUrl(source.toString());
- meta.setPublisher(getSourceName());
+ meta.setPublisher(get
Type().get
SourceName());
meta.setUuid(source.toString());
meta.setLuid("");
meta.setLang(getLang(reset(in)));
meta.setUuid(source.toString());
meta.setLuid("");
meta.setLang(getLang(reset(in)));
@@
-260,10
+255,8
@@
class EHentai extends BasicSupport_Deprecated {
try {
pages.add(new URL(line));
} catch (MalformedURLException e) {
try {
pages.add(new URL(line));
} catch (MalformedURLException e) {
- Instance.getTraceHandler().error(
- new IOException(
- "Parsing error, a link is not correctly parsed: "
- + line, e));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException("Parsing error, a link is not correctly parsed: " + line, e));
}
}
}
}
}
}
@@
-277,7
+270,7
@@
class EHentai extends BasicSupport_Deprecated {
StringBuilder builder = new StringBuilder();
for (URL page : pages) {
StringBuilder builder = new StringBuilder();
for (URL page : pages) {
- InputStream pageIn = Instance.getCache().open(page, this, false);
+ InputStream pageIn = Instance.get
Instance().get
Cache().open(page, this, false);
try {
String link = getKeyLine(pageIn, "id=\"img\"", "src=\"", "\"");
if (link != null && !link.isEmpty()) {
try {
String link = getKeyLine(pageIn, "id=\"img\"", "src=\"", "\"");
if (link != null && !link.isEmpty()) {