From: Niki Roo Date: Sun, 18 Mar 2018 19:18:24 +0000 (+0100) Subject: Fix MangaFox support (and use jsoup) X-Git-Tag: fanfix-1.7.0~27 X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=cb554033588024e05741c80d9e6ff9bee65a2e66;p=fanfix.git Fix MangaFox support (and use jsoup) --- diff --git a/src/be/nikiroo/fanfix/supported/MangaFox.java b/src/be/nikiroo/fanfix/supported/MangaFox.java index 8fc1965..5abc47b 100644 --- a/src/be/nikiroo/fanfix/supported/MangaFox.java +++ b/src/be/nikiroo/fanfix/supported/MangaFox.java @@ -4,11 +4,15 @@ import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; +import java.util.AbstractMap; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map.Entry; -import java.util.Scanner; + +import org.jsoup.helper.DataUtil; +import org.jsoup.nodes.Element; +import org.jsoup.select.Elements; import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.data.MetaData; @@ -16,7 +20,7 @@ import be.nikiroo.utils.Image; import be.nikiroo.utils.Progress; import be.nikiroo.utils.StringUtils; -class MangaFox extends BasicSupport_Deprecated { +class MangaFox extends BasicSupport { @Override protected boolean isHtml() { return true; @@ -28,168 +32,104 @@ class MangaFox extends BasicSupport_Deprecated { } @Override - protected MetaData getMeta(URL source, InputStream in) throws IOException { + protected MetaData getMeta() throws IOException { MetaData meta = new MetaData(); + Element doc = getSourceNode(); + + Element title = doc.getElementById("title"); + Elements table = null; + if (title != null) { + table = title.getElementsByTag("table"); + } + if (table != null) { + // Rows: header, data + Elements rows = table.first().getElementsByTag("tr"); + if (rows.size() > 1) { + table = rows.get(1).getElementsByTag("td"); + // Columns: Realeased, Authors, Artists, Genres + if (table.size() < 4) { + table = null; + } + } + } - meta.setTitle(getTitle(reset(in))); - meta.setAuthor(getAuthor(reset(in))); - meta.setDate(getDate(reset(in))); - meta.setTags(getTags(reset(in))); + meta.setTitle(getTitle()); + if (table != null) { + meta.setAuthor(getAuthors(table.get(1).text() + "," + + table.get(2).text())); + + meta.setDate(StringUtils.unhtml(table.get(0).text()).trim()); + meta.setTags(explode(table.get(3).text())); + } meta.setSource(getSourceName()); - meta.setUrl(source.toString()); + meta.setUrl(getSource().toString()); meta.setPublisher(getSourceName()); - meta.setUuid(source.toString()); + meta.setUuid(getSource().toString()); meta.setLuid(""); meta.setLang("EN"); meta.setSubject("manga"); meta.setType(getType().toString()); meta.setImageDocument(true); - meta.setCover(getCover(reset(in))); + meta.setCover(getCover()); return meta; } - private List getTags(InputStream in) { - List tags = new ArrayList(); + private String getTitle() { + Element doc = getSourceNode(); - String line = getLine(in, "/genres/", 0); - if (line != null) { - line = StringUtils.unhtml(line); - String[] tab = line.split(","); - if (tab != null) { - for (String tag : tab) { - tags.add(tag.trim()); - } - } - } - - return tags; - } - - private String getTitle(InputStream in) { - String line = getLine(in, " property=\"og:title\"", 0); - if (line != null) { - int pos = -1; - for (int i = 0; i < 3; i++) { - pos = line.indexOf('"', pos + 1); - } - - if (pos >= 0) { - line = line.substring(pos + 1); - pos = line.indexOf('"'); - if (pos >= 0) { - return line.substring(0, pos); - } - } + Element title = doc.getElementById("title"); + Element h1 = title.getElementsByTag("h1").first(); + if (h1 != null) { + return StringUtils.unhtml(h1.text()).trim(); } return null; } - private String getAuthor(InputStream in) { - List authors = new ArrayList(); - - String line = getLine(in, "/author/", 0, false); - if (line != null) { - for (String ln : StringUtils.unhtml(line).split(",")) { - if (ln != null && !ln.trim().isEmpty() - && !authors.contains(ln.trim())) { - authors.add(ln.trim()); - } - } - } - - try { - in.reset(); - } catch (IOException e) { - Instance.getTraceHandler().error(e); - } - - line = getLine(in, "/artist/", 0, false); - if (line != null) { - for (String ln : StringUtils.unhtml(line).split(",")) { - if (ln != null && !ln.trim().isEmpty() - && !authors.contains(ln.trim())) { - authors.add(ln.trim()); - } + private String getAuthors(String authorList) { + String author = ""; + for (String auth : explode(authorList)) { + if (!author.isEmpty()) { + author = author + ", "; } + author += auth; } - if (authors.isEmpty()) { - return null; - } - - StringBuilder builder = new StringBuilder(); - for (String author : authors) { - if (builder.length() > 0) { - builder.append(", "); - } - - builder.append(author); - } - - return builder.toString(); - } - - private String getDate(InputStream in) { - String line = getLine(in, "/released/", 0); - if (line != null) { - line = StringUtils.unhtml(line); - return line.trim(); - } - - return null; + return author; } @Override - protected String getDesc(URL source, InputStream in) { - String line = getLine(in, " property=\"og:description\"", 0); - if (line != null) { - int pos = -1; - for (int i = 0; i < 3; i++) { - pos = line.indexOf('"', pos + 1); - } - - if (pos >= 0) { - line = line.substring(pos + 1); - pos = line.indexOf('"'); - if (pos >= 0) { - return line.substring(0, pos); - } - } + protected String getDesc() { + Element doc = getSourceNode(); + Element title = doc.getElementsByClass("summary").first(); + if (title != null) { + StringUtils.unhtml(title.text()).trim(); } return null; } - private Image getCover(InputStream in) { - String line = getLine(in, " property=\"og:image\"", 0); - String cover = null; - if (line != null) { - int pos = -1; - for (int i = 0; i < 3; i++) { - pos = line.indexOf('"', pos + 1); - } - - if (pos >= 0) { - line = line.substring(pos + 1); - pos = line.indexOf('"'); - if (pos >= 0) { - cover = line.substring(0, pos); - } - } + private Image getCover() { + Element doc = getSourceNode(); + Element cover = doc.getElementsByClass("cover").first(); + if (cover != null) { + cover = cover.getElementsByTag("img").first(); } if (cover != null) { + String coverUrl = cover.absUrl("src"); + InputStream coverIn; try { - coverIn = openEx(cover); + coverIn = openEx(coverUrl); try { return new Image(coverIn); } finally { coverIn.close(); } } catch (IOException e) { + Instance.getTraceHandler().error(e); } } @@ -197,88 +137,38 @@ class MangaFox extends BasicSupport_Deprecated { } @Override - protected List> getChapters(URL source, InputStream in, - Progress pg) { + protected List> getChapters(Progress pg) { List> urls = new ArrayList>(); - String volumeAt = "

"; - String linkAt = "href=\"http://mangafox.me/"; - String endAt = "