From dd3ec6bdf40b9914acbc10e7e908ab338750e9ce Mon Sep 17 00:00:00 2001
From: Esa-Matti Suuronen <esa-matti@suuronen.org>
Date: Fri, 22 Jul 2011 10:53:44 +0300
Subject: [PATCH] fix timeout

---
 lib/watcher.coffee | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/lib/watcher.coffee b/lib/watcher.coffee
index e431efe..478a0e9 100644
--- a/lib/watcher.coffee
+++ b/lib/watcher.coffee
@@ -66,27 +66,33 @@ class Watcher extends EventEmitter
     @status = status
     @emit "status", @status
 
+  matches: (filepath) ->
+    for match in @settings.glob.split(" ")
+      if gex(match).on path.basename filepath
+        return true
+    false
+
+  delayedRun: (filepath) ->
+    if not @timer
+      console.log "Setting timer", @name
+      @timer = setTimeout =>
+        console.log "Manual run from timer", @name
+        @onModified filepath, true
+        @timer = null
+      , @settings.interval * 60 * 1000
+
+
+  hasTimeoutPassed: ->
+    timeSinceLastrun = ((new Date()).getTime() - @lastRunTimeStamp) / 1000 / 60
+    timeSinceLastrun > @settings.interval
+
   onModified: (filepath, manual=false) ->
 
     if not manual
-      for match in @settings.glob.split(" ")
-        if gex(match).on path.basename filepath
-          ok = true
-          break
-      return unless ok
-
-      timeSinceLastrun = ((new Date()).getTime() - @lastRunTimeStamp) / 1000 / 60
-      if timeSinceLastrun < @settings.interval
-        console.log "#{ @name } got change on #{ filepath }, but interval is not due yet. #{ @settings.interval - timeSinceLastrun } minutes left"
-
-        if not @timer
-          console.log "Setting timer", @name
-          @timer = setTimeout =>
-            console.log "Manual run from timer", @name
-            @onModified filepath, True
-            @timer = null
-          , @settings.interval * 60 * 1000
-
+      return unless @matches filepath
+      if not @hasTimeoutPassed()
+        console.log "Cannot run #{ @name } yet, time out has not passed"
+        @delayedRun filepath
         return
     else
       console.log "#{ @name } got change on #{ filepath }"