diff --git a/.gitignore b/.gitignore index 3735ec0..c6dcd9b 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,7 @@ env/ savedata/ # Logs -*.log \ No newline at end of file +*.log + +#Trash and unused files +trash/ \ No newline at end of file diff --git a/trash/checkavailable.py b/trash/checkavailable.py deleted file mode 100644 index 127fc02..0000000 --- a/trash/checkavailable.py +++ /dev/null @@ -1,5 +0,0 @@ -from plugins import rmass -from core.operation.operation import buildOperation - -outputs = buildOperation(rmass.checkavailableoperation) - diff --git a/trash/createdispatch.py b/trash/createdispatch.py deleted file mode 100644 index 509cad7..0000000 --- a/trash/createdispatch.py +++ /dev/null @@ -1,17 +0,0 @@ -import importlib -from lifecyclemanager import manageLifecycle -from dispatchstate import buildState - -def buildDispatch(request): - dispatch = [] - - for key in request["module"]: - dispatch.append(request["module"][key]) - - resolveddispatch = "plugins."+ ".".join(dispatch) - - module = importlib.import_module(resolveddispatch) - - mode = request.get("mode", "oneshot") - - return module, mode diff --git a/trash/createthread.py b/trash/createthread.py deleted file mode 100644 index 3d0609d..0000000 --- a/trash/createthread.py +++ /dev/null @@ -1,30 +0,0 @@ -import threading -from lifecycleregistry import registerLifecycle -from lifecyclemanager import manageLifecycle - -threadlist = [] -threadnum = 0 - -def buildThread(module, lifecycles): - global threadnum - threadnum += 1 - - threadname = f"thread.{threadnum}" - - thread = threading.Thread( - target=manageLifecycle, - args=(module, lifecycles) - ) - thread.start() - - registryname = threadname - registryvalue = thread - - lifecycles = registerLifecycle (module, lifecycles, registryname, registryvalue) - - threadlist.append(thread) - - print(threadlist) - print(lifecycles) - - return threadnum, threadname, lifecycles, threadlist diff --git a/trash/dispatcher.py b/trash/dispatcher.py deleted file mode 100644 index ce2ccbd..0000000 --- a/trash/dispatcher.py +++ /dev/null @@ -1,22 +0,0 @@ -from createdispatch import buildDispatch -from createthread import buildThread -from dispatchstate import buildState - -import threading - -def dispatchRequest(request, lifecycles): - - module, mode = buildDispatch(request) - - mode, lifecycles = buildState(module, mode, lifecycles) - - if mode == "stop": - return lifecycles - - else: - threadnum, threadname, lifecycles, threadlist = buildThread(module, lifecycles) - - #print("Active Threads") - #print(threadlist) - - return threadnum, threadname, lifecycles, threadlist diff --git a/trash/dispatchstate.py b/trash/dispatchstate.py deleted file mode 100644 index 78faf36..0000000 --- a/trash/dispatchstate.py +++ /dev/null @@ -1,41 +0,0 @@ -import requests - -from lifecycleregistry import registerLifecycle - -def filterMode(mode): - if mode in ("continuous", "oneshot", "stop"): - state = mode - return state - else: raise ValueError(f"Unsupported lifecycle mode: {mode}") - -def buildState(module, mode, lifecycles): - state = filterMode(mode) - - registryvalue = state - registryname = "mode" - - if state != "stop": - lifecycles = registerLifecycle(module, lifecycles, registryname, registryvalue) - - elif state == "stop": - if not module.name in lifecycles: - - print(f"No registered lifecycle: {module.name}") - - return None - - elif "mode" in lifecycles[module.name] != "stop": - lifecycles = registerLifecycle(module, lifecycles, registryname, registryvalue) - - print(f"Stopping lifecycle: {module.name}") - - #elif mode == "oneshot": - #registryvalue = {"mode": "oneshot"} - #lifecycles = registerLifecycle(module, lifecycles, registryname, registryvalue) - - # else: - #raise ValueError(f"Unsupported lifecycle mode: {mode}") - - #state = registryvalue - - return state, lifecycles diff --git a/trash/lifecyclemanager.py b/trash/lifecyclemanager.py deleted file mode 100644 index 21054db..0000000 --- a/trash/lifecyclemanager.py +++ /dev/null @@ -1,25 +0,0 @@ -import time - -from core.execution.operation import buildOperation -from core.execution.action import buildAction -from core import executeContract - -def manageLifecycle(module, lifecycles): #lifecycles, state): - #print(lifecycles[module.name]["mode"]) - - if lifecycles[module.name]["mode"] == "continuous": - while lifecycles[module.name]["mode"] == "continuous": - print(lifecycles) - - outputs = executeContract(module, None, None) - - #print(lifecycles) - - time.sleep(module.sleeptime) - - elif lifecycles[module.name]["mode"] == "oneshot": - print(lifecycles) - outputs = executeContract(module, None, None) - - #print(lifecycles) - return diff --git a/trash/lifecycleregistry.py b/trash/lifecycleregistry.py deleted file mode 100644 index 86ddab0..0000000 --- a/trash/lifecycleregistry.py +++ /dev/null @@ -1,8 +0,0 @@ -def registerLifecycle(module, lifecycles, registryname, registryvalue): - if module.name not in lifecycles: - lifecycles[module.name] = {} - - - lifecycles[module.name][registryname] = registryvalue - - return lifecycles diff --git a/trash/manage.py b/trash/manage.py deleted file mode 100644 index 898b8d2..0000000 --- a/trash/manage.py +++ /dev/null @@ -1,4 +0,0 @@ -from plugins import rmass -from operation import buildOperation - -outputs = buildOperation(rmass.checkavailableoperation) diff --git a/trash/manager.py b/trash/manager.py deleted file mode 100644 index 629aa24..0000000 --- a/trash/manager.py +++ /dev/null @@ -1,4 +0,0 @@ -from core.manager.manager import buildManager -from plugins import rmass - -outputs = buildManager(rmass.manager) diff --git a/trash/server.py b/trash/server.py deleted file mode 100644 index 6540a8c..0000000 --- a/trash/server.py +++ /dev/null @@ -1,29 +0,0 @@ -import socket -import json -from dispatcher import dispatchRequest -#from createthread import buildThread - -server = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - -server.bind(("127.0.0.1", 19002)) - -lifecycles = {} - -server.listen() - -while True: - connection, address = server.accept() - - while True: - data = connection.recv(4096) - - request = json.loads(data) - -# if not data: -# break - - dispatch = dispatchRequest(request, lifecycles) - - connection.close() - -# server.close()