From 5cc1ab2c8df78de6c3adb503400d556c03e36acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Tue, 6 Feb 2018 18:22:37 +0100 Subject: [PATCH] Refactor handling of files in SourceCodeEventHandler --- .../{ => login_projectdir}/login_component.py | 0 .../source_code_event_handler.py | 95 ++++++++++++------- 2 files changed, 59 insertions(+), 36 deletions(-) rename src/event_handlers/{ => login_projectdir}/login_component.py (100%) diff --git a/src/event_handlers/login_component.py b/src/event_handlers/login_projectdir/login_component.py similarity index 100% rename from src/event_handlers/login_component.py rename to src/event_handlers/login_projectdir/login_component.py diff --git a/src/event_handlers/source_code_event_handler.py b/src/event_handlers/source_code_event_handler.py index 6ba7b78..f5b2445 100644 --- a/src/event_handlers/source_code_event_handler.py +++ b/src/event_handlers/source_code_event_handler.py @@ -1,58 +1,81 @@ from shutil import copy, rmtree, copytree -from os.path import splitext +from os.path import splitext, isfile, join +from glob import glob from tfw.util import SupervisorMixin from tfw.config import LOGIN_APP_DIR from tfw.event_handler_base import EventHandlerBase +from tfw.config.logs import logging +log = logging.getLogger(__name__) + + +class FileManager: + def __init__(self, source_directory, working_directory, selected_file=None): + self._sourcedir = source_directory + self._workdir = working_directory + self._reload_files() + self.filename = selected_file or self.files[0] + self.language = map_file_extension_to_language(self.filename) + + def select_file(self, filename): + if not filename in self.files: + raise EnvironmentError('No such file in workdir!') + self.filename = filename + self.language = map_file_extension_to_language(self.filename) + + @property + def files(self): + return [file for file in glob(self._workdir) if isfile(file)] + + @property + def file_contents(self): + with open(self._filepath(self.filename), 'r') as ifile: + return ifile.read() + + @file_contents.setter + def file_contents(self, value): + with open(self._filepath(self.filename), 'w') as ofile: + ofile.write(value) + + def _filepath(self, filename): + return join(self._workdir, filename) + + def _reload_files(self): + rmtree(self._workdir, ignore_errors=True) + copytree(self._sourcedir, self._workdir) + class SourceCodeEventHandler(EventHandlerBase, SupervisorMixin): def __init__(self, anchor, filename, process_name=None): super().__init__(anchor) - self.working_directory = LOGIN_APP_DIR - self.filename = filename - self.language = map_file_extension_to_language(filename) + self.filemanager = FileManager('login_projectdir', LOGIN_APP_DIR, selected_file=filename) self.process_name = process_name or splitext(filename)[0] self.commands = { - 'read': self.read_file, - 'write': self.write_file + 'read': self.read, + 'write': self.write } - self.file = self.create_initial_state() + # Supervisor needs these to run the login program + copy('source_code_server/server.py', LOGIN_APP_DIR) + copy('source_code_server/users.db', LOGIN_APP_DIR) + + def read(self, data_json): + data_json['data'] = { + 'filename': self.filemanager.filename, + 'content': self.filemanager.file_contents, + 'language': self.filemanager.language + } + + def write(self, data_json): + self.filemanager.file_contents = data_json['data']['content'] + self.restart_process() def handle_event(self, anchor, data_json): data = data_json['data'] self.commands[data['command']](data_json) return data_json - def handle_reset(self, data_json): - self.create_initial_state() - - def read_file(self, data_json): - with open(self.file, 'r') as ifile: - content = ifile.read() - data_json['data'] = { - 'filename': self.filename, - 'content': content, - 'language': self.language - } - - def write_file(self, data_json): - data = data_json['data'] - with open(self.file, 'w') as ofile: - ofile.write(data['content']) - self.restart_process() - - def create_initial_state(self): - self.stop_process() - - rmtree(self.working_directory, ignore_errors=True) - copytree('source_code_server/', self.working_directory) - file = copy(self.filename, self.working_directory) - - self.start_process() - return file - def map_file_extension_to_language(filename): language_map = { @@ -61,4 +84,4 @@ def map_file_extension_to_language(filename): '.js': 'javascript' } _, extension = splitext(filename) - return language_map[extension] + return language_map[extension] \ No newline at end of file