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 5ebd6b317661cf0ff2b1ff0cf357559df469b380..527e0928cc33cb51215d30ca505dcd6dd4174e8d 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/E621.java
+++ b/src/be/nikiroo/fanfix/supported/E621.java
@@ -13,8 +13,8 @@ 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;
-import be.nikiroo.utils.ui.Progress;
 
 /**
  * Support class for <a href="http://e621.net/">e621.net</a> and <a
@@ -46,10 +46,11 @@ 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(getCover(source));
+               meta.setFakeCover(true);
 
                return meta;
        }
@@ -89,9 +90,9 @@ class E621 extends BasicSupport {
        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);
+                               + 1), in, 1, null);
                if (!images.isEmpty()) {
-                       int pos = images.indexOf('\n');
+                       int pos = images.indexOf("<br/>");
                        if (pos >= 0) {
                                images = images.substring(1, pos - 1);
                                return getImage(this, null, images);
@@ -190,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
 
@@ -239,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")) {
@@ -267,7 +268,7 @@ class E621 extends BasicSupport {
                                                        id = id.substring(0, dotPos);
                                                        builder.append("[");
                                                        builder.append(id);
-                                                       builder.append("]\n");
+                                                       builder.append("]<br/>");
                                                }
                                        }
                                }