Merge branch 'master' into subtree

[nikiroo-utils.git] / supported / E621.java

diff --git a/supported/E621.java b/supported/E621.java
index 4d4c7b646d046229b4cdba3adc4df95a777e747b..f3a7238e534e7bf74ca0c1471da3cba6aca28b5e 100644 (file)
--- a/supported/E621.java
+++ b/supported/E621.java
@@ -7,7 +7,6 @@ import java.net.URL;
 import java.net.URLDecoder;
 import java.util.AbstractMap;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -61,16 +60,13 @@ class E621 extends BasicSupport {
 
                meta.setTitle(getTitle());
                meta.setAuthor(getAuthor());
-               meta.setDate(getDate());
+               meta.setDate(bsHelper.formatDate(getDate()));
                meta.setTags(getTags());
-               meta.setSource(getType().getSourceName());
                meta.setUrl(getSource().toString());
-               meta.setPublisher(getType().getSourceName());
                meta.setUuid(getSource().toString());
                meta.setLuid("");
                meta.setLang("en");
                meta.setSubject("Furry");
-               meta.setType(getType().toString());
                meta.setImageDocument(true);
                meta.setCover(getCover());
                meta.setFakeCover(true);
@@ -82,15 +78,20 @@ class E621 extends BasicSupport {
        protected String getDesc() throws IOException {
                if (isSearchOrSet(getSource())) {
                        StringBuilder builder = new StringBuilder();
+                       builder.append("<div>");
                        builder.append("A collection of images from ")
-                                       .append(getSource().getHost()).append("\n") //
-                                       .append("\tTime of creation: "
+                                       .append(getSource().getHost()) //
+                                       .append("<br/>\n") //
+                                       .append("&nbsp;&nbsp;&nbsp;&nbsp;Time of creation: "
                                                        + StringUtils.fromTime(new Date().getTime()))
-                                       .append("\n") //
-                                       .append("\tTags: ");//
+                                       .append("<br/>\n") //
+                                       .append("&nbsp;&nbsp;&nbsp;&nbsp;tTags: ");//
                        for (String tag : getTags()) {
-                               builder.append("\t\t").append(tag);
+                               builder.append(
+                                               "\n<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;")
+                                               .append(tag);
                        }
+                       builder.append("\n</div>");
 
                        return builder.toString();
                }
@@ -98,7 +99,7 @@ class E621 extends BasicSupport {
                if (isPool(getSource())) {
                        Element el = getSourceNode().getElementById("description");
                        if (el != null) {
-                               return el.text();
+                               return el.html();
                        }
                }