Changeset 9373

Timestamp:

04/13/08 02:00:55 (5 years ago)

Author:

drry

Message:

lang/javascript/userscripts/googlereaderfullfeed.user.js:

• fixed regexps.
  
• added XPaths suggested by snj14.
  
• et cetera.
  

Files:

• lang/javascript/userscripts/googlereaderfullfeed.user.js (modified) (18 diffs)

lang/javascript/userscripts/googlereaderfullfeed.user.js

@@ -29 +29 @@
 AAAAACwAAAAAEwATAAAETBDISWsNOOuNJf+aB4LiyJUZ0awNsqGB0RSYkAwhoAnKYaIEBm4EXJgC
 QGFA1VBmUDwfJjjs6DQy2tJp5TBX0uf1mCO/xmYk2mxptyMAOw==
-]]></>.toString().replace(/\s+/g, "");
+]]></>.toString()
+      .replace(/\s+/g, "");
 const ICON2 = <><!-- (c) id:Constellation --><![CDATA[data:image/gif;base64,
 R0lGODdhEwATAPQAMUFp4YfO64fO7ofW9Yfe+LHO68XW68X3/MX3/9ne6+zn7uz/+Oz//Oz////v
@@ -35 +36 @@
 EwATAAAFUCAgjmRZBmiqrqjIvqoLw/LM1unQQLyz4gECJIESHAwxgEqAUNhwAwZyBl0UnsqcNKCD
 PKatbLGpBQeAQiJ3mwJydzxn0vZy0+1Y+s3EN4UAADs=
-]]></>.toString().replace(/\s+/g, "");
+]]></>.toString()
+      .replace(/\s+/g, "");
 
 // == [Config] ======================================================
@@ -65 +67 @@
   this.itemInfo.item_body = getFirstElementByXPath(bodyXPath);
   this.state = 'wait';
-
-  if (this.info.enc) {
-    this.mime = 'text/html; charset=' + this.info.enc;
-  } else {
-    this.mime = 'text/html; charset=' + document.characterSet;
-  }
-
+  this.mime = 'text/html; charset=' + (this.info.enc || document.characterSet);
 
   this.request();
@@ -90 +86 @@
     },
     onerror: function() {
-      self.requestError.apply(self, ['Request Error'])
+      self.requestError.apply(self, ['Request Error']);
     },
     onload: function(res) {
       if (res.status == 302) {
         try {
-          opt.url = res.responseHeaders.match(/\sLocation:\s+([^\s]+)/)[1];
+          opt.url = res.responseHeaders.match(/\sLocation:\s+(\S+)/)[1]; //i
           window.setTimeout(GM_xmlhttpRequest, 0, opt);
           return;
@@ -102 +98 @@
         }
       }
-      self.requestLoad.apply(self, [res])
+      self.requestLoad.apply(self, [res]);
     }
   };
@@ -119 +115 @@
   text = text.replace(/(<[^>]+?[\s"'])on(?:(?:un)?load|(?:dbl)?click|mouse(?:down|up|over|move|out)|key(?:press|down|up)|focus|blur|submit|reset|select|change)\s*=\s*(?:"(?:\\"|[^"])*"?|'(\\'|[^'])*'?|[^\s>]+(?=[\s>]|<\w))(?=[^>]*?>|<\w|\s*$)/gi,
     "$1");
-  if (REMOVE_SCRIPT) text = text.replace(/<script[^>]*>[\S\s]*?<\/script\s*>/gi, "");
-  if (REMOVE_H2TAG)  text = text.replace(/<h2[^>]*>[\S\s]*?<\/h2\s*>/gi, "");
+  if (REMOVE_SCRIPT) text = text.replace(/<script(?:\s[^>]+?)?>[\S\s]*?<\/script\s*>/gi, "");
+  if (REMOVE_H2TAG)  text = text.replace(/<h2(?:\s[^>]+?)?>[\S\s]*?<\/h2\s*>/gi, "");
   var htmldoc = parseHTML(text);
   removeXSSRisks(htmldoc);
@@ -128 +124 @@
     relativeToAbsolutePath(htmldoc, this.itemInfo.itemURL);
   }
-  for (var i = 0, l = FullFeed.documentFilters.length; i < l;
-    FullFeed.documentFilters[i++](htmldoc, this.itemInfo.itemURL, this.info));
+  var self = this;
+  FullFeed.documentFilters.forEach(function(filter) {
+    filter(htmldoc, self.itemInfo.itemURL, this.info);
+  });
   try {
     var entry = getElementsByXPath(this.info.xpath, htmldoc);
@@ -145 +143 @@
     this.removeEntry();
     entry = this.addEntry(entry);
-    for (var i = 0, l = FullFeed.filters.length; i < l;
-      FullFeed.filters[i++](entry));
+    FullFeed.filters.forEach(function(filter) {
+      filter(entry);
+    });
     this.requestEnd();
   } else {
@@ -189 +188 @@
 
 FullFeed.parser = function(text) {
-  var lines = text.split(/\r?\n|\r/);
+  var lines = text.split(/[\r\n]+/);
   var reg = /^([^:]+):(.*)$/;
   var trimspace = function(str) {
@@ -195 +194 @@
   };
   var info = {};
-  for (var i = lines.length; i --> 0; ) {
-    if (reg.test(lines[i])) {
+  lines.forEach(function(line) {
+    if (reg.test(line)) {
       info[RegExp.$1] = trimspace(RegExp.$2);
     }
-  }
+  });
   var isValid = function(info) {
     var infoProp = ['url', 'xpath'];
-    for (var i = infoProp.length; i --> 0; ) {
-      if (!info[infoProp[i]]) {
-        return false;
-      }
-    }
+    if (infoProp.some(function(prop) {
+      return !info[prop];
+    })) return false;
     try {
       new RegExp(info.url);
@@ -240 +237 @@
   var info = [];
   var doc = parseHTML(res.responseText);
-  var lists = getElementsByXPath(
-      '//textarea[@class="ldrfullfeed_data"]', doc);
+  var lists =
+    getElementsByXPath('//textarea[@class="ldrfullfeed_data"]', doc);
   lists.forEach(function(list) {
     var data = FullFeed.parser(list.value);
@@ -267 +264 @@
   if (!WIDGET) return;
   var exps = [];
-  for (var i = 0, l = SITE_INFO.length; i < l; exps.push(SITE_INFO[i++].url));
-  for (var url in cacheInfo) {
-    var site = cacheInfo[url];
-    for (var i = 0, l = site.info.length; i < l; exps.push(site.info[i++].url));
+  SITE_INFO.forEach(function(info) {
+    exps.push(info.url);
+  });
+  for each (var i in cacheInfo) {
+    i.info.forEach(function(info) {
+      exps.push(info.url);
+    });
   }
   pattern = exps.join('|');
@@ -393 +393 @@
   this.item_container = getFirstElementByXPath('id("current-entry")//div[contains(concat(" ",normalize-space(@class)," ")," entry-body ")]');
   this.title = this.item.title;
-  this.find = false;
+  this.found = false;
 };
 
 var launchFullFeed = function(list, c) {
-  if (!list) return;
-  for (var i = 0, l = list.length; i < l; i++) {
-    var reg = new RegExp(list[i].url);
+  if (typeof list.some != "function") return;
+  list.some(function(i) {
+    var reg = new RegExp(i.url);
     if (reg.test(c.itemURL) || reg.test(c.feedURL)) {
-      c.find = true;
-      var ff = new FullFeed(list[i], c);
-      break;
+      c.found = true;
+      var ff = new FullFeed(i, c);
+      return true;
+    } else {
+      return false;
     }
-  }
+  });
 };
 
@@ -420 +422 @@
   launchFullFeed(SITE_INFO, c);
 
-  if (!c.find) {
-    for (var i = 0, l = SITEINFO_IMPORT_URLS.length; i < l && !c.find;
-      launchFullFeed(cacheInfo[SITEINFO_IMPORT_URLS[i++]].info, c));
-  }
-
-  if (!c.find) {
+  if (!c.found && !SITEINFO_IMPORT_URLS.some(function(url) {
+    launchFullFeed(cacheInfo[url].info, c);
+    return c.found;
+  })) {
     message('This entry is not listed on SITE_INFO');
     if (OPEN) window.open(c.itemURL) || message('Cannot popup');
@@ -477 +477 @@
 
 function searchEntry(htmldoc) {
+
   var xpath = [
     '//*',
-    '[(..//h2) or (.//h3) or (.//h4) or (.//h5) or (.//h6) or (..//*[contains(concat(@id,@class,""),"title")])]',
-    '[not(.//form)]',
-    '[not((.|.//*)[contains(concat("",@class,""),"robots-nocontent")])]',
-    '[not((.|.//*)[contains(concat(@id,@class,""),"side")])]',
-    '[not((.|.//*)[contains(concat(@id,@class,""),"navi")])]',
-    '[not((.|.//*)[contains(concat(@id,@class,""),"footer")])]',
-    '[not((.|.//*)[contains(concat(@id,@class,""),"header")])]',
+    '[(..//h2) or (.//h3) or (.//h4) or (.//h5) or (.//h6) or (..//*[contains(concat(@id, " ", @class), "title")])]',
+    '[not(.//form|ancestor-or-self::form)]',
+    '[not(.//script|ancestor-or-self::script)]',
+    '[not((.|.//*|ancestor-or-self::*)[contains(@class, "robots-nocontent")])]',
+    '[not((.|.//*|ancestor-or-self::*)[contains(concat(@id, " ", @class), "side")])]',
+    '[not((.|.//*|ancestor-or-self::*)[contains(concat(@id, " ", @class), "navi")])]',
+    '[not((.|.//*|ancestor-or-self::*)[contains(concat(@id, " ", @class), "footer")])]',
+    '[not((.|.//*|ancestor-or-self::*)[contains(concat(@id, " ", @class), "header")])]',
   ].join('');
   try {
@@ -492 +494 @@
     var elms = getElementsByXPath(xpath, htmldoc);
     if(!elms) return null;
-        // get content which has most text elements.
+        // get content which has most text elements.
     Array.forEach(elms, function(e) {
-      var n = e.textContent.length;
+      if(typeof e.textContent != "string") return;
+      var n = e.textContent.replace(/^\s+|\s+$|(?:\r?\n|\r){2,}/g, "").length;
       if(max < n){
         max = n;
@@ -619 +622 @@
   var nodesSnapshot = (node.ownerDocument || node).
     evaluate(xpath, node, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-  var data = []
+  var data = [];
   for (var i = 0, l = nodesSnapshot.snapshotLength; i < l;
     data.push(nodesSnapshot.snapshotItem(i++)));
@@ -634 +637 @@
 // copied from Pagerization (c) id:ofk
 function parseHTML(str) {
-  str = str.replace(/^[\s\S]*?<html[^>]*>|<\/html\s*>[\s\S]*$/ig, '');
+  str = str.replace(/^[\s\S]*?<html(?:\s[^>]+?)?>|<\/html\s*>[\S\s]*$/ig, '');
   var res = document.implementation.createDocument(null, 'html', null);
   var range = document.createRange();
   range.setStartAfter(document.body);
-  res.documentElement.appendChild(
-    res.importNode(range.createContextualFragment(str), true)
-  );
+  res.documentElement
+     .appendChild(res.importNode(range.createContextualFragment(str), true));
   return res;
 }