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 9a09f077bf82b2145bd7242d52fbbb1b0d8cc266..3c734329e3bac03e456665958b6699cc623b3ff8 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/EHentai.java
+++ b/
src/be/nikiroo/fanfix/supported/EHentai.java
@@
-7,6
+7,7
@@
import java.net.URL;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.List;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.Map.Entry;
import java.util.Scanner;
import java.util.Map.Entry;
import java.util.Scanner;
@@
-25,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();
@@
-38,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)));
@@
-58,7
+54,7
@@
class EHentai extends BasicSupport_Deprecated {
// There is no chapters on e621, just pagination...
Story story = super.process(url, pg);
// There is no chapters on e621, just pagination...
Story story = super.process(url, pg);
- Chapter only = new Chapter(1,
null
);
+ Chapter only = new Chapter(1,
""
);
for (Chapter chap : story) {
only.getParagraphs().addAll(chap.getParagraphs());
}
for (Chapter chap : story) {
only.getParagraphs().addAll(chap.getParagraphs());
}
@@
-79,6
+75,13
@@
class EHentai extends BasicSupport_Deprecated {
return true;
}
return true;
}
+ @Override
+ public Map<String, String> getCookies() {
+ Map<String, String> cookies = super.getCookies();
+ cookies.put("nw", "1");
+ return cookies;
+ }
+
private Image getCover(URL source, InputStream in) {
Image author = null;
String coverLine = getKeyLine(in, "<div id=\"gd1\"", " url(", ")");
private Image getCover(URL source, InputStream in) {
Image author = null;
String coverLine = getKeyLine(in, "<div id=\"gd1\"", " url(", ")");
@@
-115,7
+118,7
@@
class EHentai extends BasicSupport_Deprecated {
} else if (langLine.equalsIgnoreCase("French")) {
lang = "fr";
} else {
} else if (langLine.equalsIgnoreCase("French")) {
lang = "fr";
} else {
- // TODO find the code?
+ // TODO find the code
for other languages
?
lang = langLine;
}
}
lang = langLine;
}
}
@@
-252,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));
}
}
}
}
}
}
@@
-269,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()) {