mirror of
https://github.com/avatao-content/baseimage-tutorial-framework
synced 2025-06-28 21:55:13 +00:00
Make project comply new coding standards and pylint
This commit is contained in:
@ -61,7 +61,8 @@ class WebideReloadWatchdogEventHandler(FileSystemWatchdogEventHandler):
|
||||
|
||||
@RateLimiter(rate_per_second=2)
|
||||
def on_modified(self, event):
|
||||
if self._paused: return
|
||||
if self._paused:
|
||||
return
|
||||
if self.ignore > 0:
|
||||
self.ignore = self.ignore - 1
|
||||
return
|
||||
|
@ -24,7 +24,8 @@ class DirectoryMonitoringEventHandler(TriggerlessEventHandler):
|
||||
|
||||
@directory.setter
|
||||
def directory(self, directory):
|
||||
if not exists(directory) or not isdir(directory): raise EnvironmentError('No such directory!')
|
||||
if not exists(directory) or not isdir(directory):
|
||||
raise EnvironmentError('No such directory!')
|
||||
self._directory = directory
|
||||
|
||||
@property
|
||||
@ -33,8 +34,10 @@ class DirectoryMonitoringEventHandler(TriggerlessEventHandler):
|
||||
|
||||
def reload_monitor(self):
|
||||
if self._monitor:
|
||||
try: self._monitor.stop()
|
||||
except KeyError: logging.debug('Working directory was removed – ignoring...')
|
||||
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
|
||||
|
||||
|
@ -1,5 +1,6 @@
|
||||
from os.path import dirname
|
||||
from re import compile, findall
|
||||
from re import findall
|
||||
from re import compile as compileregex
|
||||
from abc import ABC, abstractmethod
|
||||
|
||||
from watchdog.observers import Observer
|
||||
@ -39,7 +40,7 @@ class HistoryMonitor(CallbackMixin, ABC):
|
||||
def _fetch_history(self):
|
||||
self._last_length = len(self._history)
|
||||
with open(self.histfile, 'r') as ifile:
|
||||
pattern = compile(self.command_pattern)
|
||||
pattern = compileregex(self.command_pattern)
|
||||
data = ifile.read()
|
||||
self._history = [self.sanitize_command(command) for command in findall(pattern, data)]
|
||||
|
||||
|
@ -22,8 +22,10 @@ class FileManager:
|
||||
|
||||
@exclude.setter
|
||||
def exclude(self, exclude):
|
||||
if exclude is None: return
|
||||
if not isinstance(exclude, Iterable): raise TypeError('Exclude must be Iterable!')
|
||||
if exclude is None:
|
||||
return
|
||||
if not isinstance(exclude, Iterable):
|
||||
raise TypeError('Exclude must be Iterable!')
|
||||
self._exclude = exclude
|
||||
|
||||
@property
|
||||
@ -89,28 +91,38 @@ class SourceCodeEventHandler(TriggerlessEventHandler):
|
||||
|
||||
def reload_monitor(self):
|
||||
if self._monitor:
|
||||
try: self._monitor.stop()
|
||||
except KeyError: logging.debug('Working directory was removed – ignoring...')
|
||||
try:
|
||||
self._monitor.stop()
|
||||
except KeyError:
|
||||
logging.debug('Working directory was removed – ignoring...')
|
||||
self._monitor = DirectoryMonitor(self.filemanager.workdir)
|
||||
self._monitor.watch() # This runs on a separate thread
|
||||
|
||||
def read(self, data):
|
||||
try: data['content'] = self.filemanager.file_contents
|
||||
except PermissionError: data['content'] = 'You have no permission to open that file :('
|
||||
except FileNotFoundError: data['content'] = 'This file was removed :('
|
||||
except Exception: data['content'] = 'Failed to read file :('
|
||||
try:
|
||||
data['content'] = self.filemanager.file_contents
|
||||
except PermissionError:
|
||||
data['content'] = 'You have no permission to open that file :('
|
||||
except FileNotFoundError:
|
||||
data['content'] = 'This file was removed :('
|
||||
except Exception:
|
||||
data['content'] = 'Failed to read file :('
|
||||
return data
|
||||
|
||||
def write(self, data):
|
||||
self.monitor.ignore = self.monitor.ignore + 1
|
||||
try: self.filemanager.file_contents = data['content']
|
||||
except Exception: LOG.exception('Error writing file!')
|
||||
try:
|
||||
self.filemanager.file_contents = data['content']
|
||||
except Exception:
|
||||
LOG.exception('Error writing file!')
|
||||
del data['content']
|
||||
return data
|
||||
|
||||
def select(self, data):
|
||||
try: self.filemanager.filename = data['filename']
|
||||
except EnvironmentError: LOG.exception('Failed to select file "%s"', data['filename'])
|
||||
try:
|
||||
self.filemanager.filename = data['filename']
|
||||
except EnvironmentError:
|
||||
LOG.exception('Failed to select file "%s"', data['filename'])
|
||||
return data
|
||||
|
||||
def select_dir(self, data):
|
||||
@ -127,8 +139,10 @@ class SourceCodeEventHandler(TriggerlessEventHandler):
|
||||
return data
|
||||
|
||||
def exclude(self, data):
|
||||
try: self.filemanager.exclude = list(data['exclude'])
|
||||
except TypeError: LOG.error('Exclude must be Iterable!')
|
||||
try:
|
||||
self.filemanager.exclude = list(data['exclude'])
|
||||
except TypeError:
|
||||
LOG.error('Exclude must be Iterable!')
|
||||
return data
|
||||
|
||||
def attach_fileinfo(self, data):
|
||||
|
Reference in New Issue
Block a user