X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2Fservlet%2FArticleProvider.java;h=3e90d11320ae4024a3d1124c340ce9a6df0dec81;hb=386f46525e32212ac5f3653135a6539c1b2639eb;hp=d65002d30f83bfeeeaaa254caa94454b2ce7282d;hpb=5d0b7bff3d5c053abc0ac76c69d7cb1ae3978aba;p=pnews.git

diff --git a/war/src/main/java/pnews/servlet/ArticleProvider.java b/war/src/main/java/pnews/servlet/ArticleProvider.java
index d65002d..3e90d11 100644
--- a/war/src/main/java/pnews/servlet/ArticleProvider.java
+++ b/war/src/main/java/pnews/servlet/ArticleProvider.java
@@ -27,15 +27,17 @@ import com.rometools.rome.io.XmlReader;
 
 import pnews.Article;
 import pnews.Category;
+import pnews.Feed;
 
 public class ArticleProvider {
-        public final static ArticleProvider singleton = new ArticleProvider();
         private static final Logger LOG = Logger.getLogger(ArticleProvider.class.getName());
         private final Map<Category, List<Article>> articlesByCategory = new HashMap<>();
         private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(2);
+        private final Config config;
         
-        private ArticleProvider() {      
-                for (Category cat:Category.values())
+        public ArticleProvider(Config config) {
+                this.config = config;
+                for (Category cat: config.getCategories())
                         scheduler.scheduleAtFixedRate(new Refresher(cat), 2, 600, TimeUnit.SECONDS);
         }
         
@@ -47,57 +49,6 @@ public class ArticleProvider {
                 return new SyndFeedInput().build(r);                
         }
         
-        private static Map<Category, String[]> getFeeds() {
-                Map<Category, String[]> result;
-                
-                result = new HashMap<>();
-                
-                result.put(Category.TOP,
-                           new String[] {
-                                           "http://www.francetvinfo.fr/titres.rss",
-                                           "http://www.rfi.fr/general/rss",
-                                           "http://www.cnews.fr/rss/une",
-                                           "http://www.ladepeche.fr/rss/a-la-une.rss",
-                                           "https://www.franceinter.fr/rss/a-la-une.xml",
-                                           "https://www.francebleu.fr/rss/a-la-une.xml",
-                                           "http://www.bfmtv.com/rss/info/flux-rss/flux-toutes-les-actualites/"
-                           });
-                
-                result.put(Category.SPORT,
-                                new String[] { "http://www.france24.com/fr/sports/rss" });
-                
-                result.put(Category.FRANCE,
-                                new String[] { "http://www.france24.com/fr/france/rss",
-                                               "http://www.rfi.fr/france/rss"});
-                
-                result.put(Category.EUROPE,
-                                new String[] { "http://www.france24.com/fr/europe/rss" });
-
-                result.put(Category.MONDE, 
-                           new String[] { "http://www.france24.com/fr/actualites/rss" });                                           
-
-                
-                result.put(Category.ECO,
-                                new String[] { "http://www.france24.com/fr/economie/rss",
-                                               "http://www.rfi.fr/economie/rss" });
-                
-                result.put(Category.ESSONNE,
-                                new String[] { "http://www.tourisme-essonne.com/rss/actus/",
-                                               "http://www.ville-palaiseau.fr/rss/actualites.htm" });
-                
-                result.put(Category.PEOPLE,
-                                new String[] { "http://www.premiere.fr/rss/actu-live",
-                                               "http://www.purepeople.com/rss/news_t0.xml"                                               
-                });
-                
-                result.put(Category.TECHNOLOGIE,
-                                new String[] { "http://feeds.feedburner.com/lesnumeriques/news",
-                                               "http://www.zdnet.fr/feeds/rss/actualites/",
-                                               "https://www-03.ibm.com/press/fr/fr/rssfeed.wss?keyword=null&maxFeed=&feedType=RSS&topic=all"});
-                
-                return result;
-        }
-        
         private List<Article> getArticlesForUpdate(Category cat) {
                 List<Article> result;
                 
@@ -166,7 +117,7 @@ public class ArticleProvider {
                 
                 feedTitle = feed.getTitle().trim();
                 
-                LOG.info("addArticles " + cat.getId() + " " + feedTitle + " number of articles: " + feed.getEntries().size());
+                LOG.info("addArticles " + cat.getName() + " " + feedTitle + " number of articles: " + feed.getEntries().size());
                 
                 for (SyndEntry entry: feed.getEntries()) {
                         String link = entry.getLink().trim();
@@ -196,21 +147,21 @@ public class ArticleProvider {
                         }
                 }          
                 
-                LOG.info("addArticles done " + cat.getId());
+                LOG.info("addArticles done " + cat.getName());
         }
              
         private void retrieveArticles(Category cat) throws IllegalArgumentException, MalformedURLException, FeedException, IOException {
-                String[] feeds;
+                List<Feed> feeds;
                 
-                feeds = getFeeds().get(cat);
+                feeds = config.getFeedsByCategory().get(cat);
                 
                 if (feeds != null)
-                        for (String str: feeds)
+                        for (Feed f: feeds)
                                 try {
-                                        addArticles(cat, getSyndFeed(str));
+                                        addArticles(cat, getSyndFeed(f.getURL()));
                                 } catch (Throwable e) {
                                         LOG.log(Level.SEVERE,
-                                                "retrieveArticles failure " + cat.getId() + " " + str,
+                                                "retrieveArticles failure " + cat.getName() + " " + f.toString(),
                                                 e);
                                 }
                 else
@@ -242,7 +193,7 @@ public class ArticleProvider {
                 
                 @Override
                 public void run() {                       
-                        LOG.info("refresher "+ category.getId());
+                        LOG.info("refresher "+ category.getName());
                         
                         try {
                                 retrieveArticles(category);
@@ -250,7 +201,7 @@ public class ArticleProvider {
                                 LOG.log(Level.SEVERE, "refresher failure", e);
                         }                        
                         
-                        LOG.info("refresher "+ category.getId() + " done");
+                        LOG.info("refresher "+ category.getName() + " done");
                 }                
         }
 }