From a39dd65b8fde8869b6410bb1a2cf2eda43d082a1 Mon Sep 17 00:00:00 2001
From: anekos
Date: Fri, 20 Mar 2009 05:23:19 +0000
Subject: エラーが起きたときに監視対象登録失敗するのを修正

git-svn-id: http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk@31393 d0d07461-0603-4401-acd4-de1884942a52
---
 auto_source.js | 68 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 52 insertions(+), 16 deletions(-)

(limited to 'auto_source.js')

diff --git a/auto_source.js b/auto_source.js
index 1578780..6baa0f9 100644
--- a/auto_source.js
+++ b/auto_source.js
@@ -1,16 +1,50 @@
-var PLUGIN_INFO =
+/* NEW BSD LICENSE {{{
+Copyright (c) 2009, anekos.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+    3. The names of the authors may not be used to endorse or promote products
+       derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
+###################################################################################
+# http://sourceforge.jp/projects/opensource/wiki/licenses%2Fnew_BSD_license       #
+# に参考になる日本語訳がありますが、有効なのは上記英文となります。                #
+###################################################################################
+
+}}} */
+
+// PLUGIN_INFO {{{
+let PLUGIN_INFO =
 <VimperatorPlugin>
-  <name> Auto Source </name>
+  <name>Auto Source</name>
   <description>Sourcing automatically when the specified file is modified.</description>
   <description lang="ja">指定のファイルが変更されたら自動で :so する。</description>
-  <version>1.4</version>
+  <version>1.4.1</version>
   <author mail="anekos@snca.net" homepage="http://d.hatena.ne.jp/nokturnalmortum/">anekos</author>
   <minVersion>2.0pre</minVersion>
   <maxVersion>2.0pre</maxVersion>
   <updateURL>http://svn.coderepos.org/share/lang/javascript/vimperator-plugins/trunk/auto_source.js</updateURL>
-  <license document="http://creativecommons.org/licenses/by-sa/3.0/">
-    Creative Commons Attribution-Share Alike 3.0 Unported
-  </license>
+  <license>new BSD License (Please read the source code comments of this plugin)</license>
+  <license lang="ja">修正BSDライセンス (ソースコードのコメントを参照してください)</license>
   <detail><![CDATA[
     == Commands ==
     Start watching:
@@ -32,6 +66,7 @@ var PLUGIN_INFO =
       - :autoso[urce]! taro.js
   ]]></detail>
 </VimperatorPlugin>;
+// }}}
 
 // Links:
 //    http://d.hatena.ne.jp/nokturnalmortum/20081114#1226652163
@@ -74,21 +109,22 @@ var PLUGIN_INFO =
     }
     let last = firstTime ? null : getFileModifiedTime(filepath);
     let handle = setInterval(function () {
+      let current;
       try {
-        let current = getFileModifiedTime(filepath);
-        if (last != current) {
-          liberator.log('sourcing: ' + filepath);
-          last = current;
-          io.source(filepath);
-          if (command) {
-              liberator.log('command execute: ' + command);
-              liberator.execute(command);
-          }
-        }
+        current = getFileModifiedTime(filepath);
       } catch (e) {
         liberator.echoerr('Error! ' + filepath);
         killWatcher(filepath);
       }
+      if (last != current) {
+        liberator.log('sourcing: ' + filepath);
+        last = current;
+        io.source(filepath);
+        if (command) {
+            liberator.log('command execute: ' + command);
+            liberator.execute(command);
+        }
+      }
     }, interval);
     liberator.log('filepath: ' + filepath + (command ? ('; command: ' + command) : ''));
     files.push({handle: handle, path: filepath});
-- 
cgit v1.2.3