Move DirectoryManagingEventHandler to seperate module

This commit is contained in:
Kristóf Tóth 2018-03-20 14:29:14 +01:00
parent 598cf6218a
commit 359e478069
2 changed files with 68 additions and 64 deletions

View File

@ -1,10 +1,8 @@
from watchdog.observers import Observer from watchdog.observers import Observer
from watchdog.events import FileSystemEventHandler from watchdog.events import FileSystemEventHandler
from os.path import exists, isdir
from tfw.networking.event_handlers.server_connector import ServerUplinkConnector from tfw.networking.event_handlers.server_connector import ServerUplinkConnector
from tfw.components.decorators import RateLimiter from tfw.components.decorators import RateLimiter
from tfw.event_handler_base import TriggerlessEventHandler
from tfw.config.logs import logging from tfw.config.logs import logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -67,65 +65,3 @@ class DirectoryMonitor:
self.directorymonitor.pause() self.directorymonitor.pause()
def __exit__(self, exc_type, exc_val, exc_tb): def __exit__(self, exc_type, exc_val, exc_tb):
self.directorymonitor.resume() self.directorymonitor.resume()
class DirectoryMonitoringEventHandler(TriggerlessEventHandler):
def __init__(self, key, directory):
super().__init__(key)
self._directory = directory
self._monitor = None
self.reload_monitor()
self.commands = {'pause': self.pause,
'resume': self.resume,
'ignore': self.ignore,
'selectdir': self.selectdir}
@property
def directory(self):
return self._directory
@directory.setter
def directory(self, directory):
if not exists(directory) or not isdir(directory): raise EnvironmentError('No such directory!')
self._directory = directory
@property
def monitor(self):
return self._monitor
def reload_monitor(self):
if self._monitor:
try: self._monitor.stop()
except KeyError: logging.debug('Working directory was removed ignoring...')
self._monitor = DirectoryMonitor(self._directory)
self._monitor.watch() # This runs on a separate thread
def handle_event(self, key, message):
try:
message['data'] = self.commands[message['data']['command']](message['data'])
return message
except KeyError:
log.error('IGNORING MESSAGE: Invalid message received: {}'.format(message))
def pause(self, data):
self.monitor.pause()
return data
def resume(self, data):
self.monitor.resume()
return data
def ignore(self, data):
self.monitor.ignore += data['ignore']
return data
def selectdir(self, data):
try:
self.directory = data['directory']
self.reload_monitor()
return data
except EnvironmentError:
log.error('Failed to switch directory!')
def cleanup(self):
self.monitor.stop()

View File

@ -0,0 +1,68 @@
from os.path import isdir, exists
from tfw.components.directory_monitor import DirectoryMonitor
from tfw.event_handler_base import TriggerlessEventHandler
from tfw.config.logs import logging
log = logging.getLogger(__name__)
class DirectoryMonitoringEventHandler(TriggerlessEventHandler):
def __init__(self, key, directory):
super().__init__(key)
self._directory = directory
self._monitor = None
self.reload_monitor()
self.commands = {'pause': self.pause,
'resume': self.resume,
'ignore': self.ignore,
'selectdir': self.selectdir}
@property
def directory(self):
return self._directory
@directory.setter
def directory(self, directory):
if not exists(directory) or not isdir(directory): raise EnvironmentError('No such directory!')
self._directory = directory
@property
def monitor(self):
return self._monitor
def reload_monitor(self):
if self._monitor:
try: self._monitor.stop()
except KeyError: logging.debug('Working directory was removed ignoring...')
self._monitor = DirectoryMonitor(self._directory)
self._monitor.watch() # This runs on a separate thread
def handle_event(self, key, message):
try:
message['data'] = self.commands[message['data']['command']](message['data'])
return message
except KeyError:
log.error('IGNORING MESSAGE: Invalid message received: {}'.format(message))
def pause(self, data):
self.monitor.pause()
return data
def resume(self, data):
self.monitor.resume()
return data
def ignore(self, data):
self.monitor.ignore += data['ignore']
return data
def selectdir(self, data):
try:
self.directory = data['directory']
self.reload_monitor()
return data
except EnvironmentError:
log.error('Failed to switch directory!')
def cleanup(self):
self.monitor.stop()