X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FE621.java;h=298ccf16bee07f2b2d3a3124a34543c095dfe2f3;hb=276f95c6ca9a79d2fc6879877b240cefb4ceb598;hp=5ebd6b317661cf0ff2b1ff0cf357559df469b380;hpb=92fb0719f84f5b6734b51e528332546d78e9ccec;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/supported/E621.java b/src/be/nikiroo/fanfix/supported/E621.java
index 5ebd6b3..298ccf1 100644
--- a/src/be/nikiroo/fanfix/supported/E621.java
+++ b/src/be/nikiroo/fanfix/supported/E621.java
@@ -1,6 +1,5 @@
package be.nikiroo.fanfix.supported;
-import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -13,8 +12,9 @@ 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;
-import be.nikiroo.utils.ui.Progress;
/**
* Support class for e621.net and ");
if (pos >= 0) {
images = images.substring(1, pos - 1);
return getImage(this, null, images);
@@ -101,7 +102,7 @@ class E621 extends BasicSupport {
return null;
}
- private String getAuthor(URL source, InputStream in) throws IOException {
+ private String getAuthor(URL source, InputStream in) {
String author = getLine(in, "href=\"/post/show/", 0);
if (author != null) {
String key = "href=\"";
@@ -143,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, "", 0);
if (title != null) {
int pos = title.indexOf('>');
@@ -190,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
@@ -221,14 +222,17 @@ class E621 extends BasicSupport {
final String key = Integer.toString(i);
final URL value = new URL(source.toString() + "?page=" + i);
urls.add(new Entry() {
+ @Override
public URL setValue(URL value) {
return null;
}
+ @Override
public URL getValue() {
return value;
}
+ @Override
public String getKey() {
return key;
}
@@ -239,8 +243,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")) {
@@ -267,7 +271,7 @@ class E621 extends BasicSupport {
id = id.substring(0, dotPos);
builder.append("[");
builder.append(id);
- builder.append("]\n");
+ builder.append("]
");
}
}
}