Improve importing progress reporting

[fanfix.git] / src / be / nikiroo / fanfix / supported / E621.java

diff --git a/src/be/nikiroo/fanfix/supported/E621.java b/src/be/nikiroo/fanfix/supported/E621.java
index 45c110f283ebaf825d5f7c65361917333f69add9..527e0928cc33cb51215d30ca505dcd6dd4174e8d 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/E621.java
+++ b/src/be/nikiroo/fanfix/supported/E621.java
@@ -1,5 +1,6 @@
 package be.nikiroo.fanfix.supported;
 
+import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -12,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;
 
 /**
@@ -44,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(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,6 +87,21 @@ class E621 extends BasicSupport {
                return true;
        }
 
+       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, null);
+               if (!images.isEmpty()) {
+                       int pos = images.indexOf("<br/>");
+                       if (pos >= 0) {
+                               images = images.substring(1, pos - 1);
+                               return getImage(this, null, images);
+                       }
+               }
+
+               return null;
+       }
+
        private String getAuthor(URL source, InputStream in) throws IOException {
                String author = getLine(in, "href=\"/post/show/", 0);
                if (author != null) {
@@ -173,8 +191,8 @@ class E621 extends BasicSupport {
        }
 
        @Override
-       protected List<Entry<String, URL>> getChapters(URL source, InputStream in)
-                       throws IOException {
+       protected List<Entry<String, URL>> getChapters(URL source, InputStream in,
+                       Progress pg) throws IOException {
                List<Entry<String, URL>> urls = new ArrayList<Entry<String, URL>>();
                int last = 1; // no pool/show when only one page
 
@@ -222,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")) {
@@ -237,7 +255,7 @@ class E621 extends BasicSupport {
                scan.useDelimiter("\\n");
                while (scan.hasNext()) {
                        String line = scan.next();
-                       if (line.contains("class=\"preview\"")) {
+                       if (line.contains("class=\"preview")) {
                                for (int pos = line.indexOf(key); pos >= 0; pos = line.indexOf(
                                                key, pos + key.length())) {
                                        int endPos = line.indexOf("\"", pos);
@@ -250,7 +268,7 @@ class E621 extends BasicSupport {
                                                        id = id.substring(0, dotPos);
                                                        builder.append("[");
                                                        builder.append(id);
-                                                       builder.append("]\n");
+                                                       builder.append("]<br/>");
                                                }
                                        }
                                }