X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FEHentai.java;h=03c1557432194187cb54e2b43e9f4239d42c1668;hp=9a09f077bf82b2145bd7242d52fbbb1b0d8cc266;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hpb=ce297a794b1b7d3aa4e9234a6511dd9fe7216656

diff --git a/src/be/nikiroo/fanfix/supported/EHentai.java b/src/be/nikiroo/fanfix/supported/EHentai.java
index 9a09f07..03c1557 100644
--- 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.Map;
 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 {
-	@Override
-	public String getSourceName() {
-		return "e-hentai.org";
-	}
-
 	@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.setSource(getSourceName());
+		meta.setSource(getType().getSourceName());
 		meta.setUrl(source.toString());
-		meta.setPublisher(getSourceName());
+		meta.setPublisher(getType().getSourceName());
 		meta.setUuid(source.toString());
 		meta.setLuid("");
 		meta.setLang(getLang(reset(in)));
@@ -79,6 +75,13 @@ class EHentai extends BasicSupport_Deprecated {
 		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(", ")");
@@ -252,10 +255,8 @@ class EHentai extends BasicSupport_Deprecated {
 				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) {
-			InputStream pageIn = Instance.getCache().open(page, this, false);
+			InputStream pageIn = Instance.getInstance().getCache().open(page, this, false);
 			try {
 				String link = getKeyLine(pageIn, "id=\"img\"", "src=\"", "\"");
 				if (link != null && !link.isEmpty()) {