X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fresources%2Ffeeds.json;h=a06ae41b3d22ffa721f1a4b193e2faa904d82a81;hb=6d94fd5a39e6f78a68201230bd57b9ceb95e125d;hp=34631f277191fce5d6fecde59ab40674370c98f7;hpb=892111b2ecf385bd28bbe93ff6113cbc1e04409e;p=pnews.git

diff --git a/war/src/main/resources/feeds.json b/war/src/main/resources/feeds.json
index 34631f2..a06ae41 100644
--- a/war/src/main/resources/feeds.json
+++ b/war/src/main/resources/feeds.json
@@ -1,4 +1,8 @@
 {
+        "languages": [
+                        {"id": "en"},
+                        {"id": "fr"}
+        ],
         "categories": [
                 {
                         "id": "actualite",
@@ -45,8 +49,17 @@
                         "label": "People",
                         "title": "People",
                         "language": "fr"
+                }, {
+                        "id": "en_technologie",
+                        "label": "Technology",
+                        "title": "Technology",
+                        "language": "en"
+                }, {
+                        "id": "en_linux",
+                        "label": "Linux",
+                        "title": "Linux",
+                        "language": "en"
                 }
-
         ],
         "feeds": {
                 "http://www.europe1.fr/var/export/rss/europe1/actus.xml": { "categories": ["actualite"] },
@@ -73,16 +86,54 @@
                 "http://www.ville-palaiseau.fr/rss/actualites.htm": { "categories": ["essonne"] },
                 "http://www.premiere.fr/rss/actu-live": { "categories": ["people"] },
                 "http://www.purepeople.com/rss/news_t0.xml": { "categories": ["people"] },
+                "http://www.01net.com/rss/info/flux-rss/flux-toutes-les-actualites/": { "categories": ["technologie"] },
                 "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://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"] },
                 "http://www.fredzone.org/feed": { "categories": ["technologie"] },
                 "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://korben.info/feed": { "categories": ["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"]},
+                "https://www.technologyreview.com/c/computing/rss/": { "categories": ["en_technologie"]},
+                "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/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.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"]},
+                "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.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"]}
+        },
+        "entities": {
+                "blacklist": [
+                        "CNET",
+                        "Read More",
+                        "Digital Trends",
+                        "Joey Sneddon",
+                        "CA"
+                ]
         }
 }