udpate pushfind multi

1 files changed, 89 insertions, 34 deletions

diff --git a/pushfind.js b/pushfind.js
index 04e0c8f..06e3e98 100755
--- a/pushfind.js
+++ b/pushfind.js
@@ -2,51 +2,106 @@
 // PLUGIN_INFO {{{
 let PLUGIN_INFO = xml`
 <VimperatorPlugin>
-  <name>PushFind</name>
-  <name lang="ja">プッシュファインド</name>
-  <description>push FIndHistory word searched on google</description>
-  <description lang="ja">Google検索したワードをfindの履歴に放り込みます</description>
-  <version>1.0</version>
-  <author mail="hiro@elzup.com" homepage="blog.elzup.com">elzup</author>
-  <minVersion>2.0pre</minVersion>
-  <maxVersion>2.0pre</maxVersion>
-  <detail lang="ja"><![CDATA[
-  ]]></detail>
+<name>PushFind</name>
+<name lang="ja">プッシュファインド</name>
+<description>push FIndHistory word searched on google</description>
+<description lang="ja">Google検索したワードをfindの履歴に放り込みます</description>
+<version>1.1</version>
+<author mail="hiro@elzup.com" homepage="blog.elzup.com">elzup</author>
+<minVersion>2.0pre</minVersion>
+<maxVersion>2.0pre</maxVersion>
+<detail lang="ja"><![CDATA[
+]]></detail>
 </VimperatorPlugin>`;
 // }}}
 
 (function () {
+  /* n文字以下は弾く */
+  var skip_char_num = 2;
+  /* 実行した際にコマンドラインにechoする */
+  var is_echo_pushfind = true;
+  /* ヒットした文字列を逆に流し込む */
+  var is_reverse_push = true;
+  var pushfind_configs = 
+  [
+{ 
+  name: "wikipedia",
+  url: 'http:\/\/ja.wikipedia.org\/wiki/*',
+  get_regex: /http:\/\/ja.wikipedia.org\/wiki\/([^#\/]*)/,
+  delimiter: "+"
+},
+{ 
+  name: "nicovideo",
+  url: 'http:\/\/www.nicovideo.jp\/search\/*',
+  get_regex: /http:\/\/www.nicovideo.jp\/search\/(.*)/,
+  delimiter: "%20"
+},
+{ 
+  name: "google",
+  url: 'https:\/\/www.google.co.jp\/search.*',
+  get_regex: /google.co.jp\/search.*[&?]q=(.*?)&/,
+  delimiter: "+"
+},
+];
+
+  var urls,hiturl;
+  urls = [];
+  for each (var cf in pushfind_configs) {
+    urls.push(cf.url);
+  }
+  hiturl = "(" + urls.join("|") + ")";
 
   autocommands.add(
       'PageLoad',
-      'https:\/\/www.google.co.jp\/search.*',
+      hiturl,
       function (args) {
-        var get_regex,delimiter,res,words;
-        var hs = storage['history-search'];
-        get_regex = /google.co.jp\/search.*[&?]q=(.*?)&/;
-        delimiter = "+";
-        res = args.url.match(get_regex);
-        if (res[1]) {
-          words = res[1].split(delimiter);
-        }
-        for (var i = 0; i < words.length; i++) {
-          /*
-           * 最近のfindワードと被っていたらそれをpopする
-           var l = hs.length;
-           for (var j = l - 1; j >= l - recent_pop; j--) {
-           if (hs.get(j) == words[i]) {
-           }
-           var w = hs.get(j);
-           }
-           */
-          hs.push(decodeURI(words[i]));
+        var words, res, hits, hs, pushwords;
+        hs = storage['history-search'];
+        for each (var cf in pushfind_configs) {
+          liberator.echomsg("pushfind: " + cf.name + "check start");
+          pushwords = [];
+          hits = (args.url.match(cf.get_regex));
+          if (!hits || !hits[1]) {
+            //          liberator.echomsg(is_echo_pushfind ? "pushfind: [no hits]" + pushwords : "");
+            continue;
+            //          return;
+          }
+          res = hits[1];
+          if (!cf.delimiter) {
+            words.push(res);
+          } else {
+            words = res.split(cf.delimiter);
+          }
+          for (var i = 0; i < words.length; i++) {
+            var w = decodeURI(words[i]);
+            if (!w || pushwords.indexOf(w) != -1) {
+              continue;
+            }
+            pushwords.push(w);
+            /*
+             * 最近のfindワードと被っていたらそれをpopする
+             var l = hs.length;
+             for (var j = l - 1; j >= l - recent_pop; j--) {
+             if (hs.get(j) == words[i]) {
+             }
+             var w = hs.get(j);
+             }
+             */
+          }
+          if (is_reverse_push) {
+            pushwords.reverse();
+          }
+          for (var i = 0; i < pushwords.length; i++) {
+            hs.push(pushwords[i]);
+          }
+          // autocommandsの出力をクリア
+          // 抑制方法がわからない
+          break;
         }
-
-        // autocommandsの出力をクリア
-        // 抑制方法がわからない
-        liberator.echomsg("");
+        liberator.echomsg(is_echo_pushfind ? "pushfind: " + pushwords : "");
       }
   );
+  liberator.echomsg("pushfind: 3.8 loaded");
 })();
 
 // vim:sw=2 ts=2 et si fdm=marker: