Merge branch 'watch-files' of https://github.com/bpython/bpython into cleaning

ikanobori · ikanobori · commit 6ebfbd5f3bcd · 2014-08-01T16:04:44.000+02:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -3,8 +3,10 @@
 import sys
 import code
 import logging
+from subprocess import Popen, PIPE
 from optparse import Option
 from itertools import izip
+from functools import wraps
 
 import curtsies
 import curtsies.window
@@ -17,6 +19,8 @@
 from bpython.translations import _
 from bpython.importcompletion import find_iterator
 
+import wdtest
+
 repl = None # global for `from bpython.curtsies import repl`
 #WARNING Will be a problem if more than one repl is ever instantiated this way
 
@@ -71,15 +75,38 @@ def mainloop(config, locals_, banner, interp=None, paste=None, interactive=True)
                 hide_cursor=False,
                 extra_bytes_callback=input_generator.unget_bytes) as window:
 
+            reload_requests = []
+            def request_reload():
+                reload_requests.append('reload!')
             refresh_requests = []
             def request_refresh():
                 refresh_requests.append(curtsies.events.RefreshRequestEvent())
+
+            watcher = wdtest.ModuleChangedEventHandler([], request_reload)
+
+            orig_import = __builtins__['__import__']
+            @wraps(orig_import)
+            def new_import(name, globals={}, locals={}, fromlist=[], level=-1):
+                m = orig_import(name, globals=globals, locals=locals, fromlist=fromlist)
+                watcher.add_module(m.__file__)
+                return m
+            __builtins__['__import__'] = new_import
+
             def event_or_refresh(timeout=None):
                 while True:
                     if refresh_requests:
                         yield refresh_requests.pop()
                     else:
-                        yield input_generator.send(timeout)
+                        while True:
+                            if reload_requests:
+                                del reload_requests[:]
+                                e = '<F6>'
+                                print 'asdf'
+                            else:
+                                e = input_generator.send(.2)
+                            if e is not None:
+                                break
+                        yield e
 
             global repl # global for easy introspection `from bpython.curtsies import repl`
             with Repl(config=config,
diff --git a/bpython/curtsiesfrontend/beeper.py b/bpython/curtsiesfrontend/beeper.py
@@ -0,0 +1,9 @@
+import time
+import sys
+
+if __name__ == '__main__':
+    while True:
+        sys.stdout.write('beep\n')
+        sys.stdout.flush()
+        time.sleep(5)
+
diff --git a/bpython/frontends/curtsies/repl.py b/bpython/frontends/curtsies/repl.py
@@ -10,6 +10,7 @@
 import sys
 import tempfile
 import threading
+import time
 import unicodedata
 
 from bpython import autocomplete
@@ -425,6 +426,7 @@ def process_event(self, e):
         elif e in key_dispatch[self.config.reimport_key]:
             self.clear_modules_and_reevaluate()
             self.update_completion()
+            self.status_bar.message(_('Reloaded at ')+time.strftime('%H:%M:%S'))
         elif e in key_dispatch[self.config.undo_key]: #ctrl-r for undo
             self.undo()
             self.update_completion()
diff --git a/wdtest.py b/wdtest.py
@@ -0,0 +1,49 @@
+import time
+import os
+from collections import defaultdict
+
+from bpython import importcompletion
+
+from watchdog.observers import Observer
+from watchdog.events import FileSystemEventHandler
+
+class ModuleChangedEventHandler(FileSystemEventHandler):
+    def __init__(self, paths, on_change):
+        self.dirs = defaultdict(list)
+        self.on_change = on_change
+        self.observer = Observer()
+        for path in paths:
+            self.add_module(path)
+        self.observer.start()
+
+    def add_module(self, path):
+        """Add a python module to track changes to"""
+        path = os.path.abspath(path)
+        for suff in importcompletion.SUFFIXES:
+            if path.endswith(suff):
+                path = path[:-len(suff)]
+                break
+        dirname = os.path.dirname(path)
+        if dirname not in self.dirs:
+            self.observer.schedule(self, dirname, recursive=False)
+            self.dirs[os.path.dirname(path)].append(path)
+
+    def on_any_event(self, event):
+        dirpath = os.path.dirname(event.src_path)
+        paths = [path + suffix for suffix in importcompletion.SUFFIXES
+                               for path in self.dirs[dirpath]]
+        if event.src_path in paths:
+            pass
+            #self.on_change()
+        self.on_change()
+
+if __name__ == '__main__':
+    m = ModuleChangedEventHandler([])
+    m.add_module('./wdtest.py')
+    try:
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt:
+        m.observer.stop()
+    m.observer.join()
+
