X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2Fservlet%2FArticleProvider.java;h=df68547f2a80758a12dee67f128c4f4e47232479;hb=58b4375cbc4bbe9407e3540091d85446dee0bcf1;hp=dd5daebe74ffa98f0501e621b1e0441168afcd81;hpb=0ed2e0cccd90ccf06cb592768511278444d7b1b0;p=pnews.git

diff --git a/war/src/main/java/pnews/servlet/ArticleProvider.java b/war/src/main/java/pnews/servlet/ArticleProvider.java
index dd5daeb..df68547 100644
--- a/war/src/main/java/pnews/servlet/ArticleProvider.java
+++ b/war/src/main/java/pnews/servlet/ArticleProvider.java
@@ -43,7 +43,6 @@ public class ArticleProvider {
                 XmlReader r;
                 
                 r = new XmlReader(new URL(u));
-                XmlReader.setDefaultEncoding("UTF-8");
                 
                 return new SyndFeedInput().build(r);                
         }
@@ -69,6 +68,7 @@ public class ArticleProvider {
                 
                 result.put(Category.FRANCE,
                                 new String[] { "http://www.france24.com/fr/france/rss",
+                                               "http://www.francetvinfo.fr/france.rss",
                                                "http://www.rfi.fr/france/rss"});
                 
                 result.put(Category.EUROPE,
@@ -93,7 +93,12 @@ public class ArticleProvider {
                 
                 result.put(Category.TECHNOLOGIE,
                                 new String[] { "http://feeds.feedburner.com/lesnumeriques/news",
-                                               "http://www.zdnet.fr/feeds/rss/actualites/"});
+                                               "http://www.zdnet.fr/feeds/rss/actualites/",
+                                               "http://www.frandroid.com/feed",
+                                               "http://www.silicon.fr/feed",
+                                               "http://www.fredzone.org/feed",
+                                               "http://www.futura-sciences.com/rss/actualites.xml",
+                                               "https://www-03.ibm.com/press/fr/fr/rssfeed.wss?keyword=null&maxFeed=&feedType=RSS&topic=all"});
                 
                 return result;
         }
@@ -120,10 +125,15 @@ public class ArticleProvider {
                 return false;
         }
         
-        private Article toArticle(String link, Category cat, SyndEntry entry, SyndFeed feed) {
-                String desc, title, thumbnail;
+        private static Article toArticle(String link, SyndEntry entry, SyndFeed feed) {
+                String desc, title, thumbnail, feedTitle, str;
                 Date date;
-
+                
+                feedTitle = feed.getTitle();
+                if (feedTitle != null) {
+                        feedTitle = feedTitle.trim();
+                }
+                
                 thumbnail = null;
                 for (SyndEnclosure e: entry.getEnclosures()) {
                         if (e.getType().startsWith("image/"))
@@ -133,29 +143,29 @@ public class ArticleProvider {
                 
                 if (thumbnail == null && feed.getImage() != null)
                         thumbnail = feed.getImage().getUrl();
-                                                
+                             
+                
                 title = entry.getTitle().trim();
                 
-                if (entry.getDescription() != null) {                                      
-                        desc = Jsoup.parse(entry.getDescription().getValue()).text();
+                if (entry.getDescription() != null) {
+                        str = entry.getDescription().getValue();
+                        desc = Jsoup.parse(str).text();
                 } else {       
                         desc = null;
-                        LOG.severe("No description for " + feed.getTitle() + " - " + title);
+                        LOG.severe("No description for " + feedTitle + " - " + title);
                 }
                 
                 date = entry.getPublishedDate();
                 if (date == null)
                         date = entry.getUpdatedDate();
                 if (date == null)
-                        LOG.severe("The article " + feed.getTitle() + " - " + title + " does not have a date");
+                        LOG.severe("The article " + feedTitle + " - " + title + " does not have a date");
                                      
-                return new Article(link, cat, title, desc, thumbnail, date, title);
+                return new Article(link, title, desc, thumbnail, date, feedTitle);
         }
         
-        
-        
         private void addArticles(Category cat, SyndFeed feed) {
-                String link, feedTitle;
+                String feedTitle;
                 List<Article> articles;
                 Article a;
                 
@@ -164,14 +174,14 @@ public class ArticleProvider {
                 LOG.info("addArticles " + cat.getId() + " " + feedTitle + " number of articles: " + feed.getEntries().size());
                 
                 for (SyndEntry entry: feed.getEntries()) {
-                        link = entry.getLink().trim();
+                        String link = entry.getLink().trim();
                         articles = getArticlesForUpdate(cat);
                         if (exists(link, articles)) {
                                 LOG.fine("addArticles " + link + " is already present");
                                 continue ;
                         }
                         
-                        a = toArticle(link, cat, entry, feed);
+                        a = ArticleStore.singleton.getArticle(link, ()->toArticle(link, entry, feed));
                         
                         synchronized (articles) {
                                 articles.add(a);
@@ -187,14 +197,13 @@ public class ArticleProvider {
                                                         return -1;
                                                 return o2.publicationDate.compareTo(o1.publicationDate);
                                         }
-
                                 });
                         }
                 }          
                 
                 LOG.info("addArticles done " + cat.getId());
         }
-        
+             
         private void retrieveArticles(Category cat) throws IllegalArgumentException, MalformedURLException, FeedException, IOException {
                 String[] feeds;
                 
@@ -237,23 +246,11 @@ public class ArticleProvider {
                 }
                 
                 @Override
-                public void run() {
-                        List<Article> articles;
-                        
+                public void run() {                       
                         LOG.info("refresher "+ category.getId());
                         
                         try {
                                 retrieveArticles(category);
-                                
-                                synchronized (articlesByCategory) {
-                                        articles = articlesByCategory.get(category);
-                                        if (articles != null && articles.size() > 100) {
-                                                articlesByCategory.put(category,
-                                                                       articles.subList(0, 100));
-                                                                
-                                        }
-                                        LOG.info("refresher " + category.getId() + " number of articles: " + articles.size());
-                                }
                         } catch (IllegalArgumentException | FeedException | IOException e) {
                                 LOG.log(Level.SEVERE, "refresher failure", e);
                         }