X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=inline;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FEHentai.java;h=9a09f077bf82b2145bd7242d52fbbb1b0d8cc266;hb=77fea1c0131fd9723ef06e65ab566e380fc7c876;hp=eae377c81d9feb53d5bdb2dcdda21623227d348d;hpb=f0608ab10e762c1aed9608720b97c1901b5e2614;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/supported/EHentai.java b/src/be/nikiroo/fanfix/supported/EHentai.java index eae377c..9a09f07 100644 --- a/src/be/nikiroo/fanfix/supported/EHentai.java +++ b/src/be/nikiroo/fanfix/supported/EHentai.java @@ -1,10 +1,10 @@ package be.nikiroo.fanfix.supported; -import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; +import java.util.AbstractMap; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; @@ -14,6 +14,7 @@ import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.data.Chapter; import be.nikiroo.fanfix.data.MetaData; import be.nikiroo.fanfix.data.Story; +import be.nikiroo.utils.Image; import be.nikiroo.utils.Progress; import be.nikiroo.utils.StringUtils; @@ -23,7 +24,7 @@ import be.nikiroo.utils.StringUtils; * * @author niki */ -class EHentai extends BasicSupport { +class EHentai extends BasicSupport_Deprecated { @Override public String getSourceName() { return "e-hentai.org"; @@ -35,15 +36,15 @@ class EHentai extends BasicSupport { meta.setTitle(getTitle(reset(in))); meta.setAuthor(getAuthor(reset(in))); - meta.setDate(""); + meta.setDate(getDate(reset(in))); meta.setTags(getTags(reset(in))); meta.setSource(getSourceName()); meta.setUrl(source.toString()); meta.setPublisher(getSourceName()); meta.setUuid(source.toString()); meta.setLuid(""); - meta.setLang("EN"); - meta.setSubject("Furry"); + meta.setLang(getLang(reset(in))); + meta.setSubject("Hentai"); meta.setType(getType().toString()); meta.setImageDocument(true); meta.setCover(getCover(source, reset(in))); @@ -78,9 +79,8 @@ class EHentai extends BasicSupport { return true; } - private BufferedImage getCover(URL source, InputStream in) - throws IOException { - BufferedImage author = null; + private Image getCover(URL source, InputStream in) { + Image author = null; String coverLine = getKeyLine(in, "