pymud 0.20.4__py3-none-any.whl → 0.21.0__py3-none-any.whl

pymud/pymud.py

@@ -15,7 +15,7 @@ from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.layout.dimension import D
 from prompt_toolkit.layout.menus import CompletionsMenu
 from prompt_toolkit.styles import Style
-from prompt_toolkit.widgets import Label, MenuItem, TextArea
+from prompt_toolkit.widgets import Label, TextArea
 from prompt_toolkit.mouse_events import MouseEvent, MouseEventType
 from prompt_toolkit.cursor_shapes import CursorShape
 from prompt_toolkit.key_binding import KeyPress, KeyPressEvent
@@ -34,9 +34,10 @@ from prompt_toolkit.layout.processors import (
     HighlightSelectionProcessor,
 )
 from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
+from wcwidth import wcwidth, wcswidth
 
 from .objects import CodeBlock
-from .extras import MudFormatProcessor, SessionBuffer, EasternMenuContainer, VSplitWindow, SessionBufferControl, DotDict
+from .extras import MudFormatProcessor, SessionBuffer, EasternMenuContainer, VSplitWindow, SessionBufferControl, DotDict, MenuItem
 from .modules import Plugin
 from .session import Session
 from .settings import Settings
@@ -75,7 +76,18 @@ class PyMudApp:
         构造PyMudApp对象实例，并加载替代配置。
         """
 
+        from .i18n import i18n_LoadLanguage, i18n_ListAvailableLanguages
+        # 加载默认chs语言内容，以防翻译不完整时，默认使用中文替代
+        i18n_LoadLanguage("chs")
+
         if cfg_data and isinstance(cfg_data, dict):
+            # load language from 
+            language = Settings.language
+            if "language" in cfg_data.keys():
+                if cfg_data["language"] in i18n_ListAvailableLanguages() and cfg_data["language"] != "chs":
+                    language = cfg_data["language"]
+                    i18n_LoadLanguage(language)
+            
             for key in cfg_data.keys():
                 if key == "sessions":
                     Settings.sessions = cfg_data[key]
@@ -89,6 +101,8 @@ class PyMudApp:
                     Settings.styles.update(cfg_data[key])
                 elif key == "keys":
                     Settings.keys.update(cfg_data[key])
+                elif key == "language":
+                    Settings.language = cfg_data[key]
 
         self._mouse_support = True
         self._plugins  = DotDict()              # 增加 插件 字典
@@ -303,26 +317,26 @@ class PyMudApp:
             body = self.body,
             menu_items=[
                 MenuItem(
-                    Settings.text["world"],
+                    Settings.gettext("world"),
                     children=self.create_world_menus(),
                 ),
                 MenuItem(
-                    Settings.text["session"],
+                    Settings.gettext("session"),
                     children=[
-                        MenuItem(Settings.text["connect"], handler = self.act_connect),
-                        MenuItem(Settings.text["disconnect"], handler = self.act_discon),
-                        MenuItem(Settings.text["closesession"], handler = self.act_close_session),
-                        MenuItem(Settings.text["autoreconnect"], handler = self.act_autoreconnect),
+                        MenuItem(Settings.gettext("disconnect"), handler = self.act_discon),
+                        MenuItem(Settings.gettext("connect"), handler = self.act_connect),
+                        MenuItem(Settings.gettext("closesession"), handler = self.act_close_session),
+                        MenuItem(Settings.gettext("autoreconnect"), handler = self.act_autoreconnect),
                         MenuItem("-", disabled=True),
-                        MenuItem(Settings.text["nosplit"], handler = self.act_nosplit),
-                        MenuItem(Settings.text["echoinput"], handler = self.act_echoinput),
-                        MenuItem(Settings.text["beautify"], handler = self.act_beautify),
-                        MenuItem(Settings.text["copy"], handler = self.act_copy),
-                        MenuItem(Settings.text["copyraw"], handler = self.act_copyraw),
-                        MenuItem(Settings.text["clearsession"], handler = self.act_clearsession),
+                        MenuItem(Settings.gettext("nosplit"), handler = self.act_nosplit),
+                        MenuItem(Settings.gettext("echoinput"), handler = self.act_echoinput),
+                        MenuItem(Settings.gettext("beautify"), handler = self.act_beautify),
+                        MenuItem(Settings.gettext("copy"), handler = self.act_copy),
+                        MenuItem(Settings.gettext("copyraw"), handler = self.act_copyraw),
+                        MenuItem(Settings.gettext("clearsession"), handler = self.act_clearsession),
                         MenuItem("-", disabled=True),
                         
-                        MenuItem(Settings.text["reloadconfig"], handler = self.act_reload),
+                        MenuItem(Settings.gettext("reloadconfig"), handler = self.act_reload),
                     ]
                 ),
 
@@ -336,9 +350,9 @@ class PyMudApp:
                 # ),
 
                 MenuItem(
-                    Settings.text["help"],
+                    Settings.gettext("help"),
                     children=[
-                        MenuItem(Settings.text["about"], handler = self.act_about)
+                        MenuItem(Settings.gettext("about"), handler = self.act_about)
                     ]
                 ),
 
@@ -359,7 +373,7 @@ class PyMudApp:
     def create_world_menus(self):
         "创建世界子菜单，其中根据本地pymud.cfg中的有关配置创建会话有关子菜单"
         menus = []
-        menus.append(MenuItem(Settings.text["new_session"], handler = self.act_new))
+        menus.append(MenuItem(f'{Settings.gettext("new_session")}...', handler = self.act_new))
         menus.append(MenuItem("-", disabled=True))
 
         ss = Settings.sessions
@@ -367,14 +381,14 @@ class PyMudApp:
         for key, site in ss.items():
             menu = MenuItem(key)
             for name in site["chars"].keys():
-                sub = MenuItem(name, handler = functools.partial(self._quickHandleSession, key, name))
+                sub = MenuItem(name, handler = functools.partial(self._quickHandleSession, key, name)) # type: ignore
                 menu.children.append(sub)
             menus.append(menu)
 
         menus.append(MenuItem("-", disabled=True))
-        menus.append(MenuItem(Settings.text["show_log"], handler = self.show_logSelectDialog))
+        menus.append(MenuItem(Settings.gettext("show_log"), handler = self.show_logSelectDialog))
         menus.append(MenuItem("-", disabled=True))
-        menus.append(MenuItem(Settings.text["exit"], handler=self.act_exit))
+        menus.append(MenuItem(Settings.gettext("exit"), handler=self.act_exit))
 
         return menus
 
@@ -389,6 +403,8 @@ class PyMudApp:
             b = s.buffer
         elif self.showLog:
             b = self.logSessionBuffer
+        else:
+            b = None
             
         if isinstance(b, Buffer):
             if lines < 0:
@@ -437,7 +453,7 @@ class PyMudApp:
     def complete_autosuggest(self, event: KeyPressEvent):
         """快捷键右箭头→: 自动完成建议"""
         b = event.current_buffer
-        if b.cursor_position == len(b.text):
+        if (b.cursor_position == len(b.text)) and b.auto_suggest:
             s = b.auto_suggest.get_suggestion(b, b.document)
             if s:
                 b.insert_text(s.text, fire_event=False)
@@ -507,12 +523,10 @@ class PyMudApp:
                     line = self.mudFormatProc.line_correction(b.document.current_line)
                     start = max(0, scol)
                     end = min(ecol, len(line))
-                    #line_plain = re.sub(r"\x1b\[[0-9;]*[a-zA-Z]", "", line, flags = re.IGNORECASE).replace("\r", "").replace("\x00", "")
                     line_plain = Session.PLAIN_TEXT_REGX.sub("", line).replace("\r", "").replace("\x00", "")
-                    #line_plain = re.sub("\x1b\\[[^mz]+[mz]", "", line).replace("\r", "").replace("\x00", "")
                     selection = line_plain[start:end]
                     self.app.clipboard.set_text(selection)
-                    self.set_status("已复制：{}".format(selection))
+                    self.set_status(Settings.gettext("msg_copy", selection))
                     if self.current_session:
                         self.current_session.setVariable("%copy", selection)
                 else:
@@ -520,12 +534,11 @@ class PyMudApp:
                     lines = []
                     for row in range(srow, erow + 1):
                         line = b.document.lines[row]
-                        #line_plain = re.sub(r"\x1b\[[0-9;]*[a-zA-Z]", "", line, flags = re.IGNORECASE).replace("\r", "").replace("\x00", "")
                         line_plain = Session.PLAIN_TEXT_REGX.sub("", line).replace("\r", "").replace("\x00", "")
                         lines.append(line_plain)
 
                     self.app.clipboard.set_text("\n".join(lines))
-                    self.set_status("已复制：行数{}".format(1 + erow - srow))
+                    self.set_status(Settings.gettext("msg_copylines", 1 + erow - srow))
                     
                     if self.current_session:
                         self.current_session.setVariable("%copy", "\n".join(lines))
@@ -535,7 +548,7 @@ class PyMudApp:
                 if srow == erow:
                     line = b.document.current_line
                     self.app.clipboard.set_text(line)
-                    self.set_status("已复制：{}".format(line))
+                    self.set_status(Settings.gettext("msg_copy", line))
                     
                     if self.current_session:
                         self.current_session.setVariable("%copy", line)
@@ -544,18 +557,13 @@ class PyMudApp:
                     lines = b.document.lines[srow:erow+1]
                     copy_raw_text = "".join(lines)
                     self.app.clipboard.set_text(copy_raw_text)
-                    self.set_status("已复制：行数{}".format(1 + erow - srow))
+                    self.set_status(Settings.gettext("msg_copylines", 1 + erow - srow))
 
                     if self.current_session:
                         self.current_session.setVariable("%copy", copy_raw_text)
 
-                # data = self.consoleView.buffer.copy_selection()
-                # self.app.clipboard.set_data(data)
-                # self.set_status("已复制：{}".format(data.text))
-
-                # self.current_session.setVariable("%copy", data.text)
         else:
-            self.set_status("未选中任何内容...")
+            self.set_status(Settings.gettext("msg_no_selection"))
 
     def create_session(self, name, host, port, encoding = None, after_connect = None, scripts = None, userid = None):
         """
@@ -584,13 +592,19 @@ class PyMudApp:
 
             result = True
         else:
-            self.set_status(f"错误！已存在一个名为{name}的会话，请更换名称再试.")
+            self.set_status(Settings.gettext("msg_session_exists", name))
 
         return result
 
     def show_logSelectDialog(self):
+        def correction_align_width(text, width):
+            "修正文本对齐宽度，防止ljust和rjust方法产生的中文宽度不对齐问题"
+            return width - wcswidth(text) + len(text)
         async def coroutine():
-            head_line = "   {}{}{}".format('记录文件名'.ljust(15), '文件大小'.rjust(16), '最后修改时间'.center(17))
+            title_filename = Settings.gettext("logfile_name").ljust(correction_align_width(Settings.gettext("logfile_name"), 20))
+            title_filesize = Settings.gettext("logfile_size").rjust(correction_align_width(Settings.gettext("logfile_size"), 20))
+            title_modified = Settings.gettext("logfile_modified").center(correction_align_width(Settings.gettext("logfile_modified"), 23))
+            head_line = "   {}{}{}".format(title_filename, title_filesize, title_modified)
             
             log_list = list()
             files = [f for f in os.listdir('.') if os.path.isfile(f) and f.endswith('.log')]
@@ -663,7 +677,7 @@ class PyMudApp:
         async def coroutine():
             if self.current_session:
                 if self.current_session.connected:
-                    dlgQuery = QueryDialog(HTML('<b fg="red">警告</b>'), HTML('<style fg="red">当前会话 {0} 还处于连接状态，确认要关闭？</style>'.format(self.current_session.name)))
+                    dlgQuery = QueryDialog(HTML(f'<b fg="red">{Settings.gettext("warning")}</b>'), HTML(f'<style fg="red">{Settings.gettext("session_close_prompt", self.current_session.name)}</style>'))
                     result = await self.show_dialog_as_float(dlgQuery)
                     if result:
                         self.current_session.disconnect()
@@ -696,7 +710,7 @@ class PyMudApp:
                     self.activate_session(new_sess)
                     #self.set_status(f"当前会话已切换为 {self.current_session.name}")
 
-        asyncio.ensure_future(coroutine())
+        asyncio.ensure_future(coroutine()) # type: ignore
 
     # 菜单选项操作 - 开始
 
@@ -751,21 +765,21 @@ class PyMudApp:
         val = not Settings.client["beautify"]
         Settings.client["beautify"] = val
         if self.current_session:
-            self.current_session.info(f"显示美化已{'打开' if val else '关闭'}!")
+            self.current_session.info(f'{Settings.gettext("msg_beautify")}{Settings.gettext("msg_open") if val else Settings.gettext("msg_close")}!')
 
     def act_echoinput(self):
         "菜单: 显示/隐藏输入指令"
         val = not Settings.client["echo_input"]
         Settings.client["echo_input"] = val
         if self.current_session:
-            self.current_session.info(f"回显输入命令被设置为：{'打开' if val else '关闭'}")
+            self.current_session.info(f'{Settings.gettext("msg_echoinput")}{Settings.gettext("msg_open") if val else Settings.gettext("msg_close")}!')
 
     def act_autoreconnect(self):
         "菜单: 打开/关闭自动重连"
         val = not Settings.client["auto_reconnect"]
         Settings.client["auto_reconnect"] = val
         if self.current_session:
-            self.current_session.info(f"自动重连被设置为：{'打开' if val else '关闭'}")
+            self.current_session.info(f'{Settings.gettext("msg_autoreconnect")}{Settings.gettext("msg_open") if val else Settings.gettext("msg_close")}')
 
     def act_copy(self):
         "菜单: 复制纯文本"
@@ -786,17 +800,7 @@ class PyMudApp:
 
     # 暂未实现该功能
     def act_change_layout(self, layout):
-        #if isinstance(layout, STATUS_DISPLAY):
         self.status_display = layout
-        #self.console_frame.body.reset()
-        # if layout == STATUS_DISPLAY.HORIZON:
-        #     self.console_frame.body = self.console_with_horizon_status
-        # elif layout == STATUS_DISPLAY.VERTICAL:
-        #     self.console_frame.body = self.console_with_vertical_status
-        # elif layout == STATUS_DISPLAY.NONE:
-        #     self.console_frame.body = self.console_without_status
-
-        #self.show_message("布局调整", f"已将布局设置为{layout}")
         self.app.invalidate()
 
     def act_exit(self):
@@ -808,7 +812,7 @@ class PyMudApp:
                     con_sessions.append(session.name)
 
             if len(con_sessions) > 0:
-                dlgQuery = QueryDialog(HTML('<b fg="red">程序退出警告</b>'), HTML('<style fg="red">尚有 {0} 个会话 {1} 还处于连接状态，确认要关闭？</style>'.format(len(con_sessions), ", ".join(con_sessions))))
+                dlgQuery = QueryDialog(HTML(f'<b fg="red">{Settings.gettext("warning_exit")}</b>'), HTML(f'<style fg="red">{Settings.gettext("app_exit_prompt", len(con_sessions), ", ".join(con_sessions))}</style>'))
                 result = await self.show_dialog_as_float(dlgQuery)
                 if result:
                     for ss_name in con_sessions:
@@ -844,7 +848,7 @@ class PyMudApp:
 
     def get_input_prompt(self):
         "命令输入行提示符"
-        return HTML(Settings.text["input_prompt"])
+        return HTML(Settings.gettext("input_prompt"))
 
     def btn_title_clicked(self, name, mouse_event: MouseEvent):
         "顶部会话标签点击切换鼠标事件"
@@ -906,17 +910,17 @@ class PyMudApp:
         "状态栏右侧内容"
         con_str, mouse_support, tri_status, beautify = "", "", "", ""
         if not Settings.client["beautify"]:
-            beautify = "美化已关闭 "
+            beautify = Settings.gettext("status_nobeautify") + " "
 
         if not self._mouse_support:
-            mouse_support = "鼠标已禁用 "
+            mouse_support = Settings.gettext("status_mouseinh") + " "
 
         if self.current_session:
             if self.current_session._ignore:
-                tri_status = "全局禁用 "
+                tri_status = Settings.gettext("status_ignore") + " "
 
             if not self.current_session.connected:
-                con_str = "未连接"
+                con_str = Settings.gettext("status_notconnect")
             else:
                 dura = self.current_session.duration
                 DAY, HOUR, MINUTE = 86400, 3600, 60
@@ -927,15 +931,14 @@ class PyMudApp:
                 dura = dura - hours * HOUR
                 mins = dura // MINUTE
                 sec = dura - mins * MINUTE
-
                 if days > 0:
-                    con_str = "已连接：{:.0f}天{:.0f}小时{:.0f}分{:.0f}秒".format(days, hours, mins, sec)
+                    con_str = Settings.gettext("status_connected") + ": {0:.0f}{4}{1:.0f}{5}{2:.0f}{6}{3:.0f}{7}".format(days, hours, mins, sec, Settings.gettext("Day"), Settings.gettext("Hour"), Settings.gettext("Minute"), Settings.gettext("Second"))
                 elif hours > 0:
-                    con_str = "已连接：{:.0f}小时{:.0f}分{:.0f}秒".format(hours, mins, sec)
+                    con_str = Settings.gettext("status_connected") + ": {0:.0f}{3}{1:.0f}{4}{2:.0f}{5}".format(hours, mins, sec, Settings.gettext("Hour"), Settings.gettext("Minute"), Settings.gettext("Second"))
                 elif mins > 0:
-                    con_str = "已连接：{:.0f}分{:.0f}秒".format(mins, sec)
+                    con_str = Settings.gettext("status_connected") + ": {0:.0f}{2}{1:.0f}{3}".format(mins, sec, Settings.gettext("Minute"), Settings.gettext("Second"))
                 else:
-                    con_str = "已连接：{:.0f}秒".format(sec)
+                    con_str = Settings.gettext("status_connected") + ": {:.0f}{}".format(sec, Settings.gettext("Second"))
 
         return "{}{}{}{} {} {} ".format(beautify, mouse_support, tri_status, con_str, Settings.__appname__, Settings.__version__)
 
@@ -1056,7 +1059,7 @@ class PyMudApp:
                 nothandle = not self._quickHandleSession(group, name)
 
             else:
-                errmsg = f'通过单一参数快速创建会话时，要使用 group.name 形式，如 #session pkuxkx.newstart'
+                errmsg = Settings.gettext("msg_cmd_session_error")
 
         elif len(args) >= 3:
             session_name = args[0]
@@ -1096,7 +1099,7 @@ class PyMudApp:
                     self.current_session.writeline("")
                 else:
                     try:
-                        self.current_session.log.log(f"命令行键入: {cmd_line}\n")
+                        self.current_session.log.log(f"{Settings.gettext('msg_cmdline_input')} {cmd_line}\n")
 
                         cb = CodeBlock(cmd_line)
                         cb.execute(self.current_session)
@@ -1109,7 +1112,7 @@ class PyMudApp:
                 elif (cmd_line == "#close") and self.showLog:
                     self.act_close_session()
                 else:
-                    self.set_status("当前没有正在运行的session.")
+                    self.set_status(Settings.gettext("msg_no_session"))
 
         # 配置：命令行内容保留
         if Settings.client["remain_last_input"]:
@@ -1183,16 +1186,18 @@ class PyMudApp:
     async def show_dialog_as_float(self, dialog):
         "显示弹出式窗口."
         float_ = Float(content=dialog)
-        self.root_container.floats.insert(0, float_)
+        if self.root_container.floats:
 
-        self.app.layout.focus(dialog)
-        result = await dialog.future
-        self.app.layout.focus(self.commandLine)
+            self.root_container.floats.insert(0, float_)
 
-        if float_ in self.root_container.floats:
-            self.root_container.floats.remove(float_)
+            self.app.layout.focus(dialog)
+            result = await dialog.future
+            self.app.layout.focus(self.commandLine)
 
-        return result
+            if float_ in self.root_container.floats:
+                self.root_container.floats.remove(float_)
+
+            return result
 
     async def run_async(self):
         "以异步方式运行本程序"
@@ -1247,7 +1252,7 @@ class PyMudApp:
                         self._plugins[plugin.name] = plugin
                         # plugin.onAppInit(self)
                     except Exception as e:
-                        self.set_status(f"文件: {plugins_dir}\\{file} 不是一个合法的插件文件，加载错误，信息为: {e}")
+                        self.set_status(Settings.gettext("msg_plugin_load_error", file, e))
         
         # 然后加载当前目录下的插件
         current_dir = os.path.abspath(".")
@@ -1262,7 +1267,7 @@ class PyMudApp:
                         self._plugins[plugin.name] = plugin
                         plugin.onAppInit(self)
                     except Exception as e:
-                        self.set_status(f"文件: {plugins_dir}\\{file} 不是一个合法的插件文件. 加载错误，信息为: {e}")
+                        self.set_status(Settings.gettext("msg_plugin_load_error", file, e))
 
     def reload_plugin(self, plugin: Plugin):
         "重新加载指定插件"