From cb6a6be33872b67221ec23ad508da4ff09b011f7 Mon Sep 17 00:00:00 2001
From: Martin Donnelly <martind2000@gmail.com>
Date: Mon, 18 Apr 2016 14:13:59 +0100
Subject: [PATCH] updated plugins and removed a couple of broken feeds

---
 .idea/workspace.xml                        | 66 +++++++++++-----------
 node_modules/rss-braider/lib/RssBraider.js |  3 +-
 plugins/fix_images.js                      |  7 +--
 plugins/fix_scripts.js                     |  4 +-
 4 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 980a387..eac25e8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,14 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="c2fd5632-2143-4c7e-8b0d-96d7692b700b" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/LICENSE" afterPath="$PROJECT_DIR$/node_modules/lodash/LICENSE" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/README.md" afterPath="$PROJECT_DIR$/node_modules/lodash/README.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/array.js" afterPath="$PROJECT_DIR$/node_modules/lodash/array.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/chain.js" afterPath="$PROJECT_DIR$/node_modules/lodash/chain.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/collection.js" afterPath="$PROJECT_DIR$/node_modules/lodash/collection.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/math.js" afterPath="$PROJECT_DIR$/node_modules/lodash/math.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/object.js" afterPath="$PROJECT_DIR$/node_modules/lodash/object.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/package.json" afterPath="$PROJECT_DIR$/node_modules/lodash/package.json" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/rss-braider/lib/RssBraider.js" afterPath="$PROJECT_DIR$/node_modules/rss-braider/lib/RssBraider.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/plugins/fix_images.js" afterPath="$PROJECT_DIR$/plugins/fix_images.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/plugins/fix_scripts.js" afterPath="$PROJECT_DIR$/plugins/fix_scripts.js" />
     </list>
     <ignored path="rinser.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -67,17 +62,17 @@
         <entry file="file://$PROJECT_DIR$/plugins/fix_images.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="76">
-              <caret line="4" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+              <caret line="4" column="60" selection-start-line="4" selection-start-column="60" selection-end-line="4" selection-end-column="60" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="fix_scripts.js" pinned="false" current-in-tab="false">
+      <file leaf-file-name="fix_scripts.js" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/plugins/fix_scripts.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="171">
-              <caret line="9" column="3" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+              <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
               <folding />
             </state>
           </provider>
@@ -93,7 +88,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
+      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/.gitignore">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="586">
@@ -473,7 +468,7 @@
       <workItem from="1460364159750" duration="2875000" />
       <workItem from="1460538212218" duration="14000" />
       <workItem from="1460548625556" duration="2535000" />
-      <workItem from="1460978110601" duration="5159000" />
+      <workItem from="1460978110601" duration="5793000" />
     </task>
     <task id="LOCAL-00001" summary="debugging braider">
       <created>1438335954140</created>
@@ -776,11 +771,18 @@
       <option name="project" value="LOCAL" />
       <updated>1460983778774</updated>
     </task>
-    <option name="localTasksCounter" value="44" />
+    <task id="LOCAL-00044" summary="updated plugins and removed a couple of broken feeds">
+      <created>1460983802714</created>
+      <option name="number" value="00044" />
+      <option name="presentableId" value="LOCAL-00044" />
+      <option name="project" value="LOCAL" />
+      <updated>1460983802714</updated>
+    </task>
+    <option name="localTasksCounter" value="45" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="16604000" />
+    <option name="totallyTimeSpent" value="17238000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="4" y="23" width="1825" height="1177" extended-state="0" />
@@ -790,7 +792,7 @@
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2804878" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33551913" sideWeight="0.34785393" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20645161" sideWeight="0.48606148" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20645161" sideWeight="0.48606148" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3345622" sideWeight="0.65214604" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32896176" sideWeight="0.4838976" order="7" side_tool="false" content_ui="tabs" />
@@ -1192,22 +1194,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/plugins/fix_images.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="4" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/plugins/fix_scripts.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="9" column="3" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="586">
@@ -1216,5 +1202,21 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/plugins/fix_images.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="76">
+          <caret line="4" column="60" selection-start-line="4" selection-start-column="60" selection-end-line="4" selection-end-column="60" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/plugins/fix_scripts.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/node_modules/rss-braider/lib/RssBraider.js b/node_modules/rss-braider/lib/RssBraider.js
index eb8c2c6..3ad04c9 100644
--- a/node_modules/rss-braider/lib/RssBraider.js
+++ b/node_modules/rss-braider/lib/RssBraider.js
@@ -93,6 +93,7 @@ RssBraider.prototype.processFeed = function(feed_name, format, callback)
             req.on('response', function (res) {
                 var stream = this;
                 if (res.statusCode !== 200) {
+                  console.error(source);
                     return this.emit('error', 'Bad status code: ' + res.statusCode);
                 }
                 stream.pipe(feedparser);
@@ -294,4 +295,4 @@ RssBraider.prototype.date_sort = function(articles_arr) {
     return sorted_articles;
 };
 
-module.exports = RssBraider;
\ No newline at end of file
+module.exports = RssBraider;
diff --git a/plugins/fix_images.js b/plugins/fix_images.js
index 816a6ac..c54eb47 100644
--- a/plugins/fix_images.js
+++ b/plugins/fix_images.js
@@ -1,10 +1,9 @@
 module.exports = function (item, itemOptions, source) {
 //console.log(itemOptions);
 //  console.log((typeof itemOptions.descriptions !== 'undefined') && (itemOptions.description !== null));
-  if ((typeof itemOptions.descriptions !== 'undefined') && (itemOptions.description !== null)) {
-    var match = itemOptions.description.replace(/\ssrc=/gi,
-      ' src="assets/fm.png" data-src=');
+  //if ((typeof itemOptions.descriptions !== 'undefined') && (itemOptions.description !== null)) {
+    var match = itemOptions.description.replace(/\ssrc=/gi, ' src="assets/fm.png" data-src=');
     itemOptions.description = match;
-  }
+  //}
   return itemOptions;
 };
diff --git a/plugins/fix_scripts.js b/plugins/fix_scripts.js
index d97a00d..13cda3e 100644
--- a/plugins/fix_scripts.js
+++ b/plugins/fix_scripts.js
@@ -1,5 +1,5 @@
 module.exports = function (item, itemOptions, source) {
-  if ((typeof itemOptions.descriptions !== 'undefined') && (itemOptions.description !== null)) {
+  //if ((typeof itemOptions.descriptions !== 'undefined') && (itemOptions.description !== null)) {
 
     var match = itemOptions.description.replace(
       /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
@@ -7,7 +7,7 @@ module.exports = function (item, itemOptions, source) {
     match = match.replace(/<iframe\b[^<]*(?:(?!<\/iframe>)<[^<]*)*<\/iframe>/gi,
       '');
     itemOptions.description = match;
-  }
+  //}
     return itemOptions;
 
 };