diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
index b458409..683f4b8 100644
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -1,8 +1,7 @@
-
-
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8686324..1468eef 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,33 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -71,20 +89,53 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -106,29 +157,11 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -136,17 +169,26 @@
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -154,17 +196,26 @@
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -172,28 +223,24 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
@@ -228,11 +275,22 @@
jobisjob
http://52.211.105.9:6566/
http://52.211.105.9:6566
+ ap.o
+ mark
+ chrisguillebeau
+ trun
+ gur
+ http%3A%2F%2Fwww.technojobs
+ "feed_url": "
+ daimanuel
http://stone-dev2.eu-west-1.elasticbeanstalk.com/
http://45.33.114.116:8080
+ http
+ https%3A%2F%2Fwww.technojobs
+ "feed_url": "http://45.33.114.116:8080/
C:\dev\md\Rinser
@@ -245,18 +303,10 @@
@@ -313,15 +371,44 @@
$PROJECT_DIR$/gulpfile.js
+
+
+ scripts
+
+
+ vendor
+
+
+ remote
+
+
+ styles
+
+
+ partials
+
+
+ index
+
+
+ clean
+
+
+
+
+
+ default
+
+
DEFINITION_ORDER
-
+
-
-
+
+
@@ -337,6 +424,22 @@
-
@@ -588,9 +695,7 @@
-
-
-
+
1471450226774
@@ -939,24 +1044,23 @@
-
+
-
+
-
-
+
+
-
-
-
+
+
+
-
@@ -972,25 +1076,25 @@
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -1080,7 +1184,27 @@
-
+
+
+ file://$PROJECT_DIR$/news.js
+ 25
+
+
+
+
+ file://$PROJECT_DIR$/news.js
+ 17
+
+
+
+
+ file://$PROJECT_DIR$/gather.js
+ 49
+
+
+
+
+
@@ -1091,99 +1215,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1215,7 +1246,13 @@
-
+
+
+
+
+
+
+
@@ -1226,10 +1263,26 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1237,7 +1290,13 @@
-
+
+
+
+
+
+
+
@@ -1252,6 +1311,9 @@
+
+
+
@@ -1259,8 +1321,19 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1279,22 +1352,14 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1303,52 +1368,144 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/feeds/fit.json b/feeds/fit.json
new file mode 100644
index 0000000..58219e4
--- /dev/null
+++ b/feeds/fit.json
@@ -0,0 +1,61 @@
+{
+ "feed_name": "feed",
+ "default_count": 1,
+ "no_cdata_fields": [
+ "description"
+ ],
+ "meta": {
+ "title": "Fitness",
+ "description": "Combined Fitness Feed",
+ "site_url": "http://pipes.silvrtree.co.uk/fit.xml"
+ },
+ "plugins": [
+ "filter_last_week",
+ "fix_images",
+ "fix_scripts"
+ ],
+ "custom_namespaces": {
+ "content": "http://purl.org/rss/1.0/modules/content/",
+ "slash": "http://purl.org/rss/1.0/modules/slash/",
+ "media": "http://search.yahoo.com/mrss/",
+ "ev": "http://purl.org/rss/2.0/modules/event/",
+ "sy": "http://purl.org/rss/1.0/modules/syndication/",
+ "wfw": "http://wellformedweb.org/CommentAPI/",
+ "dc": "http://purl.org/dc/elements/1.1/",
+ "atom": "http://www.w3.org/2005/Atom"
+ },
+ "sources": [
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.mensfitness.co.uk%2Ffeeds%2Fall"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.coachmag.co.uk%2Ffeeds%2Fall"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fmuscleandbrawn.com%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fashotofadrenaline.net%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.simplyshredded.com%2Ffeed"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.bornfitness.com%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Frosstraining.com%2Fblog%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fdaily.barbellshrugged.com%2Ffeed%2F"
+ }
+ ]
+}
diff --git a/feeds/jobs-local.json b/feeds/jobs-local.json
new file mode 100644
index 0000000..583c1a8
--- /dev/null
+++ b/feeds/jobs-local.json
@@ -0,0 +1,142 @@
+{
+ "feed_name": "feed",
+ "default_count": 1,
+ "no_cdata_fields": [],
+ "plugins": [
+ "filter_today_only"
+ ],
+ "meta": {
+ "title": "Jobs",
+ "description": "Combined Jobs Feed",
+ "site_url": "http://pipes.silvrtree.co.uk/jobs-local.xml"
+ },
+ "sources": [
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobserve.com%2FMySearch%2FBAEBF3BDF82B8FEF.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D47820652"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobserve.com%2FMySearch%2F6DA9769BA89834AA.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.JobServe.com%2FMySearch%2FEDF47BEA6B31EF.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.JobServe.com%2FMySearch%2F3CAD044BEF2BFA.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.JobServe.com%2FMySearch%2FC7B25D86D0844A.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.JobServe.com%2FMySearch%2F64A3EEF615FA4C.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D21564698"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D21564712"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D21942123"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D33166238"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D34888173"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Fm7dp711z2r.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Fpfvf7o7z2r.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Flluqnt8z2r.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Ftu33qt8z2r.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Fu3btnz8z2r.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.purelyit.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D33256062"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.purelyit.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D33450169"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.purelyit.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D34517029"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.purelyit.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D34888105"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.technojobs.co.uk%2Frss.php%2Fglasgow%2Fsearchtypeand%2FlocationScotland%2Fsortbyrelevant%2Fjobtypeall"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobserve.com%2FMySearch%2F6FC7E9ED5F042ECB.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26skill_atleast%3Dhtml%2520%2C%2520asp%2520%2C%2520web%2520%2C%2520sql%2520%2C%2520delphi%2520%2C%2520vb%2520%2C%2520vbscript%2520%2C%2520php%2520%2C%2520ajax%2520%2C%2520mysql%2520%2C%2520sqlserver%2520%2C%2520javascript%2520%2C%2520intranet%2520%2C%2520vmware%2520%2C%2520virtulization%26location_include%3DLondon%26location_within%3D10%26reqd_salary%3DANY%7C%26daysback%3D7%26scc%3DUK%26compare_resolved%3DCO_LONDON%26compare_search%3DLondon%26search_emp_mkt_cd%3DALL"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26skill_atleast%3Dhtml%2520%2C%2520asp%2520%2C%2520web%2520%2C%2520sql%2520%2C%2520delphi%2520%2C%2520vb%2520%2C%2520vbscript%2520%2C%2520php%2520%2C%2520ajax%2520%2C%2520mysql%2520%2C%2520sqlserver%2520%2C%2520javascript%2520%2C%2520intranet%2520%2C%2520vmware%2520%2C%2520virtulization%26location_include%3DGlasgow%26location_within%3D10%26reqd_salary%3DANY%7C%26daysback%3D7%26scc%3DUK%26compare_resolved%3DTO_G1_GLASGOW%26compare_search%3DGlasgow%26search_emp_mkt_cd%3DALL"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26skill_atleast%3Dhtml%2520%2C%2520asp%2520%2C%2520web%2520%2C%2520sql%2520%2C%2520delphi%2520%2C%2520vb%2520%2C%2520vbscript%2520%2C%2520php%2520%2C%2520ajax%2520%2C%2520mysql%2520%2C%2520sqlserver%2520%2C%2520javascript%2520%2C%2520intranet%2520%2C%2520vmware%2520%2C%2520virtulization%26location_within%3D10%26reqd_salary%3DANY%7C%26daysback%3D7%26scc%3DUK%26search_emp_mkt_cd%3DALL"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26skill_atleast%3Dhtml%2520%2C%2520asp%2520%2C%2520web%2520%2C%2520sql%2520%2C%2520delphi%2520%2C%2520vb%2520%2C%2520vbscript%2520%2C%2520php%2520%2C%2520ajax%2520%2C%2520mysql%2520%2C%2520sqlserver%2520%2C%2520javascript%2520%2C%2520intranet%2520%2C%2520vmware%2520%2C%2520virtulization%26location_include%3DGermany%26location_within%3D10%26reqd_salary%3DANY%7C%26daysback%3D7%26scc%3DUK%26compare_resolved%3DCY_GERMANY%26compare_search%3DGermany%26search_emp_mkt_cd%3DALL"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Fb1d7e6c3a9a11964z3r.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobserve.com%2FMySearch%2FCA49421A86CA3F74.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Fddeded091b6f6d33z3r.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2F3eafc1ea20f1ca02z3r.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26skill_atleast%3Dhtml%2C%2520asp%2C%2520web%2C%2520sql%2C%2520delphi%2C%2520vb%2C%2520vbscript%2C%2520php%2C%2520ajax%2C%2520mysql%2C%2520sqlserver%2C%2520javascript%2C%2520intranet%2C%2520vmware%2C%2520virtulization%26location_include%3DAbu%2520Dhabi%26compare_resolved%3DRE_ABUDHABI_UNITEDARABEMIRATES%26compare_search%3DAbu%2520Dhabi%26jobtype%3DX%26search_emp_mkt_cd%3DALL"
+ }]
+}
diff --git a/feeds/jobs-special.json b/feeds/jobs-special.json
new file mode 100644
index 0000000..aa4e71c
--- /dev/null
+++ b/feeds/jobs-special.json
@@ -0,0 +1,142 @@
+{
+ "feed_name": "feed",
+ "default_count": 1,
+ "no_cdata_fields": [],
+ "plugins": [
+ "filter_location",
+ "filter_reject",
+ "filter_md_jobs",
+ "filter_today_only"
+ ],
+ "meta": {
+ "title": "Jobs",
+ "description": "Combined Jobs Feed",
+ "site_url": "http://pipes.silvrtree.co.uk/jobs-special.xml"
+ },
+ "sources": [
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D47820652"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/https%3A%2F%2Fwww.jobserve.com%2FMySearch%2F6DA9769BA89834AA.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/https%3A%2F%2Fwww.jobserve.com%2FMySearch%2FEDF47BEA6B31EF.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/https%3A%2F%2Fwww.jobserve.com%2FMySearch%2F3CAD044BEF2BFA.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/https%3A%2F%2Fwww.jobserve.com%2FMySearch%2FC7B25D86D0844A.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/https%3A%2F%2Fwww.jobserve.com%2FMySearch%2F64A3EEF615FA4C.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D21564698"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D21564712"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D21942123"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D33166238"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D34888173"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Fm7dp711z2r.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Fpfvf7o7z2r.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Flluqnt8z2r.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Ftu33qt8z2r.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Fu3btnz8z2r.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.purelyit.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D33256062"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.purelyit.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D33450169"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.purelyit.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D34517029"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.purelyit.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D34888105"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/https%3A%2F%2Fwww.technojobs.co.uk%2Frss.php%2Fglasgow%2Fsearchtypeand%2FlocationScotland%2Fsortbyrelevant%2Fjobtypeall"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/https%3A%2F%2Fwww.jobserve.com%2FMySearch%2F6FC7E9ED5F042ECB.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26skill_atleast%3Dhtml%2C%2520asp%2C%2520web%2C%2520sql%2C%2520delphi%2C%2520vb%2C%2520vbscript%2C%2520php%2C%2520ajax%2C%2520mysql%2C%2520sqlserver%2C%2520javascript%2C%2520intranet%2C%2520vmware%2C%2520virtulization%26location_include%3DAbu%2520Dhabi%26compare_resolved%3DRE_ABUDHABI_UNITEDARABEMIRATES%26compare_search%3DAbu%2520Dhabi%26jobtype%3DX%26search_emp_mkt_cd%3DALL"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26skill_atleast%3Dhtml%2520%2C%2520asp%2520%2C%2520web%2520%2C%2520sql%2520%2C%2520delphi%2520%2C%2520vb%2520%2C%2520vbscript%2520%2C%2520php%2520%2C%2520ajax%2520%2C%2520mysql%2520%2C%2520sqlserver%2520%2C%2520javascript%2520%2C%2520intranet%2520%2C%2520vmware%2520%2C%2520virtulization%26location_include%3DLondon%26location_within%3D10%26reqd_salary%3DANY%7C%26daysback%3D7%26scc%3DUK%26compare_resolved%3DCO_LONDON%26compare_search%3DLondon%26search_emp_mkt_cd%3DALL"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26skill_atleast%3Dhtml%2520%2C%2520asp%2520%2C%2520web%2520%2C%2520sql%2520%2C%2520delphi%2520%2C%2520vb%2520%2C%2520vbscript%2520%2C%2520php%2520%2C%2520ajax%2520%2C%2520mysql%2520%2C%2520sqlserver%2520%2C%2520javascript%2520%2C%2520intranet%2520%2C%2520vmware%2520%2C%2520virtulization%26location_include%3DGlasgow%26location_within%3D10%26reqd_salary%3DANY%7C%26daysback%3D7%26scc%3DUK%26compare_resolved%3DTO_G1_GLASGOW%26compare_search%3DGlasgow%26search_emp_mkt_cd%3DALL"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26skill_atleast%3Dhtml%2520%2C%2520asp%2520%2C%2520web%2520%2C%2520sql%2520%2C%2520delphi%2520%2C%2520vb%2520%2C%2520vbscript%2520%2C%2520php%2520%2C%2520ajax%2520%2C%2520mysql%2520%2C%2520sqlserver%2520%2C%2520javascript%2520%2C%2520intranet%2520%2C%2520vmware%2520%2C%2520virtulization%26location_within%3D10%26reqd_salary%3DANY%7C%26daysback%3D7%26scc%3DUK%26search_emp_mkt_cd%3DALL"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26skill_atleast%3Dhtml%2520%2C%2520asp%2520%2C%2520web%2520%2C%2520sql%2520%2C%2520delphi%2520%2C%2520vb%2520%2C%2520vbscript%2520%2C%2520php%2520%2C%2520ajax%2520%2C%2520mysql%2520%2C%2520sqlserver%2520%2C%2520javascript%2520%2C%2520intranet%2520%2C%2520vmware%2520%2C%2520virtulization%26location_include%3DGermany%26location_within%3D10%26reqd_salary%3DANY%7C%26daysback%3D7%26scc%3DUK%26compare_resolved%3DCY_GERMANY%26compare_search%3DGermany%26search_emp_mkt_cd%3DALL"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Fb1d7e6c3a9a11964z3r.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/https%3A%2F%2Fwww.jobserve.com%2FMySearch%2FCA49421A86CA3F74.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Fddeded091b6f6d33z3r.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2F3eafc1ea20f1ca02z3r.xml"
+ }
+ ]
+}
diff --git a/feeds/lifestyle.json b/feeds/lifestyle.json
new file mode 100644
index 0000000..511d36a
--- /dev/null
+++ b/feeds/lifestyle.json
@@ -0,0 +1,182 @@
+{
+ "feed_name": "feed",
+ "default_count": 1,
+ "no_cdata_fields": [],
+ "meta": {
+ "title": "Lifestyle",
+ "description": "Combined Lifestyle Feed",
+ "site_url": "http://pipes.silvrtree.co.uk/lifestyle.xml"
+ },
+ "plugins": [
+ "filter_last_week",
+ "fix_images",
+ "fix_scripts"
+ ],
+ "sources": [
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds2.feedburner.com%2Facquire"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.askmen.com%2Fstyle.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.askmen.com%2Ffine_living.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.askmen.com%2Fmoney.rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.dmarge.com%2Ffeed"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.esquire.com%2Frss%2Fall.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2Fgearpatrol"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2Fkinowear"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.mensfitness.co.uk%2Ffeeds%2Fall"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2FTheArtOfManliness"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2Facontinuouslean%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.fashionbeans.com%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2FMensFlair%3Fformat%3Dxml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2FTheChoosyBeggar"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.valetmag.com%2Fdistribution%2Frss_all.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fputthison.com%2Frss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fdieworkwear.com%2Frss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fmenofhabit.tumblr.com%2Frss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.hodinkee.com%2Fblog%2Frss.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2Ffirstinwatches"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds2.feedburner.com%2Fprimermagazine%2FotzU"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fchrisguillebeau.com%2F3x5%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2FTheAwesomer"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fbondclothes.blogspot.com%2Ffeeds%2Fposts%2Fdefault"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Faffordablebond007.tumblr.com%2Frss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fthecozyspace.tumblr.com%2Frss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.gentlemansgazette.com%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2Fwellspent"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fhespokestyle.com%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Feffortlessgent.com%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2Fthisfits"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fgeorgehahn.com%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.mensjournal.com%2Fservices%2Frss%2Fgear"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.mensjournal.com%2Fservices%2Frss%2Ffood-drink"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.mensjournal.com%2Fservices%2Frss%2Ftravel"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.mensjournal.com%2Fservices%2Frss%2Fadventure"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.mensjournal.com%2Fservices%2Frss%2Fhealth-fitness"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.mensjournal.com%2Fservices%2Frss%2Fstyle"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2Funcrate"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2FManOfMany"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2Fnymag%2Fvulture"
+ }, {
+ "count": 100, "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.mantelligence.com%2Ffeed%2F"
+ }]
+}
diff --git a/feeds/news.json b/feeds/news.json
index e4fa1fb..30e5b16 100644
--- a/feeds/news.json
+++ b/feeds/news.json
@@ -1,89 +1,113 @@
{
"feed_name": "feed",
"default_count": 1,
- "no_cdata_fields": [],
- // Don't wrap these fields in CDATA tags
+ "no_cdata_fields": [
+ "description"
+ ],
"meta": {
"title": "News",
"description": "Combined News Feed",
- 'site_url': 'http://pipes.silvrtree.co.uk/news.xml'
+ "site_url": "http://pipes.silvrtree.co.uk/news.xml"
},
"plugins": [
- 'filter_3_days',
- 'fix_images',
- 'fix_scripts'
+ "filter_3_days",
+ "fix_images",
+ "fix_scripts"
],
+ "custom_namespaces": {
+ "content": "http://purl.org/rss/1.0/modules/content/",
+ "slash": "http://purl.org/rss/1.0/modules/slash/",
+ "media": "http://search.yahoo.com/mrss/",
+ "ev": "http://purl.org/rss/2.0/modules/event/",
+ "sy": "http://purl.org/rss/1.0/modules/syndication/",
+ "wfw": "http://wellformedweb.org/CommentAPI/",
+ "dc": "http://purl.org/dc/elements/1.1/",
+ "atom": "http://www.w3.org/2005/Atom"
+ },
"sources": [
{
"count": 100,
- "feed_url": "http://qz.com/feed/"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fqz.com%2Ffeed%2F"
},
{
"count": 100,
- "feed_url": "http://feeds2.feedburner.com/businessinsider"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds2.feedburner.com%2Fbusinessinsider"
},
{
"count": 100,
- "feed_url": "http://mf.feeds.reuters.com/reuters/UKTopNews"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.reuters.com%2Freuters%2FUKTopNews"
},
{
"count": 100,
- "feed_url": "http://mf.feeds.reuters.com/reuters/UKdomesticNews"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.reuters.com%2Freuters%2FUKdomesticNews"
},
{
"count": 100,
- "feed_url": "http://hosted2.ap.org/atom/APDEFAULT/cae69a7523db45408eeb2b3a98c0c9c5"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.reuters.com%2Freuters%2FUKWorldNews"
},
{
"count": 100,
- "feed_url": "http://www.cityam.com/feeds/main.xml"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.reuters.com%2Freuters%2FtopNews"
},
{
"count": 100,
- "feed_url": "http://www.londonlovesbusiness.com/navrss?navsectioncode=121"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.reuters.com%2FReuters%2FworldNews"
},
{
"count": 100,
- "feed_url": "http://www.ibtimes.co.uk/rss/uk"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.cityam.com%2Ffeeds%2Fmain.xml"
},
{
"count": 100,
- "feed_url": "http://feeds.bbci.co.uk/news/rss.xml?edition=uk"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.londonlovesbusiness.com%2Fnavrss%3Fnavsectioncode%3D121"
},
{
"count": 100,
- "feed_url": "http://feeds.bbci.co.uk/news/scotland/rss.xml?edition=uk"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.ibtimes.co.uk%2Frss%2Fuk"
},
{
"count": 100,
- "feed_url": "http://news.google.com/?output=rss"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.bbci.co.uk%2Fnews%2Frss.xml%3Fedition%3Duk"
},
{
"count": 100,
- "feed_url": "http://feeds.feedburner.com/TheAtlantic"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.bbci.co.uk%2Fnews%2Fscotland%2Frss.xml%3Fedition%3Duk"
},
{
"count": 100,
- "feed_url": "http://www.telegraph.co.uk/newsfeed/rss/news-uk_news.xml"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fnews.google.com%2F%3Foutput%3Drss"
},
{
"count": 100,
- "feed_url": "http://www.telegraph.co.uk/news/worldnews/rss"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2FTheAtlantic"
},
{
"count": 100,
- "feed_url": "http://www.guardian.co.uk/rssfeed/0,,1,00.xml"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.telegraph.co.uk%2Fnews%2Frss.xml"
},
{
"count": 100,
- "feed_url": "http://www.marketwatch.com/rss/topstories"
+ "feed_url": "http://45.33.114.116:8080/https%3A%2F%2Fwww.theguardian.com%2Fuk%2Frss"
},
{
"count": 100,
- "feed_url": "http://feeds.feedburner.com/wingsoverscotland/FgKv"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.marketwatch.com%2Fmarketwatch%2Ftopstories%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2Fwingsoverscotland%2FFgKv"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fbellacaledonia.org.uk%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.theweek.co.uk%2Ffeeds%2Fall"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffivethirtyeight.com%2Fall%2Ffeed"
}
]
}
-
-
-
diff --git a/feeds/old.news.json b/feeds/old.news.json
new file mode 100644
index 0000000..7bb33ca
--- /dev/null
+++ b/feeds/old.news.json
@@ -0,0 +1,86 @@
+{
+ "feed_name": "feed",
+ "default_count": 1,
+ "no_cdata_fields": [],
+ // Don't wrap these fields in CDATA tags
+ "meta": {
+ "title": "News",
+ "description": "Combined News Feed",
+ 'site_url': 'http://pipes.silvrtree.co.uk/news.xml'
+ },
+ "plugins": [
+ 'filter_3_days',
+ 'fix_images',
+ 'fix_scripts'
+ ],
+ "sources": [
+ {
+ "count": 100,
+ "feed_url": "http://qz.com/feed/"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://feeds2.feedburner.com/businessinsider"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://mf.feeds.reuters.com/reuters/UKTopNews"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://mf.feeds.reuters.com/reuters/UKdomesticNews"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://hosted2.ap.org/atom/APDEFAULT/cae69a7523db45408eeb2b3a98c0c9c5"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://www.cityam.com/feeds/main.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://www.londonlovesbusiness.com/navrss?navsectioncode=121"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://www.ibtimes.co.uk/rss/uk"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://feeds.bbci.co.uk/news/rss.xml?edition=uk"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://feeds.bbci.co.uk/news/scotland/rss.xml?edition=uk"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://news.google.com/?output=rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://feeds.feedburner.com/TheAtlantic"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://www.telegraph.co.uk/newsfeed/rss/news-uk_news.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://www.telegraph.co.uk/news/worldnews/rss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://www.guardian.co.uk/rssfeed/0,,1,00.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://www.marketwatch.com/rss/topstories"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://feeds.feedburner.com/wingsoverscotland/FgKv"
+ }
+ ]
+}
diff --git a/feeds/paleo.json b/feeds/paleo.json
new file mode 100644
index 0000000..f225b2e
--- /dev/null
+++ b/feeds/paleo.json
@@ -0,0 +1,50 @@
+{
+ "outputFile": "paleo",
+ "feed_name": "feed",
+ "default_count": 1,
+ "no_cdata_fields": [],
+ "meta": {
+ "title": "Paleo",
+ "description": "Combined Paleo Feed",
+ "site_url": "http://pipes.silvrtree.co.uk/paleo.xml"
+ },
+ "plugins": [
+ "filter_3_days",
+ "fix_images",
+ "fix_scripts"
+ ],
+ "sources": [
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2FPaleoPlan"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fnomnompaleo.com%2Frss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fthepaleodiet.com%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fpaleoleap.com%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fultimatepaleoguide.com%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2FPaleomg-PaleoRecipes"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fcivilizedcavemancooking.com%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.ruled.me%2Ffeed%2F"
+ }
+ ]
+}
diff --git a/feeds/tech.json b/feeds/tech.json
new file mode 100644
index 0000000..315b2b6
--- /dev/null
+++ b/feeds/tech.json
@@ -0,0 +1,85 @@
+{
+ "feed_name": "feed",
+ "default_count": 1,
+ "no_cdata_fields": [],
+ "meta": {
+ "title": "Technology",
+ "description": "Combined Tech Feed",
+ "site_url": "http://pipes.silvrtree.co.uk/tech.xml"
+ },
+ "plugins": [
+ "filter_3_days",
+ "fix_images",
+ "fix_scripts"
+ ],
+ "sources": [
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2Flenovoblogs%2Fdesignmatters"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.engadget.com%2Frss.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.computerweekly.com%2Frss%2FAll-Computer-Weekly-content.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwinsupersite.com%2Frss.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/https%3A%2F%2Ffeeds.feedburner.com%2FTheGadgeteer"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.wired.com%2Fcategory%2Fgear%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/https%3A%2F%2Ffeeds2.feedburner.com%2FAndroidCommunity"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/https%3A%2F%2Ffeeds.feedburner.com%2FAndroidPolice"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.theverge.com%2Frss%2Ffrontpage"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeed.androidauthority.com%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/https%3A%2F%2Ffeeds.feedburner.com%2Fcodinghorror"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.androidcentral.com%2Ffeed"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.anandtech.com%2Frss%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/https%3A%2F%2Fmedium.com%2Ffeed%2Fgoogle-developers"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeedproxy.google.com%2Ftypepad%2Falleyinsider%2Fsilicon_alley_insider"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ftechcrunch.com%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds2.feedburner.com%2Fthenextweb"
+ }
+ ]
+}
diff --git a/gather.js b/gather.js
new file mode 100644
index 0000000..8dfd6c8
--- /dev/null
+++ b/gather.js
@@ -0,0 +1,123 @@
+const outputFile = 'news';
+const RssBraider = require('rss-braider');
+const fs = require('fs');
+const ejs = require(
+ 'ejs');
+const read = require('fs').readFileSync;
+const join = require('path').join;
+const cron = require('node-cron');
+
+const str = read(
+ join(__dirname, '/templates/rss.ejs'),
+ 'utf8');
+const feeds = {};
+
+const argv = require('yargs').argv;
+
+const log4js = require('log4js');
+const logger = log4js.getLogger();
+
+logger.level = 'trace';
+
+// Pull feeds from config files: ,
+// feeds.simple_test_feed = require("./config/feed").feed;
+// Or define in-line
+
+feeds.news = require('./feeds/news.json');
+feeds.jobsSpecial = require('./feeds/jobs-special.json');
+feeds.jobsLocal = require('./feeds/jobs-local.json');
+feeds.lifestyle = require('./feeds/lifestyle.json');
+feeds.paleo = require('./feeds/paleo.json');
+feeds.tech = require('./feeds/tech.json');
+feeds.fit = require('./feeds/fit.json');
+
+const braider_options = {
+ feeds: feeds,
+ indent: ' ',
+ date_sort_order: 'desc', // Newest first
+ log_level: 'warn',
+ dedupe_fields: ['link', 'guid'],
+ plugins_directories: [__dirname + '/plugins/']
+};
+const rss_braider = RssBraider.createClient(braider_options);
+
+// Override logging level (debug, info, warn, err, off)
+//rss_braider.logger.level('off');
+
+async function gather(feedName, fileName) {
+ logger.info(`Gathering ${feedName}...`);
+ rss_braider.processFeed(feedName, 'json', function (err, data) {
+ console.log('A');
+ if (err) {
+ logger.error(err);
+ return err;
+ }
+
+ console.log('B');
+
+ const j = JSON.parse(data);
+
+ console.log('C');
+ const ejsOutput = ejs.compile(str)(j);
+
+ console.log('D');
+ fs.writeFile(__dirname + '/dist/' + fileName + '.html',
+ ejsOutput,
+ function (err) {
+
+ if (err) {
+ logger.error(err);
+ return console.error(err);
+ }
+
+ console.log('The file was saved!');
+ });
+
+ fs.writeFile(__dirname + '/dist/' + fileName + '.json',
+ data,
+ function (err) {
+ if (err) {
+ logger.error(err);
+ return console.error(err);
+ }
+
+ console.log('The file was saved!');
+ });
+ });
+
+}
+
+async function gatherXML(feedName, fileName) {
+ rss_braider.processFeed(feedName, 'rss', function(err, data) {
+ if (err) {
+ return console.log(err);
+ }
+ console.log('Saving', __dirname + "/dist/" + fileName + ".xml");
+ fs.writeFile(__dirname + "/dist/" + fileName + ".xml", data, function(err) {
+ if (err) {
+ return console.log(err);
+ }
+
+ console.log("The file was saved!");
+ });
+ });
+}
+
+
+async function main() {
+ await gatherXML('jobsSpecial','jobs-special');
+ await gather('news', 'news');
+ await gather('lifestyle', 'lifestyle');
+
+ await gather('paleo', 'paleo');
+ await gather('tech', 'tech');
+ await gather('fit', 'fit');
+ await gatherXML('jobsLocal','jobs-local');
+}
+
+cron.schedule('0 * * * *', function () {
+ main();
+ // saveToDB(todayCache);
+ // Console.log('tick');
+ return -1;
+});
diff --git a/jobs-special.js b/jobs-special.js
index 0942d99..2bdc847 100644
--- a/jobs-special.js
+++ b/jobs-special.js
@@ -25,7 +25,7 @@ feeds.simple_test_feed = {
"title": "Jobs",
"description": "Combined Jobs Feed",
'site_url': 'http://pipes.silvrtree.co.uk/jobs-special.xml'
- }, "sources": sources
+ }, "sources": [{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D47820652"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.jobserve.com%2FMySearch%2F6DA9769BA89834AA.rss"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.JobServe.com%2FMySearch%2FEDF47BEA6B31EF.rss"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.JobServe.com%2FMySearch%2F3CAD044BEF2BFA.rss"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.JobServe.com%2FMySearch%2FC7B25D86D0844A.rss"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.JobServe.com%2FMySearch%2F64A3EEF615FA4C.rss"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D21564698"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D21564712"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D21942123"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D33166238"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D34888173"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Fm7dp711z2r.xml"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Fpfvf7o7z2r.xml"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Flluqnt8z2r.xml"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Ftu33qt8z2r.xml"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Fu3btnz8z2r.xml"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.purelyit.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D33256062"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.purelyit.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D33450169"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.purelyit.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D34517029"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.purelyit.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26daysback%3D1%26jbe_id%3D34888105"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.technojobs.co.uk%2Frss.php%2Fglasgow%2Fsearchtypeand%2FlocationScotland%2Fsortbyrelevant%2Fjobtypeall"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.jobserve.com%2FMySearch%2F6FC7E9ED5F042ECB.rss"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26skill_atleast%3Dhtml%2C%2520asp%2C%2520web%2C%2520sql%2C%2520delphi%2C%2520vb%2C%2520vbscript%2C%2520php%2C%2520ajax%2C%2520mysql%2C%2520sqlserver%2C%2520javascript%2C%2520intranet%2C%2520vmware%2C%2520virtulization%26location_include%3DAbu%2520Dhabi%26compare_resolved%3DRE_ABUDHABI_UNITEDARABEMIRATES%26compare_search%3DAbu%2520Dhabi%26jobtype%3DX%26search_emp_mkt_cd%3DALL"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26skill_atleast%3Dhtml%2520%2C%2520asp%2520%2C%2520web%2520%2C%2520sql%2520%2C%2520delphi%2520%2C%2520vb%2520%2C%2520vbscript%2520%2C%2520php%2520%2C%2520ajax%2520%2C%2520mysql%2520%2C%2520sqlserver%2520%2C%2520javascript%2520%2C%2520intranet%2520%2C%2520vmware%2520%2C%2520virtulization%26location_include%3DLondon%26location_within%3D10%26reqd_salary%3DANY%7C%26daysback%3D7%26scc%3DUK%26compare_resolved%3DCO_LONDON%26compare_search%3DLondon%26search_emp_mkt_cd%3DALL"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26skill_atleast%3Dhtml%2520%2C%2520asp%2520%2C%2520web%2520%2C%2520sql%2520%2C%2520delphi%2520%2C%2520vb%2520%2C%2520vbscript%2520%2C%2520php%2520%2C%2520ajax%2520%2C%2520mysql%2520%2C%2520sqlserver%2520%2C%2520javascript%2520%2C%2520intranet%2520%2C%2520vmware%2520%2C%2520virtulization%26location_include%3DGlasgow%26location_within%3D10%26reqd_salary%3DANY%7C%26daysback%3D7%26scc%3DUK%26compare_resolved%3DTO_G1_GLASGOW%26compare_search%3DGlasgow%26search_emp_mkt_cd%3DALL"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26skill_atleast%3Dhtml%2520%2C%2520asp%2520%2C%2520web%2520%2C%2520sql%2520%2C%2520delphi%2520%2C%2520vb%2520%2C%2520vbscript%2520%2C%2520php%2520%2C%2520ajax%2520%2C%2520mysql%2520%2C%2520sqlserver%2520%2C%2520javascript%2520%2C%2520intranet%2520%2C%2520vmware%2520%2C%2520virtulization%26location_within%3D10%26reqd_salary%3DANY%7C%26daysback%3D7%26scc%3DUK%26search_emp_mkt_cd%3DALL"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.jobsite.co.uk%2Fcgi-bin%2Fadvsearch%3Frss_feed%3D1%26skill_atleast%3Dhtml%2520%2C%2520asp%2520%2C%2520web%2520%2C%2520sql%2520%2C%2520delphi%2520%2C%2520vb%2520%2C%2520vbscript%2520%2C%2520php%2520%2C%2520ajax%2520%2C%2520mysql%2520%2C%2520sqlserver%2520%2C%2520javascript%2520%2C%2520intranet%2520%2C%2520vmware%2520%2C%2520virtulization%26location_include%3DGermany%26location_within%3D10%26reqd_salary%3DANY%7C%26daysback%3D7%26scc%3DUK%26compare_resolved%3DCY_GERMANY%26compare_search%3DGermany%26search_emp_mkt_cd%3DALL"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Fb1d7e6c3a9a11964z3r.xml"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.jobserve.com%2FMySearch%2FCA49421A86CA3F74.rss"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2Fddeded091b6f6d33z3r.xml"},{"count":100,"feed_url":"http://45.33.114.116:8080/http%3A%2F%2Fwww.s1jobs.com%2Fxml%2F3eafc1ea20f1ca02z3r.xml"}]
};
var braider_options = {
diff --git a/news.js b/news.js
index d0930ce..2b4f328 100644
--- a/news.js
+++ b/news.js
@@ -1,102 +1,32 @@
-var outputFile = 'news', RssBraider = require('rss-braider'), fs = require('fs'), ejs = require(
- 'ejs'), read = require('fs').readFileSync, join = require('path').join, str = read(
+const outputFile = 'news';
+const RssBraider = require('rss-braider');
+const fs = require('fs');
+const ejs = require(
+ 'ejs');
+const read = require('fs').readFileSync;
+const join = require('path').join;
+const str = read(
join(__dirname, '/templates/rss.ejs'),
- 'utf8'), feeds = {};
+ 'utf8');
+const feeds = {};
-var argv = require('yargs').argv;
+const argv = require('yargs').argv;
-var log4js = require('log4js');
-var logger = log4js.getLogger();
+const log4js = require('log4js');
+const logger = log4js.getLogger();
+
+logger.level = 'trace';
// Pull feeds from config files: ,
// feeds.simple_test_feed = require("./config/feed").feed;
// Or define in-line
-const f = ["http://qz.com/feed/",
- "http://feeds2.feedburner.com/businessinsider",
- "http://feeds.reuters.com/reuters/UKTopNews",
- "http://feeds.reuters.com/reuters/UKdomesticNews",
- "http://feeds.reuters.com/reuters/UKWorldNews",
- "http://feeds.reuters.com/reuters/topNews",
- "http://feeds.reuters.com/Reuters/worldNews",
- "http://hosted2.ap.org/atom/APDEFAULT/cae69a7523db45408eeb2b3a98c0c9c5",
- "http://www.cityam.com/feeds/main.xml",
- "http://www.londonlovesbusiness.com/navrss?navsectioncode=121",
- "http://www.ibtimes.co.uk/rss/uk",
- "http://feeds.bbci.co.uk/news/rss.xml?edition=uk",
- "http://feeds.bbci.co.uk/news/scotland/rss.xml?edition=uk",
- "http://news.google.com/?output=rss",
- "http://feeds.feedburner.com/TheAtlantic",
- "http://www.telegraph.co.uk/news/rss.xml",
- "http://www.guardian.co.uk/rssfeed/0,,1,00.xml",
- "http://feeds.marketwatch.com/marketwatch/topstories",
- "http://feeds.feedburner.com/wingsoverscotland/FgKv",
- "http://bellacaledonia.org.uk/feed/",
- "http://www.theweek.co.uk/feeds/all",
- "http://fivethirtyeight.com/all/feed"];
+feeds.news = require('./news.json');
+
+logger.debug('news:', feeds.news);
-
-feeds.simple_test_feed = {
- 'feed_name': 'feed',
- 'default_count': 1,
- 'no_cdata_fields': ['description'], // Don't wrap these fields in CDATA tags
- 'meta': {
- 'title': 'News',
- 'description': 'Combined News Feed',
- 'site_url': 'http://pipes.silvrtree.co.uk/news.xml'
- },
- 'plugins': [
- 'filter_3_days', 'fix_images', 'fix_scripts'
- ],
- 'custom_namespaces': {
- 'content': 'http://purl.org/rss/1.0/modules/content/',
- 'slash': 'http://purl.org/rss/1.0/modules/slash/',
- 'media': 'http://search.yahoo.com/mrss/',
- 'ev': 'http://purl.org/rss/2.0/modules/event/',
- 'sy': 'http://purl.org/rss/1.0/modules/syndication/',
- 'wfw': 'http://wellformedweb.org/CommentAPI/',
- 'dc': 'http://purl.org/dc/elements/1.1/',
- 'atom': 'http://www.w3.org/2005/Atom'
- },
- 'sources': [{'count': 100, 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Fqz.com%2Ffeed%2F'}, {
- 'count': 100,
- 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Ffeeds2.feedburner.com%2Fbusinessinsider'
- }, {'count': 100, 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Ffeeds.reuters.com%2Freuters%2FUKTopNews'}, {
- 'count': 100,
- 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Ffeeds.reuters.com%2Freuters%2FUKdomesticNews'
- }, {'count': 100, 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Ffeeds.reuters.com%2Freuters%2FUKWorldNews'}, {
- 'count': 100,
- 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Ffeeds.reuters.com%2Freuters%2FtopNews'
- }, {'count': 100, 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Ffeeds.reuters.com%2FReuters%2FworldNews'}, {
- 'count': 100,
- 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Fhosted2.ap.org%2Fatom%2FAPDEFAULT%2Fcae69a7523db45408eeb2b3a98c0c9c5'
- }, {'count': 100, 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Fwww.cityam.com%2Ffeeds%2Fmain.xml'}, {
- 'count': 100,
- 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Fwww.londonlovesbusiness.com%2Fnavrss%3Fnavsectioncode%3D121'
- }, {'count': 100, 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Fwww.ibtimes.co.uk%2Frss%2Fuk'}, {
- 'count': 100,
- 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Ffeeds.bbci.co.uk%2Fnews%2Frss.xml%3Fedition%3Duk'
- }, {
- 'count': 100,
- 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Ffeeds.bbci.co.uk%2Fnews%2Fscotland%2Frss.xml%3Fedition%3Duk'
- }, {'count': 100, 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Fnews.google.com%2F%3Foutput%3Drss'}, {
- 'count': 100,
- 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2FTheAtlantic'
- }, {'count': 100, 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Fwww.telegraph.co.uk%2Fnews%2Frss.xml'}, {
- 'count': 100,
- 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Fwww.guardian.co.uk%2Frssfeed%2F0%2C%2C1%2C00.xml'
- }, {'count': 100, 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Ffeeds.marketwatch.com%2Fmarketwatch%2Ftopstories%2F'}, {
- 'count': 100,
- 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2Fwingsoverscotland%2FFgKv'
- }, {'count': 100, 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Fbellacaledonia.org.uk%2Ffeed%2F'}, {
- 'count': 100,
- 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Fwww.theweek.co.uk%2Ffeeds%2Fall'
- }, {'count': 100, 'feed_url': 'http://45.33.114.116:8080/http%3A%2F%2Ffivethirtyeight.com%2Fall%2Ffeed'}]
-};
-
-
-var braider_options = {
+const braider_options = {
feeds: feeds,
indent: ' ',
date_sort_order: 'desc', // Newest first
@@ -104,46 +34,54 @@ var braider_options = {
dedupe_fields: ['link', 'guid'],
plugins_directories: [__dirname + '/plugins/']
};
-var rss_braider = RssBraider.createClient(braider_options);
+const rss_braider = RssBraider.createClient(braider_options);
// Override logging level (debug, info, warn, err, off)
//rss_braider.logger.level('off');
-rss_braider.processFeed('simple_test_feed', 'json', function (err, data) {
- console.log('A');
- if (err) {
- logger.error(err);
- return err;
- }
+function gatherNews() {
+ logger.info('Gathering news...');
+ rss_braider.processFeed('news', 'json', function (err, data) {
+ console.log('A');
+ if (err) {
+ logger.error(err);
+ return err;
+ }
- console.log('B');
+ console.log('B');
- var j = JSON.parse(data);
+ const j = JSON.parse(data);
- console.log('C');
- var ejsOutput = ejs.compile(str)(j);
+ console.log('C');
+ const ejsOutput = ejs.compile(str)(j);
- console.log('D');
- fs.writeFile(__dirname + '/dist/' + outputFile + '.html',
- ejsOutput,
- function (err) {
+ console.log('D');
+ fs.writeFile(__dirname + '/dist/' + outputFile + '.html',
+ ejsOutput,
+ function (err) {
- if (err) {
- logger.error(err);
- return console.error(err);
- }
+ if (err) {
+ logger.error(err);
+ return console.error(err);
+ }
- console.log('The file was saved!');
- });
+ console.log('The file was saved!');
+ });
- fs.writeFile(__dirname + '/dist/' + outputFile + '.json',
- data,
- function (err) {
- if (err) {
- logger.error(err);
- return console.error(err);
- }
+ fs.writeFile(__dirname + '/dist/' + outputFile + '.json',
+ data,
+ function (err) {
+ if (err) {
+ logger.error(err);
+ return console.error(err);
+ }
- console.log('The file was saved!');
- });
-});
+ console.log('The file was saved!');
+ });
+ });
+
+}
+
+
+
+gatherNews();
diff --git a/news.json b/news.json
index 2336252..d6d9c92 100644
--- a/news.json
+++ b/news.json
@@ -25,10 +25,89 @@
"atom": "http://www.w3.org/2005/Atom"
},
"sources": [
-
{
"count": 100,
- "feed_url": "http://feeds.bbci.co.uk/news/rss.xml?edition=uk"
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fqz.com%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds2.feedburner.com%2Fbusinessinsider"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.reuters.com%2Freuters%2FUKTopNews"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.reuters.com%2Freuters%2FUKdomesticNews"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.reuters.com%2Freuters%2FUKWorldNews"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.reuters.com%2Freuters%2FtopNews"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.reuters.com%2FReuters%2FworldNews"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.cityam.com%2Ffeeds%2Fmain.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.londonlovesbusiness.com%2Fnavrss%3Fnavsectioncode%3D121"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.ibtimes.co.uk%2Frss%2Fuk"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.bbci.co.uk%2Fnews%2Frss.xml%3Fedition%3Duk"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.bbci.co.uk%2Fnews%2Fscotland%2Frss.xml%3Fedition%3Duk"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fnews.google.com%2F%3Foutput%3Drss"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2FTheAtlantic"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.telegraph.co.uk%2Fnews%2Frss.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.guardian.co.uk%2Frssfeed%2F0%2C%2C1%2C00.xml"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.marketwatch.com%2Fmarketwatch%2Ftopstories%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffeeds.feedburner.com%2Fwingsoverscotland%2FFgKv"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fbellacaledonia.org.uk%2Ffeed%2F"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Fwww.theweek.co.uk%2Ffeeds%2Fall"
+ },
+ {
+ "count": 100,
+ "feed_url": "http://45.33.114.116:8080/http%3A%2F%2Ffivethirtyeight.com%2Fall%2Ffeed"
}
]
}
diff --git a/node_modules/ejs/package.json b/node_modules/ejs/package.json
index bb19e7c..c414f3b 100644
--- a/node_modules/ejs/package.json
+++ b/node_modules/ejs/package.json
@@ -1,27 +1,28 @@
{
- "_from": "ejs@*",
+ "_from": "ejs@2.6.1",
"_id": "ejs@2.6.1",
"_inBundle": false,
"_integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==",
"_location": "/ejs",
"_phantomChildren": {},
"_requested": {
- "type": "range",
+ "type": "version",
"registry": true,
- "raw": "ejs@*",
+ "raw": "ejs@2.6.1",
"name": "ejs",
"escapedName": "ejs",
- "rawSpec": "*",
+ "rawSpec": "2.6.1",
"saveSpec": null,
- "fetchSpec": "*"
+ "fetchSpec": "2.6.1"
},
"_requiredBy": [
+ "#USER",
"/"
],
"_resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz",
"_shasum": "498ec0d495655abc6f23cd61868d926464071aa0",
- "_spec": "ejs@*",
- "_where": "/Users/martin/dev/test/Rinser",
+ "_spec": "ejs@2.6.1",
+ "_where": "/Users/martin/dev/Rinser",
"author": {
"name": "Matthew Eernisse",
"email": "mde@fleegix.org",
diff --git a/node_modules/express/package.json b/node_modules/express/package.json
index f3f9128..6a74b18 100644
--- a/node_modules/express/package.json
+++ b/node_modules/express/package.json
@@ -1,37 +1,36 @@
{
- "_from": "express@^4.15.3",
+ "_from": "express@4.16.3",
"_id": "express@4.16.3",
"_inBundle": false,
"_integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
"_location": "/express",
"_phantomChildren": {
- "bytes": "3.0.0",
- "content-type": "1.0.4",
- "debug": "2.6.9",
- "depd": "1.1.2",
"http-errors": "1.6.3",
"inherits": "2.0.3",
+ "media-typer": "0.3.0",
+ "ms": "2.0.0",
+ "negotiator": "0.6.1",
"on-finished": "2.3.0",
- "type-is": "1.6.16",
"unpipe": "1.0.0"
},
"_requested": {
- "type": "range",
+ "type": "version",
"registry": true,
- "raw": "express@^4.15.3",
+ "raw": "express@4.16.3",
"name": "express",
"escapedName": "express",
- "rawSpec": "^4.15.3",
+ "rawSpec": "4.16.3",
"saveSpec": null,
- "fetchSpec": "^4.15.3"
+ "fetchSpec": "4.16.3"
},
"_requiredBy": [
+ "#USER",
"/"
],
"_resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz",
"_shasum": "6af8a502350db3246ecc4becf6b5a34d22f7ed53",
- "_spec": "express@^4.15.3",
- "_where": "/Users/martin/dev/test/Rinser",
+ "_spec": "express@4.16.3",
+ "_where": "/Users/martin/dev/Rinser",
"author": {
"name": "TJ Holowaychuk",
"email": "tj@vision-media.ca"
diff --git a/node_modules/lodash/package.json b/node_modules/lodash/package.json
index 5b8eed0..5c39f3e 100644
--- a/node_modules/lodash/package.json
+++ b/node_modules/lodash/package.json
@@ -1,23 +1,23 @@
{
- "_from": "lodash@^4.16.6",
+ "_from": "lodash@4.17.10",
"_id": "lodash@4.17.10",
"_inBundle": false,
"_integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
"_location": "/lodash",
"_phantomChildren": {},
"_requested": {
- "type": "range",
+ "type": "version",
"registry": true,
- "raw": "lodash@^4.16.6",
+ "raw": "lodash@4.17.10",
"name": "lodash",
"escapedName": "lodash",
- "rawSpec": "^4.16.6",
+ "rawSpec": "4.17.10",
"saveSpec": null,
- "fetchSpec": "^4.16.6"
+ "fetchSpec": "4.17.10"
},
"_requiredBy": [
+ "#USER",
"/",
- "/async",
"/babel-traverse",
"/babel-types",
"/eslint",
@@ -26,14 +26,14 @@
"/gulp-uglify",
"/hipchat-notifier",
"/inquirer",
+ "/mailgun-js/async",
"/requestretry",
- "/rss-braider",
"/table"
],
"_resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
"_shasum": "1b7793cf7259ea38fb3661d4d38b3260af8ae4e7",
- "_spec": "lodash@^4.16.6",
- "_where": "/Users/martin/dev/test/Rinser",
+ "_spec": "lodash@4.17.10",
+ "_where": "/Users/martin/dev/Rinser",
"author": {
"name": "John-David Dalton",
"email": "john.david.dalton@gmail.com",
diff --git a/node_modules/rss-braider/README.md b/node_modules/rss-braider/README.md
index cd6ad8e..a06497e 100644
--- a/node_modules/rss-braider/README.md
+++ b/node_modules/rss-braider/README.md
@@ -1,5 +1,5 @@
-[](https://travis-ci.org/KQED/rss-braider)
-[](https://david-dm.org/KQED/rss-braider)
+[](https://travis-ci.org/rv-kip/rss-braider)
+[](https://david-dm.org/rv-kip/rss-braider)
## Summary
Braid/aggregate one or more RSS feeds (file or url) into a single feed (RSS or JSON output). Process resulting feed through specified plugins. Automatic deduplication
diff --git a/node_modules/rss-braider/examples/simple.js b/node_modules/rss-braider/examples/simple.js
index 253dd7f..87a5a86 100644
--- a/node_modules/rss-braider/examples/simple.js
+++ b/node_modules/rss-braider/examples/simple.js
@@ -14,15 +14,15 @@ feeds.simple_test_feed = {
},
"sources" : [
{
- "name" : "Jobsite",
+ "name" : "NPR Headlines",
"count" : 2,
- "feed_url" : "http://www.jobsite.co.uk/cgi-bin/advsearch?rss_feed=1&daysback=1&jbe_id=47820652",
+ "feed_url" : "http://www.npr.org/rss/rss.php?id=1001",
},
{
-
- "count": 100,
- "feed_url": "http://www.jobserve.com/MySearch/6DA9769BA89834AA.rss"
- }
+ "name" : "NPR Sports",
+ "count" : 2,
+ "feed_url" : "http://www.npr.org/rss/rss.php?id=1055"
+ }
]
};
var braider_options = {
diff --git a/node_modules/rss-braider/lib/RssBraider.js b/node_modules/rss-braider/lib/RssBraider.js
index f904036..cd48ca1 100644
--- a/node_modules/rss-braider/lib/RssBraider.js
+++ b/node_modules/rss-braider/lib/RssBraider.js
@@ -77,28 +77,20 @@ RssBraider.prototype.processFeed = function(feed_name, format, callback)
// Process each feed source through Feedparser to get articles.
// Then process each item/article through rss-braider and any plugins
async.each(feed.sources, function(source, callback) {
- self.logger.debug('url:', source.feed_url);
var count = source.count || feed.default_count || 10, // Number of articles per source
url = source.feed_url || null,
file_path = source.file_path || null,
source_articles = [];
var feedparser = new FeedParser();
- var newReq = { method: 'GET'
- , uri: url
- , gzip: true,
- timeout: 5000
- };
-
if (url) {
- var req = request(newReq);
+ var req = request(url);
req.on('error', function (error) {
- self.logger.warn(error);
+ self.logger.error(error);
});
req.on('response', function (res) {
- self.logger.debug('>> res.statusCode ', res.statusCode );
var stream = this;
if (res.statusCode !== 200) {
return this.emit('error', 'Bad status code: ' + res.statusCode);
diff --git a/node_modules/rss-braider/package.json b/node_modules/rss-braider/package.json
index e61d563..60408c0 100644
--- a/node_modules/rss-braider/package.json
+++ b/node_modules/rss-braider/package.json
@@ -1,42 +1,66 @@
{
- "_from": "git+https://gitlab.silvrtree.co.uk/martind2000/rss-braider.git",
+ "_from": "rss-braider",
"_id": "rss-braider@1.2.2",
"_inBundle": false,
- "_integrity": "",
+ "_integrity": "sha1-rIJLuvAKL2DKyyey+E7eV7CvrZQ=",
"_location": "/rss-braider",
- "_phantomChildren": {},
+ "_phantomChildren": {
+ "asynckit": "0.4.0",
+ "aws-sign2": "0.6.0",
+ "aws4": "1.6.0",
+ "caseless": "0.12.0",
+ "co": "4.6.0",
+ "combined-stream": "1.0.5",
+ "extend": "3.0.1",
+ "forever-agent": "0.6.1",
+ "hawk": "3.1.3",
+ "http-signature": "1.1.1",
+ "is-typedarray": "1.0.0",
+ "isstream": "0.1.2",
+ "json-stable-stringify": "1.0.1",
+ "json-stringify-safe": "5.0.1",
+ "mime-types": "2.1.15",
+ "oauth-sign": "0.8.2",
+ "safe-buffer": "5.1.1",
+ "stringstream": "0.0.6",
+ "tough-cookie": "2.3.4",
+ "tunnel-agent": "0.6.0",
+ "uuid": "3.2.1"
+ },
"_requested": {
- "type": "git",
- "raw": "rss-braider@git+https://gitlab.silvrtree.co.uk/martind2000/rss-braider.git",
+ "type": "tag",
+ "registry": true,
+ "raw": "rss-braider",
"name": "rss-braider",
"escapedName": "rss-braider",
- "rawSpec": "git+https://gitlab.silvrtree.co.uk/martind2000/rss-braider.git",
- "saveSpec": "git+https://gitlab.silvrtree.co.uk/martind2000/rss-braider.git",
- "fetchSpec": "https://gitlab.silvrtree.co.uk/martind2000/rss-braider.git",
- "gitCommittish": null
+ "rawSpec": "",
+ "saveSpec": null,
+ "fetchSpec": "latest"
},
"_requiredBy": [
+ "#USER",
"/"
],
- "_resolved": "git+https://gitlab.silvrtree.co.uk/martind2000/rss-braider.git#607d5aa96e76887c909f090957bc13afc69d859b",
- "_spec": "rss-braider@git+https://gitlab.silvrtree.co.uk/martind2000/rss-braider.git",
- "_where": "/Users/martin/dev/test/Rinser",
+ "_resolved": "https://registry.npmjs.org/rss-braider/-/rss-braider-1.2.2.tgz",
+ "_shasum": "ac824bbaf00a2f60cacb27b2f84ede57b0afad94",
+ "_spec": "rss-braider",
+ "_where": "/Users/martin/dev/Rinser",
"author": {
"name": "Kip Gebhardt",
- "email": "kgebhardt@kqed.org"
+ "email": "kgebhardt23@gmail.com"
},
"bugs": {
- "url": "http://github.com/KQED/rss-braider/issues",
- "email": "kgebhardt@kqed.org"
+ "url": "http://github.com/rv-kip/rss-braider/issues",
+ "email": "kgebhardt23@gmail.com"
},
"bundleDependencies": false,
"dependencies": {
- "async": "^2.1.5",
- "bunyan": "^1.4.0",
- "feedparser": "^2.1.0",
+ "async": "^2.6.0",
+ "bunyan": "^2.0.2",
+ "feedparser": "^2.2.4",
"include-folder": "^1.0.0",
"lodash": "^4.17.4",
- "request": "^2.57.0",
+ "request": "2.81.0",
"rss": "^1.2.2"
},
"deprecated": false,
@@ -45,6 +69,7 @@
"mockdate": "^2.0.1",
"tape": "^4.0.0"
},
+ "homepage": "https://github.com/rv-kip/rss-braider#readme",
"keywords": [
"rss",
"braider",
@@ -68,7 +93,7 @@
"name": "rss-braider",
"repository": {
"type": "git",
- "url": "https://gitlab.silvrtree.co.uk/martind2000/rss-braider.git"
+ "url": "git+https://github.com/rv-kip/rss-braider.git"
},
"scripts": {
"test": "tape test"
diff --git a/package.json b/package.json
index 8d3c9a1..cf9ae2b 100644
--- a/package.json
+++ b/package.json
@@ -5,42 +5,43 @@
"babel-eslint": "^8.2.3",
"cheerio": "^0.22.0",
"del": "^3.0.0",
- "eslint": "^4.2.0",
- "eslint-config-babel": "^7.0.1",
+ "eslint": "^4.19.1",
+ "eslint-config-babel": "^7.0.2",
"eslint-config-defaults": "^9.0.0",
- "eslint-plugin-flowtype": "^2.35.0",
+ "eslint-plugin-flowtype": "^2.49.3",
"gulp": "^3.9.1",
"gulp-autoprefixer": "^5.0.0",
"gulp-cache": "^1.0.2",
"gulp-concat": "^2.6.1",
- "gulp-cssnano": "^2.1.1",
+ "gulp-cssnano": "^2.1.3",
"gulp-html-replace": "^1.6.2",
"gulp-htmlmin": "^4.0.0",
- "gulp-inject": "^4.2.0",
- "gulp-jshint": "^2.0.4",
+ "gulp-inject": "^4.3.2",
+ "gulp-jshint": "^2.1.0",
"gulp-livereload": "^3.8.1",
- "gulp-notify": "^3.0.0",
- "gulp-rename": "^1.2.2",
+ "gulp-notify": "^3.2.0",
+ "gulp-rename": "^1.3.0",
"gulp-uglify": "^3.0.0",
"jshint": "^2.9.5",
- "log4js": "^2.2.0",
+ "log4js": "^2.8.0",
"stopwords-en": "^0.3.0",
- "striptags": "^3.0.1"
+ "striptags": "^3.1.1"
},
"dependencies": {
- "body-parser": "^1.17.2",
+ "body-parser": "^1.18.3",
"cookie-parser": "*",
- "ejs": "*",
+ "ejs": "^2.6.1",
"errorhandler": "^1.5.0",
- "express": "^4.15.3",
- "express-session": "^1.15.3",
+ "express": "^4.16.3",
+ "express-session": "^1.15.6",
"htmlparser": "^1.7.7",
"jsonfile": "^4.0.0",
- "lodash": "^4.16.6",
- "method-override": "^2.3.9",
- "morgan": "^1.8.2",
- "request": "^2.81.0",
- "rss-braider": "git+https://gitlab.silvrtree.co.uk/martind2000/rss-braider.git",
+ "lodash": "^4.17.10",
+ "method-override": "^2.3.10",
+ "morgan": "^1.9.0",
+ "node-cron": "^1.2.1",
+ "request": "^2.87.0",
+ "rss-braider": "^1.2.2",
"yargs": "^11.0.0"
}
}