X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fresources%2Ffeeds.json;h=337e19a155da62ffc4e9251e0dcdd3bcf110f882;hb=9ff314621235d6b748abb128edf0331480d0eaaf;hp=c0d625f1d725f2be2912118076b93af7cd0ebe58;hpb=56c07f5de3319eb61182b7100855801644538e6f;p=pnews.git

diff --git a/war/src/main/resources/feeds.json b/war/src/main/resources/feeds.json
index c0d625f..337e19a 100644
--- a/war/src/main/resources/feeds.json
+++ b/war/src/main/resources/feeds.json
@@ -1,7 +1,7 @@
 {
         "languages": [
-                        {"id": "fr"},
-                        {"id": "en"}
+                        {"id": "en"},
+                        {"id": "fr"}
         ],
         "categories": [
                 {
@@ -51,8 +51,18 @@
                         "language": "fr"
                 }, {
                         "id": "en_technologie",
-                        "label": "Technologie",
-                        "title": "Technologie",
+                        "label": "Technology",
+                        "title": "Technology",
+                        "language": "en"
+                }, {
+                        "id": "en_linux",
+                        "label": "Linux & OSS",
+                        "title": "Linux and OpenSource Software",
+                        "language": "en"
+                }, {
+                        "id": "en_space",
+                        "label": "Space",
+                        "title": "Space",
                         "language": "en"
                 }
         ],
@@ -85,7 +95,9 @@
                 "http://www.generation-nt.com/export/rss.xml": { "categories": ["technologie"] },
                 "http://www.europe1.fr/var/export/rss/europe1/sciences.xml": { "categories": ["technologie"] },
                 "http://www.europe1.fr/var/export/rss/europe1/technologies.xml": { "categories": ["technologie"]},
+                "http://www.esa.int/rssfeed/France": { "categories": ["technologie"]},
                 "http://feeds.feedburner.com/lesnumeriques/news": { "categories": ["technologie"] },
+                "https://www.nextinpact.com/rss/acces-libre.xml": { "categories": ["technologie"] },
                 "http://www.zdnet.fr/feeds/rss/actualites/": { "categories": ["technologie"] },
                 "http://www.frandroid.com/feed": { "categories": ["technologie"] },
                 "http://www.silicon.fr/feed": { "categories": ["technologie"] },
@@ -93,7 +105,7 @@
                 "http://www.futura-sciences.com/rss/actualites.xml": { "categories": ["technologie"] },
                 "https://www-03.ibm.com/press/fr/fr/rssfeed.wss?keyword=null&maxFeed=&feedType=RSS&topic=all": { "categories": ["technologie"] },
                 "https://korben.info/feed": { "categories": ["technologie"]},
-                "https://insights.ubuntu.com/feed/": { "categories": ["en_technologie"]},
+                "https://www.techhive.com/index.rss": { "categories": ["en_technologie"]},
                 "https://www-03.ibm.com/press/us/en/rssfeed.wss?keyword=null&maxFeed=&feedType=RSS&topic=all": { "categories": ["en_technologie"]},
                 "https://www.cnet.com/rss/news/": { "categories": ["en_technologie"]},
                 "https://www.pcworld.com/index.rss": { "categories": ["en_technologie"]},
@@ -101,8 +113,42 @@
                 "https://www.techworld.com/news/rss": { "categories": ["en_technologie"]},
                 "http://feeds.feedburner.com/TechCrunch/": { "categories": ["en_technologie"]},
                 "http://feeds.macrumors.com/MacRumors-All": { "categories": ["en_technologie"]},
-                "https://www.digitaltrends.com/rss-home/": { "categories": ["en_technologie"]},
+                "https://www.digitaltrends.com/computing/feed/": { "categories": ["en_technologie"]},
                 "http://www.zdnet.com/news/rss.xml": { "categories": ["en_technologie"]},
-                "https://www.androidheadlines.com/feed": { "categories": ["en_technologie"]}
+                "https://www.androidheadlines.com/feed": { "categories": ["en_technologie"]},
+                "http://www.computerweekly.com/rss/RSS-Feed.xml": { "categories": ["en_technologie"]},
+                "https://www.theverge.com/rss/index.xml": { "categories": ["en_technologie"]},
+                "https://www.engadget.com/rss.xml": { "categories": ["en_technologie"]},
+                "http://feeds.feedburner.com/TheBoyGeniusReport?format=xml": { "categories": ["en_technologie"]},
+                "https://www.popsci.com/rss-technology.xml?loc=contentwell&lnk=tech&dom=section-1": { "categories": ["en_technologie"]},
+                "https://gizmodo.com/rss": { "categories": ["en_technologie"]},
+                "http://feeds.feedburner.com/d0od?format=xml": { "categories": ["en_linux"]},
+                "https://www.debian.org/News/news": { "categories": ["en_linux"]},
+                "http://www.markshuttleworth.com/feed": { "categories": ["en_linux"]},
+                "https://insights.ubuntu.com/feed/": { "categories": ["en_linux"]},
+                "http://feeds.feedburner.com/LinuxJournal-BreakingNews?format=xml": { "categories": ["en_linux"]},
+                "https://www.gnome.org/feed/": { "categories": ["en_linux"]},
+                "http://linuxreviews.org/en.rss": { "categories": ["en_linux"]},
+                "http://www.linux-magazine.com/rss/feed/lmi_news": { "categories": ["en_linux"]},
+                "http://lxer.com/module/newswire/headlines.rss": { "categories": ["en_linux"]},
+                "https://opensource.com/feed": { "categories": ["en_linux"]},
+                "https://www.space.com/home/feed/site.xml": { "categories": ["en_space"]},
+                "https://www.nasa.gov/rss/dyn/breaking_news.rss": { "categories": ["en_space"]},
+                "http://www.esa.int/rssfeed/Our_Activities/Space_News": { "categories": ["en_space"]},
+                "https://phys.org/rss-feed/space-news/": { "categories": ["en_space"]},
+                "http://spacenews.com/feed/": { "categories": ["en_space"]},
+                "https://feeds.feedburner.com/ISF": { "categories": ["en_space"]}
+        },
+        "entities": {
+                "blacklist": [
+                        "CNET",
+                        "Read More",
+                        "Digital Trends",
+                        "Joey Sneddon",
+                        "CA"
+                ],
+                "aliases": {
+                        "U.S.": ["United States", "US"]
+                }
         }
 }