From 3cf404ee9ad9e7b093913752ce488dc6837894aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Wed, 7 Mar 2018 09:17:29 +0100 Subject: [PATCH] Implement inotify event ignoration logic --- lib/tfw/components/directory_monitor.py | 13 +++++++++++++ lib/tfw/components/source_code_event_handler.py | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/tfw/components/directory_monitor.py b/lib/tfw/components/directory_monitor.py index 6d2d264..fd69cbb 100644 --- a/lib/tfw/components/directory_monitor.py +++ b/lib/tfw/components/directory_monitor.py @@ -13,6 +13,7 @@ class WebideReloadEventHandler(FileSystemEventHandler): super().__init__() self.uplink = ServerUplinkConnector() self._paused = False + self.ignore = 0 def pause(self): self._paused = True @@ -23,6 +24,9 @@ class WebideReloadEventHandler(FileSystemEventHandler): @RateLimiter(rate_per_second=5) def on_modified(self, event): if self._paused: return + if self.ignore > 0: + self.ignore = self.ignore - 1 + return log.debug(event) key = 'webide' self.uplink.send(key, {'data': {'command': 'reload'}}) @@ -42,6 +46,15 @@ class DirectoryMonitor: self.observer.stop() self.observer.join() + @property + def ignore(self): + return self.eventhandler.ignore + + @ignore.setter + def ignore(self, value): + if value >= 0: self.ignore = value + else: self.ignore = 0 + @property def pauser(self): return DirectoryMonitor.Pauser(self) diff --git a/lib/tfw/components/source_code_event_handler.py b/lib/tfw/components/source_code_event_handler.py index 19896d4..dd26072 100644 --- a/lib/tfw/components/source_code_event_handler.py +++ b/lib/tfw/components/source_code_event_handler.py @@ -68,9 +68,9 @@ class SourceCodeEventHandler(TriggerlessEventHandler): return data def write(self, data): - with self.monitor.pauser: - try: self.filemanager.file_contents = data['content'] - except Exception: log.exception('Error writing file!') + self.monitor.eventhandler.ignore = 1 + try: self.filemanager.file_contents = data['content'] + except Exception: log.exception('Error writing file!') del data['content'] return data