X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FE621.java;h=527e0928cc33cb51215d30ca505dcd6dd4174e8d;hb=6cac0e45756735a3567822f45a7cc3e6bef61fd5;hp=665bdd5100cb0e7ef2b10ebc972a0c0729dca607;hpb=d98a29006897a1ae31ff3a039afe9643a48e0704;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/supported/E621.java b/src/be/nikiroo/fanfix/supported/E621.java
index 665bdd5..527e092 100644
--- a/src/be/nikiroo/fanfix/supported/E621.java
+++ b/src/be/nikiroo/fanfix/supported/E621.java
@@ -13,6 +13,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.Progress;
import be.nikiroo.utils.StringUtils;
/**
@@ -45,18 +46,19 @@ class E621 extends BasicSupport {
meta.setUuid(source.toString());
meta.setLuid("");
meta.setLang("EN");
- meta.setSubject("");
+ meta.setSubject("Furry");
meta.setType(getType().toString());
meta.setImageDocument(true);
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) {
@@ -88,9 +90,9 @@ class E621 extends BasicSupport {
private BufferedImage getCover(URL source) throws IOException {
InputStream in = Instance.getCache().open(source, this, true);
String images = getChapterContent(new URL(source.toString() + "?page="
- + 1), in, 1);
+ + 1), in, 1, null);
if (!images.isEmpty()) {
- int pos = images.indexOf('\n');
+ int pos = images.indexOf("
");
if (pos >= 0) {
images = images.substring(1, pos - 1);
return getImage(this, null, images);
@@ -189,8 +191,8 @@ class E621 extends BasicSupport {
}
@Override
- protected List> getChapters(URL source, InputStream in)
- throws IOException {
+ protected List> getChapters(URL source, InputStream in,
+ Progress pg) throws IOException {
List> urls = new ArrayList>();
int last = 1; // no pool/show when only one page
@@ -238,8 +240,8 @@ class E621 extends BasicSupport {
}
@Override
- protected String getChapterContent(URL source, InputStream in, int number)
- throws IOException {
+ protected String getChapterContent(URL source, InputStream in, int number,
+ Progress pg) throws IOException {
StringBuilder builder = new StringBuilder();
String staticSite = "https://static1.e621.net";
if (source.getHost().contains("e926")) {
@@ -266,7 +268,7 @@ class E621 extends BasicSupport {
id = id.substring(0, dotPos);
builder.append("[");
builder.append(id);
- builder.append("]\n");
+ builder.append("]
");
}
}
}