Update i18n support

Add new blocks
Add docs

src/core/__init__.py

@@ -1,7 +1,7 @@
 # Developed by KuiToi Dev
 # File core.__init__.py
 # Written by: SantaSpeen
-# Version 1.1
+# Version 1.2
 # Licence: FPA
 # (c) kuitoi.su 2023
 # Special thanks to: AI Sage(https://poe.com/Sage), AI falcon-40b-v7(https://OpenBuddy.ai)
@@ -28,7 +28,7 @@ import builtins
 import os
 import webbrowser
 
-from prompt_toolkit.shortcuts import input_dialog, yes_no_dialog
+import prompt_toolkit.shortcuts as shortcuts
 
 from .utils import get_logger
 from modules import ConfigProvider, EventsSystem, PluginsLoader
@@ -46,13 +46,12 @@ if args.config:
     config_path = args.config
 config_provider = ConfigProvider(config_path)
 config = config_provider.open_config()
-log.info("Use %s for config." % config_path)
 if config.Server['debug'] is True:
     utils.set_debug_status()
-    log.info("Getting new logging with DEBUG level!")
+    log.info("Debug enabled!")
     log = get_logger("init")
     log.debug("Debug mode enabled!")
-    log.debug("Use %s for config." % config)
+    log.debug(f"Server config: {config}")
 
 # i18n init
 log.debug("Initializing i18n...")
@@ -60,28 +59,44 @@ ml = MultiLanguage()
 ml.set_language(args.language)
 ml.builtins_hook()
 
-log.info(i18n.hello)
-
+log.debug("Initializing EventsSystem...")
 ev = EventsSystem()
 ev.builtins_hook()
 
-# Key handler..
-if not config.Auth['key']:
-    log.warn("Key needed for starting the server!")
-    url = "https://beammp.com/k/keys"
-    if yes_no_dialog(
-            title='BEAMP Server Key',
-            text='Key needed for starting the server!\n'
-                 'Do you need to open the web link to obtain the key?').run():
-        webbrowser.open(url, new=2)
+log.info(i18n.hello)
+log.info(i18n.config_path.format(config_path))
 
-    config.Auth['key'] = input_dialog(
+log.debug("Initializing BEAMP Server system...")
+# Key handler..
+private = ((config.Auth['key'] is None or config.Auth['key'] == "") and config.Auth['private'])
+if not private:
+    log.warn(i18n.auth_need_key)
+    url = "https://beammp.com/k/keys"
+    if shortcuts.yes_no_dialog(
+            title='BEAMP Server Key',
+            text=i18n.GUI_need_key_message,
+            yes_text=i18n.GUI_yes,
+            no_text=i18n.GUI_no).run():
+        try:
+            log.debug("Opening browser...")
+            webbrowser.open(url, new=2)
+        except Exception as e:
+            log.error(i18n.auth_cannot_open_browser.format(e))
+            log.info(i18n.auth_use_link.format(url))
+            shortcuts.message_dialog(
+                title='BEAMP Server Key',
+                text=i18n.GUI_cannot_open_browser.format(url),
+                ok_text=i18n.GUI_ok).run()
+
+    config.Auth['key'] = shortcuts.input_dialog(
         title='BEAMP Server Key',
-        text='Please type your key:').run()
+        text=i18n.GUI_enter_key_message,
+        ok_text=i18n.GUI_ok,
+        cancel_text=i18n.GUI_cancel).run()
     config_provider.save_config()
-if not config.Auth['key']:
-    log.error("Key is empty!")
-    log.error("Server stopped!")
+if not private:
+    log.error(i18n.auth_empty_key)
+    log.info(i18n.stop)
     exit(1)
 builtins.config = config
 
@@ -90,14 +105,16 @@ log.debug("Initializing console...")
 console = Console()
 console.builtins_hook()
 # console.logger_hook()
-console.add_command("stop", console.stop, "stop - Just shutting down the server.\nUsage: stop", "Server shutdown.")
-console.add_command("exit", console.stop, "stop - Just shutting down the server.\nUsage: stop", "Server shutdown.")
+console.add_command("stop", console.stop, i18n.man_message_stop, i18n.help_message_stop)
+console.add_command("exit", console.stop, i18n.man_message_exit, i18n.help_message_exit)
 
 if not os.path.exists("mods"):
     os.mkdir("mods")
+
+
+log.debug("Initializing PluginsLoader...")
 if not os.path.exists("plugins"):
     os.mkdir("plugins")
-
 pl = PluginsLoader("plugins")
 pl.load_plugins()
 
@@ -107,4 +124,4 @@ builtins.MB = KB * 1024
 builtins.GB = MB * 1024
 builtins.TB = GB * 1024
 
-log.info(i18n.init)
+log.info(i18n.init_ok)

src/core/core.py

@@ -14,12 +14,13 @@ from .udp_server import UDPServer
 
 class Client:
 
-    def __init__(self, reader, writer):
+    def __init__(self, reader, writer, core):
         self.reader = reader
         self.writer = writer
         self.log = utils.get_logger("client(None:0)")
         self.addr = writer.get_extra_info("sockname")
         self.loop = asyncio.get_event_loop()
+        self.Core = core
         self.cid = 0
         self.key = None
         self.nick = None
@@ -137,11 +138,11 @@ class Core:
 
     def __init__(self):
         self.log = utils.get_logger("core")
+        self.loop = asyncio.get_event_loop()
         self.clients = {}
         self.clients_counter = 0
         self.server_ip = config.Server["server_ip"]
         self.server_port = config.Server["server_port"]
-        self.loop = asyncio.get_event_loop()
         self.tcp = TCPServer
         self.udp = UDPServer
 
@@ -152,14 +153,16 @@ class Core:
             return self.clients.get(sock.getsockname())
 
     def insert_client(self, client):
+        self.log.debug(f"Inserting client: {client.cid}")
         self.clients.update({client.cid: client, client.nick: client})
 
     def create_client(self, *args, **kwargs):
-        cl = Client(*args, **kwargs)
-        self.clients_counter = self.clients_counter + 1
-        cl.id = self.clients_counter
-        cl._update_logger()
-        return cl
+        client = Client(*args, **kwargs)
+        self.clients_counter += 1
+        client.id = self.clients_counter
+        client._update_logger()
+        self.log.debug(f"Create client: {client.cid}; clients_counter: {self.clients_counter}")
+        return client
 
     async def check_alive(self):
         await asyncio.sleep(5)
@@ -174,7 +177,8 @@ class Core:
         self.udp = self.udp(self, self.server_ip, self.server_port)
         tasks = [self.tcp.start(), self.udp.start(), console.start()]  # self.check_alive()
         t = asyncio.wait(tasks, return_when=asyncio.FIRST_EXCEPTION)
-        self.log.info(i18n.ready)
+        self.log.info(i18n.start)
+        # TODO: Server auth
         ev.call_event("on_started")
         await t
         # while True:
@@ -193,5 +197,5 @@ class Core:
         asyncio.run(self.main())
 
     def stop(self):
-        self.log.info("Goodbye!")
+        self.log.info(i18n.stop)
         exit(0)

src/core/core.pyi

@@ -5,21 +5,22 @@
 # Licence: FPA
 # (c) kuitoi.su 2023
 import asyncio
-import socket
-from asyncio import StreamWriter, AbstractEventLoop, StreamReader
-from asyncio.trsock import TransportSocket
+from asyncio import StreamWriter, StreamReader
 
 from core import utils
 from .tcp_server import TCPServer
 from .udp_server import UDPServer
+
+
 class Client:
 
-    def __init__(self, reader: StreamReader, writer: StreamWriter):
+    def __init__(self, reader: StreamReader, writer: StreamWriter, core: Core) -> "Client":
         self.reader = reader
         self.writer = writer
         self.log = utils.get_logger("client(id: )")
         self.addr = writer.get_extra_info("sockname")
         self.loop = asyncio.get_event_loop()
+        self.Core = core
         self.cid = 0
         self.key: str = None
         self.nick: str = None
@@ -32,6 +33,7 @@ class Client:
     async def sync_resources(self) -> None: ...
     async def recv(self) -> bytes: ...
     async def last_handle(self) -> bytes: ...
+    def _update_logger(self) -> None: ...
 
 
 class Core: