Instance: use getInstance()

[nikiroo-utils.git] / src / be / nikiroo / fanfix / supported / MangaLel.java

diff --git a/src/be/nikiroo/fanfix/supported/MangaLel.java b/src/be/nikiroo/fanfix/supported/MangaLel.java
index 020ee86f1d64c36f9002ff8156cb31194e097bfa..9929699cc43839b93e1b98752d205d562a08a845 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/MangaLel.java
+++ b/src/be/nikiroo/fanfix/supported/MangaLel.java
@@ -60,30 +60,29 @@ class MangaLel extends BasicSupport {
 
        private String getAuthor() {
                Element doc = getSourceNode();
-               Elements tabEls = doc.getElementsByClass("projet-titre");
-
-               String value = "";
-               if (tabEls.size() >= 2) {
-                       value = StringUtils.unhtml(tabEls.get(1).text()).trim();
+               Element tabEls = doc.getElementsByClass("presentation-projet").first();
+               if (tabEls != null) {
+                       String[] tab = tabEls.outerHtml().split("<br>");
+                       return getVal(tab, 1);
                }
 
-               return value;
+               return "";
        }
 
        private List<String> getTags() {
-               List<String> tags = new ArrayList<String>();
-
                Element doc = getSourceNode();
-               Elements tabEls = doc.getElementsByClass("projet-titre");
-
-               if (tabEls.size() >= 4) {
-                       String values = StringUtils.unhtml(tabEls.get(3).text()).trim();
-                       for (String value : values.split(",")) {
-                               tags.add(value);
+               Element tabEls = doc.getElementsByClass("presentation-projet").first();
+               if (tabEls != null) {
+                       String[] tab = tabEls.outerHtml().split("<br>");
+                       List<String> tags = new ArrayList<String>();
+                       for (String tag : getVal(tab, 3).split(" ")) {
+                               tags.add(tag);
                        }
+                       return tags;
                }
 
-               return tags;
+               return new ArrayList<String>();
+
        }
 
        private String getDate() {
@@ -118,14 +117,13 @@ class MangaLel extends BasicSupport {
        @Override
        protected String getDesc() {
                Element doc = getSourceNode();
-               Elements tabEls = doc.getElementsByClass("projet-titre");
-
-               String value = "";
-               if (tabEls.size() >= 5) {
-                       value = StringUtils.unhtml(tabEls.get(4).text()).trim();
+               Element tabEls = doc.getElementsByClass("presentation-projet").first();
+               if (tabEls != null) {
+                       String[] tab = tabEls.outerHtml().split("<br>");
+                       return getVal(tab, 4);
                }
 
-               return value;
+               return "";
        }
 
        private Image getCover() {
@@ -151,15 +149,14 @@ class MangaLel extends BasicSupport {
 
                                InputStream coverIn;
                                try {
-                                       coverIn = Instance.getCache().open(new URL(coverUrl), this,
-                                                       true);
+                                       coverIn = Instance.getInstance().getCache().open(new URL(coverUrl), this, true);
                                        try {
                                                return new Image(coverIn);
                                        } finally {
                                                coverIn.close();
                                        }
                                } catch (IOException e) {
-                                       Instance.getTraceHandler().error(e);
+                                       Instance.getInstance().getTraceHandler().error(e);
                                }
                        }
                }
@@ -167,6 +164,20 @@ class MangaLel extends BasicSupport {
                return null;
        }
 
+       private String getVal(String[] tab, int i) {
+               String val = "";
+
+               if (i < tab.length) {
+                       val = StringUtils.unhtml(tab[i]);
+                       int pos = val.indexOf(":");
+                       if (pos >= 0) {
+                               val = val.substring(pos + 1).trim();
+                       }
+               }
+
+               return val;
+       }
+
        @Override
        protected List<Entry<String, URL>> getChapters(Progress pg)
                        throws IOException {
@@ -197,18 +208,18 @@ class MangaLel extends BasicSupport {
 
                StringBuilder builder = new StringBuilder();
 
-               InputStream in = Instance.getCache().open(chapUrl, this, false);
+               InputStream in = Instance.getInstance().getCache().open(chapUrl, this, false);
                try {
                        Element pageDoc = DataUtil.load(in, "UTF-8", chapUrl.toString());
                        Element content = pageDoc.getElementById("content");
                        Elements linkEls = content.getElementsByTag("img");
                        for (Element linkEl : linkEls) {
-                               if (linkEl.attr("src").trim().isEmpty()) {
+                               if (linkEl.absUrl("src").isEmpty()) {
                                        continue;
                                }
 
                                builder.append("[");
-                               builder.append(linkEl.absUrl("src").trim());
+                               builder.append(linkEl.absUrl("src"));
                                builder.append("]<br/>");
                        }