Changeset 25714

Timestamp:

12/02/08 23:47:13 (7 months ago)

Author:

suVene

Message:

*SITEINFOと共にkeymap指定
*複数リクエスト時定義順に出力
*property名変更とか。

Location:

lang/javascript/vimperator-plugins

Files:

• branches/1.2/multi_requester.js (modified) (16 diffs)
• trunk/multi_requester.js (modified) (16 diffs)

lang/javascript/vimperator-plugins/branches/1.2/multi_requester.js

@@ -5 +5 @@
  * @description-ja   リクエストの結果をバッファに出力する。
  * @author           suVene suvene@zeromemory.info
- * @version          0.4.0
+ * @version          0.4.1
  * @minVersion       1.2
  * @maxVersion       1.2
- * Last Change:      01-Dec-2008.
+ * Last Change:      02-Dec-2008.
  * ==/VimperatorPlugin==
  *
@@ -36 +36 @@
  *   liberator.globalVariables.multi_requester_siteinfo = [
  *       {
- *           name:          'ex',                           // required
- *           description:   'example',                      // required
- *           url:           'http://example.com/?%s',       // required, %s <-- replace string
- *           xpath:         '//*',                          // optional(default all)
- *           srcEncode:     'SHIFT_JIS',                    // optional(default UTF-8)
- *           urlEncode:     'SHIFT_JIS',                    // optional(default srcEncode)
- *           ignoreTags:    'img'                           // optional(default script), syntax 'tag1,tag2,……'
- *           extractLink:   '//xpath'                       // optional extract permalink'
+ *           map:           ',me',                          // optional: keymap for this siteinfo call
+ *           bang:          true,                           // optional:
+ *           args:          'any'                           // optional:
+ *           name:          'ex',                           // required: subcommand name
+ *           description:   'example',                      // required: commandline short help
+ *           url:           'http://example.com/?%s',       // required: %s <-- replace string
+ *           xpath:         '//*',                          // optional: default all
+ *           srcEncode:     'SHIFT_JIS',                    // optional: default UTF-8
+ *           urlEncode:     'SHIFT_JIS',                    // optional: default srcEncode
+ *           ignoreTags:    'img',                          // optional: default script, syntax 'tag1,tag2,……'
+ *           extractLink:   '//xpath'                       // optional: extract permalink
  *       },
  *   ];
@@ -185 +188 @@
     },
     addUserMaps: function(prefix, mapdef) {
-        mapdef.forEach(function([key, command, special, args]) {
-            var cmd = prefix + (special ? '! ' : ' ') + command + ' ';
-            liberator.mappings.addUserMap(
-                [liberator.modes.NORMAL, liberator.modes.VISUAL],
+        mapdef.forEach(function([key, command, bang, args]) {
+            var cmd = prefix + (bang ? '! ' : ' ') + command + ' ';
+            mappings.addUserMap(
+                [modes.NORMAL, modes.VISUAL],
                 [key],
                 'user defined mapping',
@@ -330 +333 @@
 };
 Response.prototype = {
-    initialize: function(request) {
-        this.request = request;
-        this.transport = request.transport;
-        this.isSuccess = request.isSuccess();
+    initialize: function(req) {
+        this.req = req;
+        this.transport = req.transport;
+        this.isSuccess = req.isSuccess();
         this.readyState = this.transport.readyState;
 
@@ -357 +360 @@
             this.htmlFragmentstr = this.responseText.replace(/^[\s\S]*?<html(?:[ \t\n\r][^>]*)?>|<\/html[ \t\r\n]*>[\S\s]*$/ig, '').replace(/[\r\n]+/g, ' ');
             let ignoreTags = ['script'];
-            if (this.request.options.siteinfo.ignoreTags) {
-                ignoreTags.concat(this.request.options.siteinfo.ignoreTags.split(','));
+            if (this.req.options.siteinfo.ignoreTags) {
+                ignoreTags.concat(this.req.options.siteinfo.ignoreTags.split(','));
             }
             this.htmlStripScriptFragmentstr = $U.stripTags(this.htmlFragmentstr, 'script');
@@ -406 +409 @@
     getSiteInfo: function() {
 
+        var self = this;
         var useWedata = typeof liberator.globalVariables.multi_requester_use_wedata == 'undefined' ?
                         true : $U.eval(liberator.globalVariables.multi_requester_use_wedata);
+
+        if (liberator.globalVariables.multi_requester_siteinfo) {
+            liberator.globalVariables.multi_requester_siteinfo.forEach(function(site) {
+                if (!mergedSiteinfo[site.name]) mergedSiteinfo[site.name] = {};
+                $U.extend(mergedSiteinfo[site.name], site);
+                if (site.map) {
+                    CommandRegister.addUserMaps(MultiRequester.name[0],
+                        [[site.map, site.name, site.bang, site.args]]);
+                }
+            });
+        }
+
+        SITEINFO.forEach(function(site) {
+            if (!mergedSiteinfo[site.name]) mergedSiteinfo[site.name] = {};
+            $U.extend(mergedSiteinfo[site.name], site);
+            if (site.map) {
+                CommandRegister.addUserMaps(MultiRequester.name[0],
+                    [[site.map, site.name, site.bang, site.args]]);
+            }
+        });
 
         if (useWedata) {
@@ -417 +441 @@
             });
         }
-
-        if (liberator.globalVariables.multi_requester_siteinfo) {
-            liberator.globalVariables.multi_requester_siteinfo.forEach(function(site) {
-                if (!mergedSiteinfo[site.name]) mergedSiteinfo[site.name] = {};
-                $U.extend(mergedSiteinfo[site.name], site);
-            });
-        }
-
-        SITEINFO.forEach(function(site) {
-            if (!mergedSiteinfo[site.name]) mergedSiteinfo[site.name] = {};
-            $U.extend(mergedSiteinfo[site.name], site);
-        });
 
         return $U.A(mergedSiteinfo);
@@ -453 +465 @@
 // main controller {{{
 var MultiRequester = {
-    doProcess: false,
-    requestCount: 0,
-    echoList: [],
     name: DataAccess.getCommand(),
     description: 'request, and display to the buffer',
-    cmdAction: function(args, bang, count) {
+    doProcess: false,
+    requestNames: '',
+    requestCount: 0,
+    echoHash: {},
+    cmdAction: function(args, bang, count) { // {{{
 
         if (MultiRequester.doProcess) return;
@@ -466 +479 @@
 
         MultiRequester.doProcess = true;
+        MultiRequester.requestNames = parsedArgs.names;
         MultiRequester.requestCount = 0;
-        MultiRequester.echoList = [];
+        MultiRequester.echoHash = {};
         var siteinfo = parsedArgs.siteinfo;
         for (let i = 0, len = parsedArgs.count; i < len; i++) {
@@ -549 +563 @@
         });
         return ret;
-    },
-    extractLink: function(res, extractLink) {
+    }, // }}}
+    extractLink: function(res, extractLink) { //{{{
 
         var el = res.getHTMLDocument(extractLink);
@@ -556 +570 @@
         var a = el.firstChild;
         var url = $U.pathToURL((a.href || a.action || a.value));
-        var req = new Request(url, null, $U.extend(res.request.options, {extractLink: true}));
+        var req = new Request(url, null, $U.extend(res.req.options, {extractLink: true}));
         req.addEventListener('onException', $U.bind(this, this.onException));
         req.addEventListener('onSuccess', $U.bind(this, this.onSuccess));
@@ -564 +578 @@
         MultiRequester.doProcess = true;
 
-    },
-    onSuccess: function(res) {
+    }, //}}}
+    onSuccess: function(res) { //{{{
 
         if (!MultiRequester.doProcess) {
@@ -572 +586 @@
         }
 
-        $U.log('success!!!' + res.request.url);
+        $U.log('success!!!:' + res.req.url);
         MultiRequester.requestCount--;
         if (MultiRequester.requestCount == 0) {
@@ -584 +598 @@
             if (!res.isSuccess || res.responseText == '') throw 'response is fail or null';
 
-            url = res.request.url;
+            url = res.req.url;
             escapedUrl = liberator.util.escapeHTML(url);
-            xpath = res.request.options.siteinfo.xpath;
-            extractLink = res.request.options.siteinfo.extractLink;
-
-            if (extractLink && !res.request.options.extractLink) {
+            xpath = res.req.options.siteinfo.xpath;
+            extractLink = res.req.options.siteinfo.extractLink;
+
+            if (extractLink && !res.req.options.extractLink) {
                 this.extractLink(res, extractLink);
                 return;
@@ -598 +612 @@
 
             html = '<a href="' + escapedUrl + '" class="hl-Title" target="_self">' + escapedUrl + '</a>' +
-                   (new XMLSerializer()).serializeToString(doc).replace(/<[^>]+>/g,
-                            function(all) all.toLowerCase());
-
-            MultiRequester.echoList.push(html);
+                   (new XMLSerializer()).serializeToString(doc)
+                            .replace(/<[^>]+>/g, function(all) all.toLowerCase())
+                            .replace(/<!--[^>]*-->/g, '');
+
+            MultiRequester.echoHash[res.req.options.siteinfo.name] = html;
 
         } catch (e) {
             $U.log('error!!: ' + e);
-            MultiRequester.echoList.push('<span style="color: red;">error!!:' + e + '</span>');
+            MultiRequester.echoHash[res.req.options.siteinfo.name] =
+                            '<span style="color: red;">error!!: ' + e + '</span>';
         }
 
         if (MultiRequester.requestCount == 0) {
-            let html = '<div style="white-space:normal;"><base href="' + escapedUrl + '"/>' +
-                        MultiRequester.echoList.join('') +
-                        '</div>';
+            let echoList = [];
+            MultiRequester.requestNames.split(',').forEach(function(name) {
+                echoList.push(MultiRequester.echoHash[name])
+            });
+            html = '<div style="white-space:normal;"><base href="' + escapedUrl + '"/>' +
+                   echoList.join('') +
+                   '</div>';
             try { $U.echo(new XMLList(html)); } catch (e) { $U.log(e); $U.echo(html); }
         }
@@ -623 +643 @@
         MultiRequester.doProcess = false;
         $U.echoerr('exception!!: ' + e);
-    }
+    }//}}}
 };
 //}}}

lang/javascript/vimperator-plugins/trunk/multi_requester.js

@@ -5 +5 @@
  * @description-ja   リクエストの結果をバッファに出力する。
  * @author           suVene suvene@zeromemory.info
- * @version          0.4.0
+ * @version          0.4.1
  * @minVersion       2.0pre
  * @maxVersion       2.0pre
- * Last Change:      01-Dec-2008.
+ * Last Change:      02-Dec-2008.
  * ==/VimperatorPlugin==
  *
@@ -36 +36 @@
  *   liberator.globalVariables.multi_requester_siteinfo = [
  *       {
- *           name:          'ex',                           // required
- *           description:   'example',                      // required
- *           url:           'http://example.com/?%s',       // required, %s <-- replace string
- *           xpath:         '//*',                          // optional(default all)
- *           srcEncode:     'SHIFT_JIS',                    // optional(default UTF-8)
- *           urlEncode:     'SHIFT_JIS',                    // optional(default srcEncode)
- *           ignoreTags:    'img'                           // optional(default script), syntax 'tag1,tag2,……'
- *           extractLink:   '//xpath'                       // optional extract permalink'
+ *           map:           ',me',                          // optional: keymap for this siteinfo call
+ *           bang:          true,                           // optional:
+ *           args:          'any'                           // optional:
+ *           name:          'ex',                           // required: subcommand name
+ *           description:   'example',                      // required: commandline short help
+ *           url:           'http://example.com/?%s',       // required: %s <-- replace string
+ *           xpath:         '//*',                          // optional: default all
+ *           srcEncode:     'SHIFT_JIS',                    // optional: default UTF-8
+ *           urlEncode:     'SHIFT_JIS',                    // optional: default srcEncode
+ *           ignoreTags:    'img',                          // optional: default script, syntax 'tag1,tag2,……'
+ *           extractLink:   '//xpath'                       // optional: extract permalink
  *       },
  *   ];
@@ -186 +189 @@
     },
     addUserMaps: function(prefix, mapdef) {
-        mapdef.forEach(function([key, command, special, args]) {
-            var cmd = prefix + (special ? '! ' : ' ') + command + ' ';
+        mapdef.forEach(function([key, command, bang, args]) {
+            var cmd = prefix + (bang ? '! ' : ' ') + command + ' ';
             mappings.addUserMap(
                 [modes.NORMAL, modes.VISUAL],
@@ -331 +334 @@
 };
 Response.prototype = {
-    initialize: function(request) {
-        this.request = request;
-        this.transport = request.transport;
-        this.isSuccess = request.isSuccess();
+    initialize: function(req) {
+        this.req = req;
+        this.transport = req.transport;
+        this.isSuccess = req.isSuccess();
         this.readyState = this.transport.readyState;
 
@@ -358 +361 @@
             this.htmlFragmentstr = this.responseText.replace(/^[\s\S]*?<html(?:[ \t\n\r][^>]*)?>|<\/html[ \t\r\n]*>[\S\s]*$/ig, '').replace(/[\r\n]+/g, ' ');
             let ignoreTags = ['script'];
-            if (this.request.options.siteinfo.ignoreTags) {
-                ignoreTags.concat(this.request.options.siteinfo.ignoreTags.split(','));
+            if (this.req.options.siteinfo.ignoreTags) {
+                ignoreTags.concat(this.req.options.siteinfo.ignoreTags.split(','));
             }
             this.htmlStripScriptFragmentstr = $U.stripTags(this.htmlFragmentstr, 'script');
@@ -407 +410 @@
     getSiteInfo: function() {
 
+        var self = this;
         var useWedata = typeof liberator.globalVariables.multi_requester_use_wedata == 'undefined' ?
                         true : $U.eval(liberator.globalVariables.multi_requester_use_wedata);
+
+        if (liberator.globalVariables.multi_requester_siteinfo) {
+            liberator.globalVariables.multi_requester_siteinfo.forEach(function(site) {
+                if (!mergedSiteinfo[site.name]) mergedSiteinfo[site.name] = {};
+                $U.extend(mergedSiteinfo[site.name], site);
+                if (site.map) {
+                    CommandRegister.addUserMaps(MultiRequester.name[0],
+                        [[site.map, site.name, site.bang, site.args]]);
+                }
+            });
+        }
+
+        SITEINFO.forEach(function(site) {
+            if (!mergedSiteinfo[site.name]) mergedSiteinfo[site.name] = {};
+            $U.extend(mergedSiteinfo[site.name], site);
+            if (site.map) {
+                CommandRegister.addUserMaps(MultiRequester.name[0],
+                    [[site.map, site.name, site.bang, site.args]]);
+            }
+        });
 
         if (useWedata) {
@@ -418 +442 @@
             });
         }
-
-        if (liberator.globalVariables.multi_requester_siteinfo) {
-            liberator.globalVariables.multi_requester_siteinfo.forEach(function(site) {
-                if (!mergedSiteinfo[site.name]) mergedSiteinfo[site.name] = {};
-                $U.extend(mergedSiteinfo[site.name], site);
-            });
-        }
-
-        SITEINFO.forEach(function(site) {
-            if (!mergedSiteinfo[site.name]) mergedSiteinfo[site.name] = {};
-            $U.extend(mergedSiteinfo[site.name], site);
-        });
 
         return $U.A(mergedSiteinfo);
@@ -454 +466 @@
 // main controller {{{
 var MultiRequester = {
-    doProcess: false,
-    requestCount: 0,
-    echoList: [],
     name: DataAccess.getCommand(),
     description: 'request, and display to the buffer',
-    cmdAction: function(args) {
+    doProcess: false,
+    requestNames: '',
+    requestCount: 0,
+    echoHash: {},
+    cmdAction: function(args) { //{{{
 
         if (MultiRequester.doProcess) return;
@@ -471 +484 @@
 
         MultiRequester.doProcess = true;
+        MultiRequester.requestNames = parsedArgs.names;
         MultiRequester.requestCount = 0;
-        MultiRequester.echoList = [];
+        MultiRequester.echoHash = {};
         var siteinfo = parsedArgs.siteinfo;
         for (let i = 0, len = parsedArgs.count; i < len; i++) {
@@ -554 +568 @@
         });
         return ret;
-    },
-    extractLink: function(res, extractLink) {
+    },//}}}
+    extractLink: function(res, extractLink) { //{{{
 
         var el = res.getHTMLDocument(extractLink);
@@ -561 +575 @@
         var a = el.firstChild;
         var url = $U.pathToURL((a.href || a.action || a.value));
-        var req = new Request(url, null, $U.extend(res.request.options, {extractLink: true}));
+        var req = new Request(url, null, $U.extend(res.req.options, {extractLink: true}));
         req.addEventListener('onException', $U.bind(this, this.onException));
         req.addEventListener('onSuccess', $U.bind(this, this.onSuccess));
@@ -569 +583 @@
         MultiRequester.doProcess = true;
 
-    },
-    onSuccess: function(res) {
+    },//}}}
+    onSuccess: function(res) { //{{{
 
         if (!MultiRequester.doProcess) {
@@ -577 +591 @@
         }
 
-        $U.log('success!!!' + res.request.url);
+        $U.log('success!!!:' + res.req.url);
         MultiRequester.requestCount--;
         if (MultiRequester.requestCount == 0) {
@@ -589 +603 @@
             if (!res.isSuccess || res.responseText == '') throw 'response is fail or null';
 
-            url = res.request.url;
+            url = res.req.url;
             escapedUrl = util.escapeHTML(url);
-            xpath = res.request.options.siteinfo.xpath;
-            extractLink = res.request.options.siteinfo.extractLink;
-
-            if (extractLink && !res.request.options.extractLink) {
+            xpath = res.req.options.siteinfo.xpath;
+            extractLink = res.req.options.siteinfo.extractLink;
+
+            if (extractLink && !res.req.options.extractLink) {
                 this.extractLink(res, extractLink);
                 return;
@@ -603 +617 @@
 
             html = '<a href="' + escapedUrl + '" class="hl-Title" target="_self">' + escapedUrl + '</a>' +
-                   (new XMLSerializer()).serializeToString(doc).replace(/<[^>]+>/g,
-                            function(all) all.toLowerCase());
-
-            MultiRequester.echoList.push(html);
+                   (new XMLSerializer()).serializeToString(doc)
+                            .replace(/<[^>]+>/g, function(all) all.toLowerCase())
+                            .replace(/<!--[^>]*-->/g, '');
+
+            MultiRequester.echoHash[res.req.options.siteinfo.name] = html;
 
         } catch (e) {
             $U.log('error!!: ' + e);
-            MultiRequester.echoList.push('<span style="color: red;">error!!:' + e + '</span>');
+            MultiRequester.echoHash[res.req.options.siteinfo.name] =
+                            '<span style="color: red;">error!!: ' + e + '</span>';
         }
 
         if (MultiRequester.requestCount == 0) {
-            let html = '<div style="white-space:normal;"><base href="' + escapedUrl + '"/>' +
-                        MultiRequester.echoList.join('') +
-                        '</div>';
-            try { $U.echo(new XMLList(html)); } catch (e) { $U.echo(html); }
+            let echoList = [];
+            MultiRequester.requestNames.split(',').forEach(function(name) {
+                echoList.push(MultiRequester.echoHash[name])
+            });
+            html = '<div style="white-space:normal;"><base href="' + escapedUrl + '"/>' +
+                   echoList.join('') +
+                   '</div>';
+            try { $U.echo(new XMLList(html)); } catch (e) { $U.log(e); $U.echo(html); }
         }
 
@@ -628 +648 @@
         MultiRequester.doProcess = false;
         $U.echoerr('exception!!: ' + e);
-    }
+    }//}}}
 };
 //}}}