X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FEHentai.java;h=3c734329e3bac03e456665958b6699cc623b3ff8;hb=83001824bb702296a45cdf400312e34f69951e91;hp=9ed4e89e60996c6683876e543803ca55581117ad;hpb=ea76fef20c86c59429a211b1566ed270de270fc1;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/supported/EHentai.java b/src/be/nikiroo/fanfix/supported/EHentai.java
index 9ed4e89..3c73432 100644
--- 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 {
-	@Override
-	public String getSourceName() {
-		return "e-hentai.org";
-	}
-
 	@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.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)));
@@ -59,7 +54,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());
 		}
@@ -123,7 +118,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;
 			}
 		}
@@ -260,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));
 				}
 			}
 		}
@@ -277,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()) {