SantaSpeen/KuiToi-Server
1
0
Fork 0
mirror of https://github.com/kuitoi/kuitoi-Server.git synced 2025-08-18 00:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove LuaPluginsLoader from imports;

Browse Source 
Add use_lua to config;
This commit is contained in:
Maxim Khomutov 2023-07-22 05:05:15 +03:00
parent f24ae23eac
commit d13a319f39
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/core.py
View File

@ -16,7 +16,7 @@ from core import utils
from core.Client import Client from core.Client import Client
from core.tcp_server import TCPServer from core.tcp_server import TCPServer
from core.udp_server import UDPServer from core.udp_server import UDPServer
from modules import PluginsLoader, LuaPluginsLoader from modules import PluginsLoader
from modules.WebAPISystem import app as webapp from modules.WebAPISystem import app as webapp
@ -224,8 +224,10 @@ class Core:
os.mkdir(pl_dir) os.mkdir(pl_dir)
pl = PluginsLoader(pl_dir) pl = PluginsLoader(pl_dir)
await pl.load() await pl.load()
lpl = LuaPluginsLoader(pl_dir) if config.Options['use_lua']:
lpl.load() from modules.PluginsLoader.lua_plugins_loader import LuaPluginsLoader
lpl = LuaPluginsLoader(pl_dir)
lpl.load()
try: try:
# WebApi Start # WebApi Start

3
src/modules/ConfigProvider/config_provider.py
View File

@ -10,6 +10,7 @@ import secrets
import yaml import yaml
class Config: class Config:
def __init__(self, auth=None, game=None, server=None, options=None, web=None): def __init__(self, auth=None, game=None, server=None, options=None, web=None):
self.Auth = auth or {"key": None, "private": True} self.Auth = auth or {"key": None, "private": True}
@ -17,7 +18,7 @@ class Config:
self.Server = server or {"name": "KuiToi-Server", "description": "Welcome to KuiToi Server!", self.Server = server or {"name": "KuiToi-Server", "description": "Welcome to KuiToi Server!",
"server_ip": "0.0.0.0", "server_port": 30814} "server_ip": "0.0.0.0", "server_port": 30814}
self.Options = options or {"language": "en", "encoding": "utf-8", "speed_limit": 0, "use_queue": False, self.Options = options or {"language": "en", "encoding": "utf-8", "speed_limit": 0, "use_queue": False,
"debug": False} "debug": False, "use_lua": False}
self.WebAPI = web or {"enabled": False, "server_ip": "127.0.0.1", "server_port": 8433, self.WebAPI = web or {"enabled": False, "server_ip": "127.0.0.1", "server_port": 8433,
"secret_key": secrets.token_hex(16)} "secret_key": secrets.token_hex(16)}

1
src/modules/PluginsLoader/__init__.py
View File

@ -1,2 +1 @@
from .plugins_loader import PluginsLoader from .plugins_loader import PluginsLoader
from .lua_plugins_loader import LuaPluginsLoader

1
src/modules/__init__.py
View File

@ -11,6 +11,5 @@ from .ConfigProvider import ConfigProvider, Config
from .i18n import MultiLanguage from .i18n import MultiLanguage
from .EventsSystem import EventsSystem from .EventsSystem import EventsSystem
from .PluginsLoader import PluginsLoader from .PluginsLoader import PluginsLoader
from .PluginsLoader import LuaPluginsLoader
from .WebAPISystem import web_app from .WebAPISystem import web_app
from .WebAPISystem import _stop as stop_web from .WebAPISystem import _stop as stop_web