Fix handling of 'forever' delay (fixes #125)

livereload/watcher.py

@@ -95,7 +95,7 @@ def examine(self):
             if changed:
                 func = item['func']
                 delay = item['delay']
-                if delay and isinstance(delay, float):
+                if delay and isinstance(delay, float) or delay == 'forever':
                     delays.add(delay)
                 if func:
                     name = getattr(func, 'name', None)
@@ -108,8 +108,10 @@ def examine(self):
                     else:
                         func()
 
-        if delays:
-            delay = max(delays)
+        if delays == {'forever'}:
+            delay = 'forever'
+        elif delays:
+            delay = max(delays - {'forever'})
         else:
             delay = None
         return self.filepath, delay

tests/test_watcher.py

@@ -150,3 +150,18 @@ def test_watch_multiple_dirs(self):
         os.remove(second_path)
         assert watcher.examine() == (second_path, None)
         assert watcher.examine() == (None, None)
+
+    def test_watch_delay_forever(self):
+        watcher = Watcher()
+
+        filepath = os.path.join(tmpdir, 'foo')
+        abs_filepath = os.path.abspath(filepath)
+
+        with open(filepath, 'w') as f:
+            f.write('')
+
+        watcher.watch(filepath, delay=1.0)
+        watcher.watch(filepath, delay='forever')
+
+        assert watcher.examine() == (abs_filepath, 'forever')
+        assert watcher.examine() == (None, None)