Merge pull request #11 from avatao-content/watchdog_hotfix

Watchdog hotfix

lib/tfw/components/directory_monitor.py

@@ -12,9 +12,17 @@ class WebideReloadEventHandler(FileSystemEventHandler):
     def __init__(self):
         super().__init__()
         self.uplink = ServerUplinkConnector()
+        self._paused = False
+
+    def pause(self):
+        self._paused = True
+
+    def resume(self):
+        self._paused = False
 
     @RateLimiter(rate_per_second=5)
     def on_modified(self, event):
+        if self._paused: return
         log.debug(event)
         anchor = 'anchor_webide'
         self.uplink.send(anchor, {'anchor': anchor,
@@ -24,7 +32,9 @@ class WebideReloadEventHandler(FileSystemEventHandler):
 class DirectoryMonitor:
     def __init__(self, directory):
         self.observer = Observer()
-        self.observer.schedule(WebideReloadEventHandler(), directory, recursive=True)
+        self.eventhandler = WebideReloadEventHandler()
+        self.observer.schedule(self.eventhandler, directory, recursive=True)
+        self.pause, self.resume = self.eventhandler.pause, self.eventhandler.resume
 
     def watch(self):
         self.observer.start()
@@ -32,3 +42,15 @@ class DirectoryMonitor:
     def stop(self):
         self.observer.stop()
         self.observer.join()
+
+    @property
+    def pauser(self):
+        return DirectoryMonitor.Pauser(self)
+
+    class Pauser:
+        def __init__(self, directory_monitor):
+            self.directorymonitor = directory_monitor
+        def __enter__(self):
+            self.directorymonitor.pause()
+        def __exit__(self, exc_type, exc_val, exc_tb):
+            self.directorymonitor.resume()

lib/tfw/components/source_code_event_handler.py

@@ -68,9 +68,10 @@ class SourceCodeEventHandler(EventHandlerBase, SupervisorMixin):
         return data
 
     def write(self, data):
-        try: self.filemanager.file_contents = data['content']
-        except Exception: log.exception('Error writing file!')
-        self.restart_process()
+        with self.monitor.pauser:
+            try: self.filemanager.file_contents = data['content']
+            except Exception: log.exception('Error writing file!')
+            self.restart_process()
         return data
 
     def select(self, data):