Update nikiroo-utils, use it, fix 2 bugs:

[gofetch.git] / src / be / nikiroo / gofetch / support / LeMonde.java

diff --git a/src/be/nikiroo/gofetch/support/LeMonde.java b/src/be/nikiroo/gofetch/support/LeMonde.java
index 4e22b4c0a9c8f6fdc93db8a09984f45b3020594a..d11ba797f7767cb89e84793fb2234de2b5417b6d 100644 (file)
--- a/src/be/nikiroo/gofetch/support/LeMonde.java
+++ b/src/be/nikiroo/gofetch/support/LeMonde.java
@@ -28,7 +28,7 @@ public class LeMonde extends BasicSupport {
                for (String topic : new String[] { "international", "politique",
                                "societe", "sciences" }) {
                        URL url = new URL("http://www.lemonde.fr/" + topic + "/1.html");
-                       InputStream in = open(url);
+                       InputStream in = downloader.open(url);
                        Document doc = DataUtil.load(in, "UTF-8", url.toString());
                        Elements articles = doc.getElementsByTag("article");
                        for (Element article : articles) {
@@ -37,7 +37,8 @@ public class LeMonde extends BasicSupport {
                                Elements contentElements = article.getElementsByClass("txt3");
                                if (times.size() > 0 && titleElements.size() > 0
                                                && contentElements.size() > 0) {
-                                       String id = times.get(0).attr("datetime").replace(":", "_");
+                                       String id = times.get(0).attr("datetime").replace(":", "_")
+                                                       .replace("+", "_");
                                        String title = "[" + topic + "] "
                                                        + titleElements.get(0).text();
                                        String content = contentElements.get(0).text();
@@ -73,16 +74,11 @@ public class LeMonde extends BasicSupport {
                // some javascript, I need to check...)
 
                URL url = new URL(story.getUrlInternal());
-               InputStream in = open(url);
+               InputStream in = downloader.open(url);
                Document doc = DataUtil.load(in, "UTF-8", url.toString());
                Element article = doc.getElementById("articleBody");
                if (article != null) {
-                       for (String line : toLines(article, new QuoteProcessor() {
-                               @Override
-                               public String processText(String text) {
-                                       return text;
-                               }
-
+                       for (String line : toLines(article, new BasicElementProcessor() {
                                @Override
                                public boolean ignoreNode(Node node) {
                                        if (node instanceof Element) {
@@ -95,11 +91,6 @@ public class LeMonde extends BasicSupport {
                                        return false;
                                }
 
-                               @Override
-                               public boolean detectQuote(Node node) {
-                                       return false;
-                               }
-
                                @Override
                                public String manualProcessing(Node node) {
                                        if (node instanceof Element) {