dealt with cases involving rewinding and toggling watching

thomasballinger · thomasballinger · commit 15139f87ed3e · 2014-08-10T00:55:58.000-04:00
diff --git a/bpython/curtsiesfrontend/filewatch.py b/bpython/curtsiesfrontend/filewatch.py
@@ -11,13 +11,17 @@ class ModuleChangedEventHandler(FileSystemEventHandler):
     def __init__(self, paths, on_change):
         self.dirs = defaultdict(set)
         self.on_change = on_change
+        self.modules_to_add_later = []
         self.observer = Observer()
+        self.old_dirs = defaultdict(set)
         for path in paths:
             self.add_module(path)
         self.observer.start()
 
     def reset(self):
         self.dirs = defaultdict(set)
+        del self.modules_to_add_later[:]
+        self.old_dirs = defaultdict(set)
         self.observer.unschedule_all()
 
     def add_module(self, path):
@@ -32,6 +36,22 @@ def add_module(self, path):
             self.observer.schedule(self, dirname, recursive=False)
             self.dirs[os.path.dirname(path)].add(path)
 
+    def add_module_later(self, path):
+        self.modules_to_add_later.append(path)
+
+    def activate(self):
+        self.dirs = self.old_dirs
+        for dirname in self.dirs:
+            self.observer.schedule(self, dirname, recursive=False)
+        for module in self.modules_to_add_later:
+            self.add_module(module)
+        del self.modules_to_add_later[:]
+
+    def deactivate(self):
+        self.observer.unschedule_all()
+        self.old_dirs = self.dirs
+        self.dirs = defaultdict(set)
+
     def on_any_event(self, event):
         dirpath = os.path.dirname(event.src_path)
         paths = [path + '.py' for path in self.dirs[dirpath]]
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -296,7 +296,10 @@ def __enter__(self):
         def new_import(name, globals={}, locals={}, fromlist=[], level=-1):
             m = self.orig_import(name, globals=globals, locals=locals, fromlist=fromlist)
             if hasattr(m, "__file__"):
-                self.watcher.add_module(m.__file__)
+                if self.watching_files:
+                    self.watcher.add_module(m.__file__)
+                else:
+                    self.watcher.add_module_later(m.__file__)
             return m
         __builtins__['__import__'] = new_import
 
@@ -394,12 +397,13 @@ def process_event(self, e):
         elif e in key_dispatch[self.config.toggle_file_watch_key]:
             msg = "Auto-reloading active, watching for file changes..."
             if self.watching_files:
-                self.watcher.reset()
+                self.watcher.deactivate()
                 self.watching_files = False
                 self.status_bar.pop_permanent_message(msg)
             else:
                 self.watching_files = True
                 self.status_bar.push_permanent_message(msg)
+                self.watcher.activate()
 
         elif e in key_dispatch[self.config.reimport_key]:
             self.clear_modules_and_reevaluate()
@@ -580,6 +584,7 @@ def send_session_to_external_editor(self, filename=None):
         self.cursor_offset = len(self.current_line)
 
     def clear_modules_and_reevaluate(self):
+        self.watcher.reset()
         cursor, line = self.cursor_offset, self.current_line
         for modname in sys.modules.keys():
             if modname not in self.original_modules:
@@ -1018,6 +1023,7 @@ def reprint_line(self, lineno, tokens):
             self.display_buffer[lineno] = bpythonparse(format(tokens, self.formatter))
     def reevaluate(self, insert_into_history=False):
         """bpython.Repl.undo calls this"""
+        self.watcher.reset()
         old_logical_lines = self.history
         self.history = []
         self.display_lines = []
