X-Git-Url: https://git.wpitchoune.net/gitweb/?p=pnews.git;a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fresources%2Ffeeds.json;h=71730d6b49dd26f58839dfc41ae3696c6c2f7c87;hp=90df5cd3481e08331bddd3dfbcedd34f96045d9e;hb=HEAD;hpb=cdd191d522dce1245032f0d92b201c3e0d679610

diff --git a/war/src/main/resources/feeds.json b/war/src/main/resources/feeds.json
index 90df5cd..71730d6 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": [
                 {
@@ -54,6 +54,16 @@
                         "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"
                 }
         ],
         "feeds": {
@@ -85,8 +95,11 @@
                 "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.tomshardware.fr/feeds/rss2/all.xml": { "categories": ["technologie"] },
                 "http://www.frandroid.com/feed": { "categories": ["technologie"] },
                 "http://www.silicon.fr/feed": { "categories": ["technologie"] },
                 "http://www.fredzone.org/feed": { "categories": ["technologie"] },
@@ -94,9 +107,6 @@
                 "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://www.techhive.com/index.rss": { "categories": ["en_technologie"]},
-                "https://www.gnome.org/feed/": { "categories": ["en_technologie"]},
-                "http://www.markshuttleworth.com/feed": { "categories": ["en_technologie"]},
-                "https://insights.ubuntu.com/feed/": { "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"]},
@@ -107,14 +117,51 @@
                 "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.nasa.gov/rss/dyn/breaking_news.rss": { "categories": ["en_technologie"]},
                 "http://www.computerweekly.com/rss/RSS-Feed.xml": { "categories": ["en_technologie"]},
-                "https://www.debian.org/News/news": { "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"]},
+                "http://www.tomshardware.com/feeds/rss2/all.xml": { "categories": ["en_technologie"]},
+                "https://lifehacker.com/rss": { "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"]},
-                "https://www.space.com/home/feed/site.xml": { "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.ossblog.org/feed/": { "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.infoworld.com/category/linux/index.rss": { "categories": ["en_linux"]},
+                "https://www.infoworld.com/category/open-source-tools/index.rss": { "categories": ["en_linux"]},
+                "https://www.techrepublic.com/rssfeeds/topic/open-source/": { "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",
+                        "Read",
+                        "5 :",
+                        "InfoWorld",
+                        "Here"
+                ],
+                "aliases": {
+                        "U.S.": ["United States", "US"],
+                        "U.K.": ["UK", "United Kingdom"],
+                        "AWS": ["Amazon Web Services"]
+                }
         }
 }