X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=supported%2FEHentai.java;h=399ce913055cdb66934a287153a768fd6223f5e3;hp=67585cd477f90a257acd94c9d28c67bac07575f7;hb=258e065f81071a861711ef935dca3ec5563f4360;hpb=0fc81e6465aa9c1f1dfc19b532082220d609768a

diff --git a/supported/EHentai.java b/supported/EHentai.java
index 67585cd..399ce91 100644
--- a/supported/EHentai.java
+++ b/supported/EHentai.java
@@ -34,14 +34,11 @@ class EHentai extends BasicSupport_Deprecated {
 		meta.setAuthor(getAuthor(reset(in)));
 		meta.setDate(getDate(reset(in)));
 		meta.setTags(getTags(reset(in)));
-		meta.setSource(getType().getSourceName());
 		meta.setUrl(source.toString());
-		meta.setPublisher(getType().getSourceName());
 		meta.setUuid(source.toString());
 		meta.setLuid("");
 		meta.setLang(getLang(reset(in)));
 		meta.setSubject("Hentai");
-		meta.setType(getType().toString());
 		meta.setImageDocument(true);
 		meta.setCover(getCover(source, reset(in)));
 		meta.setFakeCover(true);
@@ -54,7 +51,7 @@ class EHentai extends BasicSupport_Deprecated {
 		// 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());
 		}
@@ -118,7 +115,7 @@ class EHentai extends BasicSupport_Deprecated {
 			} else if (langLine.equalsIgnoreCase("French")) {
 				lang = "fr";
 			} else {
-				// TODO find the code?
+				// TODO find the code for other languages?
 				lang = langLine;
 			}
 		}
@@ -255,10 +252,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));
 				}
 			}
 		}
@@ -272,7 +267,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()) {