X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2Fservlet%2FConfig.java;h=5bce897aa17b7321f93b9aa1616730c4ba0e9223;hb=892111b2ecf385bd28bbe93ff6113cbc1e04409e;hp=5c0c1343a571557362027379e82759e801ef1922;hpb=27591c1933180a43423c78cc8cda28a3da1bfccf;p=pnews.git diff --git a/war/src/main/java/pnews/servlet/Config.java b/war/src/main/java/pnews/servlet/Config.java index 5c0c134..5bce897 100644 --- a/war/src/main/java/pnews/servlet/Config.java +++ b/war/src/main/java/pnews/servlet/Config.java @@ -3,114 +3,148 @@ package pnews.servlet; import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.logging.Logger; import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonObject; +import javax.json.JsonValue; import pnews.Category; import pnews.Feed; public class Config { - public static Feed[] getFeeds() { + private Feed[] feeds; + private Category[] categories; + private final String[] languages = { "fr", "en" }; + private static final Logger LOG = Logger.getLogger(Config.class.getName()); + + private void loadCategories(JsonArray jcats) { + List cats; + JsonObject jcat; + String id, label, title, language; + + cats = new ArrayList<>(jcats.size()); + + for (JsonValue v: jcats) { + jcat = (JsonObject)v; + id = jcat.getString("id"); + label = jcat.getString("label"); + title = jcat.getString("title"); + language = jcat.getString("language"); + cats.add(new Category(id, label, title, language)); + } + + categories = cats.toArray(new Category[0]); + } + + private Category getCategory(String id) { + for (Category c: categories) + if (c.getId().equals(id)) + return c; + return null; + } + + public void loadConfig() throws UnsupportedEncodingException { Reader r; - List feeds; - JsonObject jfeeds; + JsonObject jfeeds, jroot; + List feedList; r = null; try { - r = new InputStreamReader(Config.class.getClassLoader().getResourceAsStream("feeds.json")); - jfeeds = Json.createReader(r).readObject(); + r = new InputStreamReader(Config.class.getClassLoader().getResourceAsStream("feeds.json"), + "UTF-8"); + jroot = Json.createReader(r).readObject(); } finally { if (r != null) try { r.close(); } catch (IOException e) { }; } - feeds = new ArrayList(jfeeds.size()); + + loadCategories(jroot.getJsonArray("categories")); + + jfeeds = jroot.getJsonObject("feeds"); + + feedList = new ArrayList(jfeeds.size()); jfeeds.forEach((k, v)-> { JsonObject jf; + String str; + Category cat; JsonArray jcategories; jf = (JsonObject)v; jcategories = jf.getJsonArray("categories"); - feeds.add(new Feed(k, Category.valueOf(jcategories.getString(0)))); - }); + str = jcategories.getString(0); - return feeds.toArray(new Feed[] {}); + cat = getCategory(str); + + if (cat != null) + feedList.add(new Feed(k, cat)); + else + LOG.severe("Missing category: " + str); + }); + + feeds = feedList.toArray(new Feed[0]); + } + + public Feed[] getFeeds() { + return feeds; } - public static Map getFeedsByCategory() { - Map result; + public Map> getFeedsByCategory() { + Map> result; + Feed[] feeds; + List catFeeds; + Category cat; result = new HashMap<>(); - result.put(Category.ACTUALITE, - new String[] { - "http://www.europe1.fr/var/export/rss/europe1/actus.xml", - "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.europe1.fr/var/export/rss/europe1/sport.xml", - "http://www.sportune.fr/feed", - "http://www.france24.com/fr/sports/rss" }); - - 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, - new String[] { "http://www.france24.com/fr/europe/rss" }); - - result.put(Category.MONDE, - new String[] { "http://www.europe1.fr/var/export/rss/europe1/international.xml", - "http://www.france24.com/fr/actualites/rss" }); - - - result.put(Category.ECONOMIE, - new String[] { "http://www.france24.com/fr/economie/rss", - "http://www.europe1.fr/var/export/rss/europe1/economie.xml", - "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" - }); + feeds = getFeeds(); + for (Feed f: feeds) { + cat = f.getCategory(); - result.put(Category.TECHNOLOGIE, - new String[] { "http://www.generation-nt.com/export/rss.xml", - "http://www.europe1.fr/var/export/rss/europe1/sciences.xml", - "http://feeds.feedburner.com/lesnumeriques/news", - "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"}); + catFeeds = result.get(cat); + if (catFeeds == null) { + catFeeds = new ArrayList(); + result.put(cat, catFeeds); + } + catFeeds.add(f); + } return result; } - public static void main(String[] args) { - Feed[] feeds; + public Category[] getCategories() { + return categories; + } + + public Category getDefaultCategory() { + return categories[0]; + } + + public String[] getLanguages() { + return languages; + } + + public static void main(String[] args) throws UnsupportedEncodingException { + Config cfg; + Feed[] feeds; + Category[] cats; + + cfg = new Config(); + cfg.loadConfig(); - feeds = getFeeds(); + cats = cfg.getCategories(); + for (Category cat: cats) + System.out.println(cat); + + feeds = cfg.getFeeds(); System.out.println("Number of feeds: " + feeds.length); for (Feed f: feeds)