Version 1.4.2: fix for images documents...

[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 bc6ba5b1501e83a1c1afbbdf38e6804d7147fdf7..05d122e68b89efc71587fda628f9b17e720736d7 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;
 
 /**
@@ -39,22 +41,24 @@ class E621 extends BasicSupport {
                meta.setDate("");
                meta.setTags(new ArrayList<String>()); // TODDO ???
                meta.setSource(getSourceName());
+               meta.setUrl(source.toString());
                meta.setPublisher(getSourceName());
                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) {
@@ -83,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);
+               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) {
@@ -95,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("<a href=\"");
-                                                       if (pos >= 0) {
-                                                               author = author.substring(pos);
-                                                               pos = author.indexOf("</a>");
+                                               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("<a href=\"");
                                                                if (pos >= 0) {
-                                                                       author = author.substring(0, pos);
-                                                                       return StringUtils.unhtml(author);
+                                                                       author = author.substring(pos);
+                                                                       pos = author.indexOf("</a>");
+                                                                       if (pos >= 0) {
+                                                                               author = author.substring(0, pos);
+                                                                               return StringUtils.unhtml(author);
+                                                                       }
                                                                }
                                                        }
+                                               } finally {
+                                                       pageIn.close();
                                                }
-                                       } finally {
-                                               pageIn.close();
+                                       } catch (Exception e) {
+                                               // No author found
                                        }
                                }
                        }
@@ -232,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);
@@ -245,7 +268,7 @@ class E621 extends BasicSupport {
                                                        id = id.substring(0, dotPos);
                                                        builder.append("[");
                                                        builder.append(id);
-                                                       builder.append("]\n");
+                                                       builder.append("]<br/>");
                                                }
                                        }
                                }