Better URL entries + fix for FimFicAPI:
[fanfix.git] / src / be / nikiroo / fanfix / supported / E621.java
index 2455c8753e822910785cbc1a83a150bee1d35d37..f299ee7ff8d14b00df5cd3ca12318237a37d32ef 100644 (file)
@@ -3,6 +3,7 @@ package be.nikiroo.fanfix.supported;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
@@ -10,7 +11,10 @@ import java.util.Scanner;
 
 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;
 
 /**
@@ -23,21 +27,39 @@ import be.nikiroo.utils.StringUtils;
  * 
  * @author niki
  */
-class E621 extends BasicSupport {
+class E621 extends BasicSupport_Deprecated {
        @Override
        public String getSourceName() {
                return "e621.net";
        }
 
        @Override
-       public boolean isImageDocument(URL source, InputStream in) {
-               return true;
+       protected MetaData getMeta(URL source, InputStream in) throws IOException {
+               MetaData meta = new MetaData();
+
+               meta.setTitle(getTitle(reset(in)));
+               meta.setAuthor(getAuthor(source, reset(in)));
+               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("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) {
@@ -66,8 +88,22 @@ class E621 extends BasicSupport {
                return true;
        }
 
-       @Override
-       protected 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("<br/>");
+                       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=\"";
@@ -79,24 +115,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
                                        }
                                }
                        }
@@ -105,23 +145,7 @@ class E621 extends BasicSupport {
                return null;
        }
 
-       @Override
-       protected String getDate(URL source, InputStream in) throws IOException {
-               return null;
-       }
-
-       @Override
-       protected String getSubject(URL source, InputStream in) throws IOException {
-               return null;
-       }
-
-       @Override
-       protected URL getCover(URL source, InputStream in) throws IOException {
-               return null;
-       }
-
-       @Override
-       protected String getTitle(URL source, InputStream in) throws IOException {
+       private String getTitle(InputStream in) {
                String title = getLine(in, "<title>", 0);
                if (title != null) {
                        int pos = title.indexOf('>');
@@ -137,7 +161,7 @@ class E621 extends BasicSupport {
                                title = title.substring("Pool:".length());
                        }
 
-                       title = title.trim();
+                       title = StringUtils.unhtml(title).trim();
                }
 
                return title;
@@ -168,8 +192,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
 
@@ -196,29 +220,16 @@ class E621 extends BasicSupport {
                }
 
                for (int i = 1; i <= last; i++) {
-                       final String key = Integer.toString(i);
-                       final URL value = new URL(source.toString() + "?page=" + i);
-                       urls.add(new Entry<String, URL>() {
-                               public URL setValue(URL value) {
-                                       return null;
-                               }
-
-                               public URL getValue() {
-                                       return value;
-                               }
-
-                               public String getKey() {
-                                       return key;
-                               }
-                       });
+                       urls.add(new AbstractMap.SimpleEntry<String, URL>(Integer
+                                       .toString(i), new URL(source.toString() + "?page=" + i)));
                }
 
                return urls;
        }
 
        @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")) {
@@ -232,7 +243,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 +256,7 @@ class E621 extends BasicSupport {
                                                        id = id.substring(0, dotPos);
                                                        builder.append("[");
                                                        builder.append(id);
-                                                       builder.append("]\n");
+                                                       builder.append("]<br/>");
                                                }
                                        }
                                }