X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FE621.java;h=298ccf16bee07f2b2d3a3124a34543c095dfe2f3;hb=6bfa27805ec903223e6e45c6f4d00e94629a064c;hp=cb4ae4657a7807c104cb5c7dbefe7324f015e9de;hpb=2206ef66ee00ad42d806f04a7b7ad6f8cb2d8828;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/supported/E621.java b/src/be/nikiroo/fanfix/supported/E621.java
index cb4ae46..298ccf1 100644
--- a/src/be/nikiroo/fanfix/supported/E621.java
+++ b/src/be/nikiroo/fanfix/supported/E621.java
@@ -12,6 +12,8 @@ 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;
/**
@@ -24,7 +26,7 @@ import be.nikiroo.utils.StringUtils;
*
* @author niki
*/
-class E621 extends BasicSupport {
+class E621 extends BasicSupport_Deprecated {
@Override
public String getSourceName() {
return "e621.net";
@@ -43,19 +45,20 @@ class E621 extends BasicSupport {
meta.setPublisher(getSourceName());
meta.setUuid(source.toString());
meta.setLuid("");
- meta.setLang("EN");
- meta.setSubject("");
+ meta.setLang("en");
+ meta.setSubject("Furry");
meta.setType(getType().toString());
meta.setImageDocument(true);
- meta.setCover(null);
+ meta.setCover(getCover(source));
+ meta.setFakeCover(true);
return meta;
}
@Override
- public Story process(URL url) throws IOException {
+ public Story process(URL url, Progress pg) throws IOException {
// There is no chapters on e621, just pagination...
- Story story = super.process(url);
+ Story story = super.process(url, pg);
Chapter only = new Chapter(1, null);
for (Chapter chap : story) {
@@ -84,7 +87,22 @@ class E621 extends BasicSupport {
return true;
}
- private String getAuthor(URL source, InputStream in) throws IOException {
+ private Image getCover(URL source) throws IOException {
+ InputStream in = Instance.getCache().open(source, this, true);
+ String images = getChapterContent(new URL(source.toString() + "?page="
+ + 1), in, 1, null);
+ if (!images.isEmpty()) {
+ int pos = images.indexOf("
");
+ if (pos >= 0) {
+ images = images.substring(1, pos - 1);
+ return getImage(this, null, images);
+ }
+ }
+
+ return null;
+ }
+
+ private String getAuthor(URL source, InputStream in) {
String author = getLine(in, "href=\"/post/show/", 0);
if (author != null) {
String key = "href=\"";
@@ -96,24 +114,28 @@ class E621 extends BasicSupport {
author = author.substring(0, pos - 1);
String page = source.getProtocol() + "://"
+ source.getHost() + author;
- InputStream pageIn = Instance.getCache().open(
- new URL(page), this, false);
try {
- key = "class=\"tag-type-artist\"";
- author = getLine(pageIn, key, 0);
- if (author != null) {
- pos = author.indexOf("= 0) {
- author = author.substring(pos);
- pos = author.indexOf("");
+ InputStream pageIn = Instance.getCache().open(
+ new URL(page), this, false);
+ try {
+ key = "class=\"tag-type-artist\"";
+ author = getLine(pageIn, key, 0);
+ if (author != null) {
+ pos = author.indexOf("= 0) {
- author = author.substring(0, pos);
- return StringUtils.unhtml(author);
+ author = author.substring(pos);
+ pos = author.indexOf("");
+ if (pos >= 0) {
+ author = author.substring(0, pos);
+ return StringUtils.unhtml(author);
+ }
}
}
+ } finally {
+ pageIn.close();
}
- } finally {
- pageIn.close();
+ } catch (Exception e) {
+ // No author found
}
}
}
@@ -122,7 +144,7 @@ class E621 extends BasicSupport {
return null;
}
- private String getTitle(InputStream in) throws IOException {
+ private String getTitle(InputStream in) {
String title = getLine(in, "