Move mixins and decorators to tfw module from tfw.components

lib/tfw/components/decorators/__init__.py

@@ -1,4 +0,0 @@
-# Copyright (C) 2018 Avatao.com Innovative Learning Kft.
-# All Rights Reserved. See LICENSE file for details.
-
-from .rate_limiter import RateLimiter

lib/tfw/components/decorators/rate_limiter.py

@@ -1,25 +0,0 @@
-# Copyright (C) 2018 Avatao.com Innovative Learning Kft.
-# All Rights Reserved. See LICENSE file for details.
-
-from functools import wraps
-from time import time, sleep
-
-
-class RateLimiter:
-    def __init__(self, rate_per_second):
-        self.min_interval = 1 / float(rate_per_second)
-        self.last_call = time()
-
-    def __call__(self, fun):
-        @wraps(fun)
-        def wrapper(*args, **kwargs):
-            self._limit_rate()
-            fun(*args, **kwargs)
-        return wrapper
-
-    def _limit_rate(self):
-        since_last_call = time() - self.last_call
-        to_next_call = self.min_interval - since_last_call
-        self.last_call = time()
-        if to_next_call > 0:
-            sleep(to_next_call)

lib/tfw/components/directory_monitor.py

@@ -6,8 +6,8 @@ from functools import wraps
 from watchdog.events import FileSystemEventHandler as FileSystemWatchdogEventHandler
 
 from tfw.networking.event_handlers import ServerUplinkConnector
-from tfw.components.decorators import RateLimiter
-from tfw.components.mixins import ObserverMixin
+from tfw.decorators import RateLimiter
+from tfw.mixins import ObserverMixin
 
 from tfw.config.logs import logging
 

lib/tfw/components/history_monitor.py

@@ -8,8 +8,8 @@ from abc import ABC, abstractmethod
 
 from watchdog.events import PatternMatchingEventHandler
 
-from tfw.components.mixins import CallbackMixin, ObserverMixin
-from tfw.components.decorators import RateLimiter
+from tfw.mixins import CallbackMixin, ObserverMixin
+from tfw.decorators import RateLimiter
 
 
 class CallbackEventHandler(PatternMatchingEventHandler, ABC):

lib/tfw/components/mixins/__init__.py

@@ -1,6 +0,0 @@
-# Copyright (C) 2018 Avatao.com Innovative Learning Kft.
-# All Rights Reserved. See LICENSE file for details.
-
-from .supervisor_mixin import SupervisorMixin
-from .callback_mixin import CallbackMixin
-from .observer_mixin import ObserverMixin

lib/tfw/components/mixins/callback_mixin.py

@@ -1,20 +0,0 @@
-# Copyright (C) 2018 Avatao.com Innovative Learning Kft.
-# All Rights Reserved. See LICENSE file for details.
-
-from functools import partial
-
-
-class CallbackMixin:
-    def __init__(self):
-        self._callbacks = []
-
-    def subscribe_callback(self, callback, *args, **kwargs):
-        fun = partial(callback, *args, **kwargs)
-        self._callbacks.append(fun)
-
-    def unsubscribe_callback(self, callback):
-        self._callbacks.remove(callback)
-
-    def _execute_callbacks(self, *args, **kwargs):
-        for callback in self._callbacks:
-            callback(*args, **kwargs)

lib/tfw/components/mixins/observer_mixin.py

@@ -1,16 +0,0 @@
-# Copyright (C) 2018 Avatao.com Innovative Learning Kft.
-# All Rights Reserved. See LICENSE file for details.
-
-from watchdog.observers import Observer
-
-
-class ObserverMixin:
-    def __init__(self):
-        self.observer = Observer()
-
-    def watch(self):
-        self.observer.start()
-
-    def stop(self):
-        self.observer.stop()
-        self.observer.join()

lib/tfw/components/mixins/supervisor_mixin.py

@@ -1,30 +0,0 @@
-# Copyright (C) 2018 Avatao.com Innovative Learning Kft.
-# All Rights Reserved. See LICENSE file for details.
-
-import xmlrpc.client
-from xmlrpc.client import Fault as SupervisorFault
-from contextlib import suppress
-from os import remove
-
-from tfw.config import TFWENV
-
-
-class SupervisorMixin:
-    supervisor = xmlrpc.client.ServerProxy(TFWENV.SUPERVISOR_HTTP_URI).supervisor
-
-    def stop_process(self, process_name):
-        with suppress(SupervisorFault):
-            self.supervisor.stopProcess(process_name)
-
-    def start_process(self, process_name):
-        self.supervisor.startProcess(process_name)
-
-    def read_log(self, process_name):
-        logs = self.supervisor.readProcessStderrLog(process_name, 0, 0)
-        remove(self.supervisor.getProcessInfo(process_name)['stderr_logfile'])
-        self.supervisor.clearProcessLogs(process_name)
-        return logs
-
-    def restart_process(self, process_name):
-        self.stop_process(process_name)
-        self.start_process(process_name)

lib/tfw/components/process_managing_event_handler.py

@@ -4,7 +4,7 @@
 from xmlrpc.client import Fault as SupervisorFault
 
 from tfw import TriggerlessEventHandler
-from tfw.components.mixins import SupervisorMixin
+from tfw.mixins import SupervisorMixin
 from tfw.config.logs import logging
 from .directory_monitor import with_monitor_paused