Changeset 8626

Timestamp:

04/02/08 06:20:47 (5 years ago)

Author:

drry

Message:

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

• 正規表現を修正しました。
  
• ほか。
  

Files:

• lang/javascript/userscripts/ldrprefav.user.js (modified) (14 diffs)

lang/javascript/userscripts/ldrprefav.user.js

@@ -8 +8 @@
 // ==/UserScript==
 
-var doneIDs = [];
+var filteredIDs, preFilteredIDs;
 
 with (this.unsafeWindow || this) {
@@ -14 +14 @@
                 "Pheedo - Depheedo" : function(f) {
                         var item;
-                        for (var i = f.items.length; item = f.items[--i];) {
+                        for (var i = 0; item = f.items[i++];) {
                                 if (item.title.indexOf("AD: ") != 0) break;
                         }
@@ -20 +20 @@
 
                         filter(f.items, function(i) { return i.title.indexOf("AD: ") != 0 });
-                        var re = /<img(?:\s+[^>]+)*?\s+src\s*=\s*["']?\s*http:\/\/www\.pheedo\.jp\/(?:img\.phdo|feeds\/tracker\.php)\?[^>]+>/g; //ig
+                        var re = /<img(?:\s+[^>]+)?\s+src\s*=\s*["']?\s*http:\/\/www\.pheedo\.jp\/(?:img\.phdo|feeds\/tracker\.php)\?[^>]+>(?:<\/img>)?/g; //ig
                         foreach(f.items, function(i) { i.body = i.body.replace(re, ""); });
                 },
-                "FeedBurner - Detracking and Remove Garbled" : function(f) {
-                        var re = /<a(?:\s+[^>]+)*?\s+href\s*=\s*["']?\s*http:\/\/[^\/]+\/~\w\/[^>]+>[\s\S]+?<\/a\s*>|<img(?:\s+[^>]+)*?\s+src\s*=\s*["']?\s*http:\/\/[^\/]+\/~\w\/[^>]+>/g;
-                        if (f.channel.feedlink.indexOf("http://feeds.feedburner.") != 0 &&
+                "FeedBurner - Detracking and Filter Garbled" : function(f) {
+                        var re = /<a(?:\s+[^>]+)?\s+href\s*=\s*["']?\s*http:\/\/[^\/]+\/~\w\/[^>]+>[\s\S]+?<\/a\s*>|<img(?:\s+[^>]+)*?\s+src\s*=\s*["']?\s*http:\/\/[^\/]+\/~\w\/[^>]+>(?:<\/img>)?/g;
+                        if (! /^http:\/\/feeds\.feedburner\.(?:com|jp)\//.test(f.channel.feedlink) &&
                             ! (f.items[0] &&
-                               /^http:\/\/feeds\.feedburner\.(?:com|jp)\/~r\//.test(f.items[0].link) ||
+                               /^http:\/\/[^\/]+\/~r\/[^\/]+/.test(f.items[0].link) ||
                                re.test(f.items[0].body))) return;
 
@@ -36 +36 @@
                         filter(f.items, function(i) { return i.author != "rssad.jp" });
                         //filter(f.items, function(i) { return i.title.indexOf("PR: ") != 0 });
-                        var re = /<a(?:\s+[^>]+)*?\s+href\s*=\s*["']?\s*http:\/\/rss\.rssad\.jp\/[^>]+>[\s\S]+?<\/a\s*>|<img(?:\s+[^>]+)*?\s+src\s*=\s*["']?\s*http:\/\/rss\.rssad\.jp\/[^>]+>/g;
-                        foreach(f.items, function(i) {
-                                i.body = i.body.replace(re, "");
-                        });
+                        var re = /<a(?:\s+[^>]+)?\s+href\s*=\s*["']?\s*http:\/\/rss\.rssad\.jp\/[^>]+>[\s\S]+?<\/a\s*>|<img(?:\s+[^>]+)*?\s+src\s*=\s*["']?\s*http:\/\/rss\.rssad\.jp\/[^>]+>(?:<\/img\s*>)?/g;
+                        foreach(f.items, function(i) { i.body = i.body.replace(re, ""); });
                 },
                 "Userscripts.org - Trim Spam" : function(f) {
@@ -56 +54 @@
                 },
                 "Flickr - Enlarge Thumbnails" : function(f) { // http://userscripts.org/scripts/show/14809
-                        if (doneIDs.indexOf(f.subscribe_id) > -1 ||
-                            f.channel.link.indexOf("http://www.flickr.com/") != 0) return;
+                        if (f.channel.link.indexOf("http://www.flickr.com/") != 0) return;
 
                         var re = /_m(?=\.(?:jpe?g|gif|png)")|\s+(?:width|height)="\d+"/g;
@@ -71 +68 @@
                 },
                 "4U - Enlarge Thumbnails" : function(f) { // http://d.hatena.ne.jp/Constellation/20080327/1206633302
-                        if (doneIDs.indexOf(f.subscribe_id) > -1 ||
-                            f.channel.link != "http://4u.straightline.jp/") return;
+                        if (f.channel.link != "http://4u.straightline.jp/") return;
 
                         var re = /(?:\/m){2}(?=_)/;
@@ -80 +76 @@
                         if (! /^http:\/\/[^.]+\.blog\d+\.fc2\.com\//.test(f.channel.link)) return;
 
-                        var re = /(<img(?:\s+[^>]+)*?\ssrc="[^"]+)s(\.jpg")/g;
+                        var re = /(<img(?:\s+[^>]+)?\ssrc="[^"]+)s(\.jpg")/g;
                         foreach(f.items, function(i) { i.body = i.body.replace(re, "$1$2"); });
                 },
@@ -86 +82 @@
                         if (f.channel.link.indexOf("//knuttz.net/") < 0) return;
 
-                        var RE = /<a(?:\s+[^>]+)*?\s+href="([^"]+)"[^>]*>.*?Clic?k\s+Here[\S\s]*?<\/a\s*>/i;
+                        var RE = /<a(?:\s+[^>]+)?\s+href="([^"]+)"[^>]*>.*?Clic?k\s+Here[\S\s]*?<\/a\s*>/i;
                         foreach(f.items, function(i) {
                                 if (! RE.test(i.body)) return;
@@ -96 +92 @@
                         if (f.channel.link != "http://www.gizmodo.jp/") return;
 
-                        var re = /<a(?:\s+[^>]+)*?\s+href="([^"]+)"[^>]*>\u7D9A\u304D\u3092\u8AAD\u3080<\/a>/;
+                        var re = /<a(?:\s+[^>]+)?\s+href="([^"]+)"[^>]*>\u7D9A\u304D\u3092\u8AAD\u3080<\/a>/;
                         foreach(f.items, function(i) {
                                 if (! re.test(i.body)) return;
@@ -107 +103 @@
                             f.channel.link != "http://slashdot.jp/") return;
 
-                        var re = /<a(?:\s+[^>]+)*?\s+href="([^"]+)"[^>]*>Read more of this story<\/a>/;
+                        var re = /<a(?:\s+[^>]+)?\s+href="([^"]+)"[^>]*>Read more of this story<\/a>/;
                         foreach(f.items, function(i) {
-                                if (! re.test(i.body)) return;
-                                i.link = RegExp.$1;
+                                if (re.test(i.body)) i.link = RegExp.$1;
                         });
                 },
@@ -124 +119 @@
                         if (! (f.items[0] && re.test(f.items[0].link))) return;
 
-                        foreach(f.items, function(i) { i.link = i.link.replace(re, "").replace(/\?(?=#|$)/, ""); });
+                        foreach(f.items, function(i) {
+                                i.link = i.link.replace(re, "").replace(/\?(?=#|$)/, "");
+                        });
                 },
                 "Trim Spaces to Compact Items" : function(f) {
                         foreach(f.items, function(i) {
-                                i.body = i.body.replace(/(^|<[ap](?:\s+[^>]*)?>)(?:\s|<br(?:\s+[^>]*|\s*\/?)>)+|(?:\s|<br(?:\s+[^>]*|\s*\/?)>)+($|<\/[ap]\s*>)|<a(?:\s+[^>]*)?>(?:\s|<br(?:\s+[^>]*|\s*\/?)>)*<\/a\s*>/ig, "$1$2")
-                                               .replace(/<(p(?:re)?)(?:\s+[^>]*)?>(?:\s|<br(?:\s+[^>]*|\s*\/?)>)*<\/\1\s*>/ig, "");
+                                i.body = i.body.replace(/(^|<[ap](?:\s+[^>]*)?>)(?:\s|<br(?:\s+[^>]*)?>(?:<\/br>)?)+|(?:\s|<br(?:\s+[^>]*)?>(?:<\/br>)?)+($|<\/[ap]>)|<a(?:\s+[^>]*)?>(?:\s|<br(?:\s+[^>]*)?>(?:<\/br>)?)*<\/a>/ig, "$1$2")
+                                               .replace(/<(p(?:re)?)(?:\s+[^>]*)?>(?:\s|<br(?:\s+[^>]*)?>(?:<\/br>)?)*<\/\1>/ig, "");
                         });
                 }
@@ -135 +132 @@
 
         const preFilters = {
-                "Flickr - Enlarge and Prefetch Thumbnails" : function(f) { // http://userscripts.org/scripts/show/14809
-                        if (doneIDs.indexOf(f.subscribe_id) > -1 ||
-                            f.channel.link.indexOf("http://www.flickr.com/") != 0) return;
+                "Flickr - Prefetch Thumbnails" : function(f) { // http://userscripts.org/scripts/show/14809
+                        if (f.channel.link.indexOf("http://www.flickr.com/") != 0) return;
 
-                        doneIDs.push(f.subscribe_id);
-                        var re = /([^"]+?)_m(\.(?:jpe?g|gif|png))(?=")|\s+(?:width|height)="\d+"/g;
+                        var re = /([^"]+?)_m(\.(?:jpe?g|gif|png))(?=")/g;
                         foreach(f.items, function(i) {
-                                i.body = i.body.replace(re, "$1$2");
-                                new this.Image().src = RegExp.$1 + RegExp.$2;
+                                if (re.test(i.body)) new this.Image().src = RegExp.$1 + RegExp.$2;
                         });
                 },
-                "4U - Enlarge and Prefetch Thumbnails" : function(f) {
-                        if (doneIDs.indexOf(f.subscribe_id) > -1 ||
-                            f.channel.link != "http://4u.straightline.jp/") return;
+                "4U - Prefetch Thumbnails" : function(f) {
+                        if (f.channel.link != "http://4u.straightline.jp/") return;
 
-                        doneIDs.push(f.subscribe_id);
                         var re = /([^"]+?)(?:\/m){2}(\w+\.(?:jpe?g|gif|png))(?=")/;
                         foreach(f.items, function(i) {
-                                i.body = i.body.replace(re, "$1/l/l$2");
-                                new this.Image().src = RegExp.$1 + "/l/l" + RegExp.$2;
+                                if (re.test(i.body)) new this.Image().src = RegExp.$1 + "/l/l" + RegExp.$2;
                         });
                 },
                 "Prefetch Images from Secure Sites" : function(f) {
                         var link = f.channel.link;
-                        if (doneIDs.indexOf(f.subscribe_id) > -1 ||
-                            link != "http://ffffound.com/" &&
+                        if (link != "http://ffffound.com/" &&
                             ! /^http:\/\/[^.]+\.tumblr\.com/.test(link)) return;
 
-                        doneIDs.push(f.subscribe_id);
                         var re = /http:\/\/(?:img\.ffffound|data\.tumblr)\.com\/[\w\/-]+?\.(?:jpe?g|gif|png)/;
                         foreach(f.items, function(i) {
-                                if (re.test(i.body))
-                                        new this.Image().src = RegExp.lastMatch;
+                                if (re.test(i.body)) new this.Image().src = RegExp.lastMatch;
                         });
                 }
         };
 
+        register_hook("BEFORE_SUBS_LOAD", function() {
+                filteredIDs = preFilteredIDs = [];
+        });
+
         register_hook("BEFORE_PRINTFEED", function(feed) {
-                if (! subs_item(feed.subscribe_id).unread_count) return;
+                if (filteredIDs.include(feed.subscribe_id) ||
+                    ! subs_item(feed.subscribe_id).unread_count) return;
 
+                filteredIDs.push(parseInt(feed.subscribe_id));
                 for (var filter in filters)
                         filters[filter](feed);
         });
 
-/*      preInvoke(get_unread.cache, "set", function(sid, feed) { // http://userscripts.org/scripts/show/14809
-                if (typeof feed == "object" && subs_item(feed.subscribe_id).unread_count)
-                        for (var filter in preFilters)
-                                preFilters[filter](feed);
-        }); */
+if (false)
+        preInvoke(get_unread.cache, "set", function(sid, feed) { // http://userscripts.org/scripts/show/14809
+                if (typeof feed != "object" || preFilteredIDs.include(feed.subscribe_id)) return;
+
+                preFilteredIDs.push(parseInt(feed.subscribe_id));
+                for (var filter in preFilters)
+                        preFilters[filter](feed);
+        });
 }
 
@@ -191 +188 @@
 }
 
-function preInvoke(target, name, f) { // http://userscripts.org/scripts/show/14809
+function preInvoke(target, name, f) {
         var _target = target[name];
         target[name] = function() {
@@ -198 +195 @@
         };
 }
+
+Array.prototype.include = function(id) { return this.indexOf(parseInt(id)) > -1 };