pymud 0.20.0__py3-none-any.whl → 0.20.0a1__py3-none-any.whl

pymud/pymud.py

@@ -1,6 +1,6 @@
-import asyncio, functools, re, os, webbrowser, threading
+import asyncio, functools, re, logging, math, json, os, webbrowser, threading
 from datetime import datetime
-from pathlib import Path
+import importlib.util
 from prompt_toolkit.shortcuts import set_title, radiolist_dialog
 from prompt_toolkit.output import ColorDepth
 from prompt_toolkit.clipboard.pyperclip import PyperclipClipboard
@@ -36,8 +36,7 @@ from prompt_toolkit.layout.processors import (
 from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
 
 from .objects import CodeBlock
-from .extras import MudFormatProcessor, SessionBuffer, EasternMenuContainer, VSplitWindow, SessionBufferControl, DotDict
-from .modules import Plugin
+from .extras import MudFormatProcessor, SessionBuffer, EasternMenuContainer, VSplitWindow, SessionBufferControl, DotDict, Plugin
 from .session import Session
 from .settings import Settings
 from .dialogs import MessageDialog, WelcomeDialog, QueryDialog, NewSessionDialog, LogSelectionDialog
@@ -319,8 +318,8 @@ class PyMudApp:
                 ),
 
                 MenuItem(
-                    "",    # 增加一个空名称MenuItem，单机后焦点移动至命令行输入处，阻止右侧空白栏点击响应
-                    handler = lambda : self.app.layout.focus(self.commandLine)
+                    "",    # 增加一个空名称MenuItem，阻止右侧空白栏点击响应
+                    children=[]
                 )
             ],
             floats=[
@@ -341,9 +340,34 @@ class PyMudApp:
         ss = Settings.sessions
 
         for key, site in ss.items():
+            host = site["host"]
+            port = site["port"]
+            encoding = site["encoding"]
+            autologin = site["autologin"]
+            scripts = list()
+            default_script = site["default_script"]
+            
+            def_scripts = list()
+            if isinstance(default_script, str):
+                def_scripts.extend(default_script.split(","))
+            elif isinstance(default_script, (list, tuple)):
+                def_scripts.extend(default_script)
+
             menu = MenuItem(key)
-            for name in site["chars"].keys():
-                sub = MenuItem(name, handler = functools.partial(self._quickHandleSession, key, name))
+            for name, info in site["chars"].items():
+                after_connect = autologin.format(info[0], info[1])
+                sess_scripts = list()
+                sess_scripts.extend(def_scripts)
+                
+                if len(info) == 3:
+                    session_script = info[2]
+                    if session_script:
+                        if isinstance(session_script, str):
+                            sess_scripts.extend(session_script.split(","))
+                        elif isinstance(session_script, (list, tuple)):
+                            sess_scripts.extend(session_script)
+
+                sub = MenuItem(name, handler = functools.partial(self.create_session, name, host, port, encoding, after_connect, sess_scripts, info[0]))
                 menu.children.append(sub)
             menus.append(menu)
 
@@ -482,7 +506,7 @@ 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\[[\d;]+[abcdmz]", "", line, flags = re.IGNORECASE).replace("\r", "").replace("\x00", "")
+                    line_plain = re.sub("\x1b\\[[\d;]+[abcdmz]", "", line, flags = re.IGNORECASE).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)
@@ -494,7 +518,7 @@ class PyMudApp:
                     lines = []
                     for row in range(srow, erow + 1):
                         line = b.document.lines[row]
-                        line_plain = re.sub(r"\x1b\[[\d;]+[abcdmz]", "", line, flags = re.IGNORECASE).replace("\r", "").replace("\x00", "")
+                        line_plain = re.sub("\x1b\\[[\d;]+[abcdmz]", "", line, flags = re.IGNORECASE).replace("\r", "").replace("\x00", "")
                         lines.append(line_plain)
 
                     self.app.clipboard.set_text("\n".join(lines))
@@ -568,7 +592,6 @@ class PyMudApp:
             log_list = list()
             files = [f for f in os.listdir('.') if os.path.isfile(f) and f.endswith('.log')]
             for file in files:
-                file = os.path.abspath(file)
                 filename = os.path.basename(file).ljust(20)
                 filesize = f"{os.path.getsize(file):,} Bytes".rjust(20)
                 # ctime   = datetime.fromtimestamp(os.path.getctime(file)).strftime('%Y-%m-%d %H:%M:%S').rjust(23)
@@ -576,19 +599,6 @@ class PyMudApp:
                 
                 file_display_line = "{}{}{}".format(filename, filesize, mtime)
                 log_list.append((file, file_display_line))
-
-            logDir = os.path.abspath(os.path.join(os.curdir, 'log'))
-            if os.path.exists(logDir):
-                files = [f for f in os.listdir(logDir) if f.endswith('.log')]
-                for file in files:
-                    file = os.path.join(logDir, file)
-                    filename = ('log/' + os.path.basename(file)).ljust(20)
-                    filesize = f"{os.path.getsize(file):,} Bytes".rjust(20)
-                    # ctime   = datetime.fromtimestamp(os.path.getctime(file)).strftime('%Y-%m-%d %H:%M:%S').rjust(23)
-                    mtime   = datetime.fromtimestamp(os.path.getmtime(file)).strftime('%Y-%m-%d %H:%M:%S').rjust(23)
-                    
-                    file_display_line = "{}{}{}".format(filename, filesize, mtime)
-                    log_list.append((file, file_display_line))
             
             dialog = LogSelectionDialog(
                 text = head_line,
@@ -653,7 +663,6 @@ class PyMudApp:
                         plugin.onSessionDestroy(self.current_session)
 
                 name = self.current_session.name
-                self.current_session.closeLoggers()
                 self.current_session.clean()
                 self.current_session = None
                 self.consoleView.buffer = SessionBuffer()
@@ -909,50 +918,6 @@ class PyMudApp:
         self.status_message = msg
         self.app.invalidate()
 
-    def _quickHandleSession(self, group, name):
-        '''
-        根据指定的组名和会话角色名，从Settings内容，创建一个会话
-        '''
-        handled = False
-        if name in self.sessions.keys():
-           self.activate_session(name)
-           handled = True
-
-        else:
-            site = Settings.sessions[group]
-            if name in site["chars"].keys():
-                host = site["host"]
-                port = site["port"]
-                encoding = site["encoding"]
-                autologin = site["autologin"]
-                default_script = site["default_script"]
-                
-                def_scripts = list()
-                if isinstance(default_script, str):
-                    def_scripts.extend(default_script.split(","))
-                elif isinstance(default_script, (list, tuple)):
-                    def_scripts.extend(default_script)
-
-                charinfo = site["chars"][name]
-
-                after_connect = autologin.format(charinfo[0], charinfo[1])
-                sess_scripts = list()
-                sess_scripts.extend(def_scripts)
-                    
-                if len(charinfo) == 3:
-                    session_script = charinfo[2]
-                    if session_script:
-                        if isinstance(session_script, str):
-                            sess_scripts.extend(session_script.split(","))
-                        elif isinstance(session_script, (list, tuple)):
-                            sess_scripts.extend(session_script)
-
-                self.create_session(name, host, port, encoding, after_connect, sess_scripts, charinfo[0])
-                handled = True
-        
-        return handled
-
-
     def handle_session(self, *args):
         '''
         嵌入命令 #session 的执行函数，创建一个远程连接会话。
@@ -963,18 +928,12 @@ class PyMudApp:
             - 当不指定 Encoding: 时, 默认使用utf-8编码
             - 可以直接使用 #{名称} 切换会话和操作会话命令
 
-            - #session {group}.{name}
-            - 相当于直接点击菜单{group}下的{name}菜单来创建会话. 当该会话已存在时，切换到该会话
-
         参数:
             :name: 会话名称
             :host: 服务器域名或IP地址
             :port: 端口号
             :encoding: 编码格式，不指定时默认为 utf8
     
-            :group: 组名, 即配置文件中, sessions 字段下的某个关键字
-            :name: 会话快捷名称, 上述 group 关键字下的 chars 字段中的某个关键字
-
         示例:
             ``#session {名称} {宿主机} {端口} {编码}`` 
                 创建一个远程连接会话，使用指定编码格式连接到远程宿主机的指定端口并保存为 {名称} 。其中，编码可以省略，此时使用Settings.server["default_encoding"]的值，默认为utf8
@@ -987,9 +946,6 @@ class PyMudApp:
             ``#newstart give miui gold`` 
                 使名称为newstart的会话执行give miui gold指令，但不切换到该会话
 
-            ``#session pkuxkx.newstart``
-                通过指定快捷配置创建会话，相当于点击 世界->pkuxkx->newstart 菜单创建会话。若该会话存在，则切换到该会话
-
         相关命令:
             - #close
             - #exit
@@ -997,17 +953,8 @@ class PyMudApp:
         '''
 
         nothandle = True
-        errmsg = "错误的#session命令"
-        if len(args) == 1:
-            host_session = args[0]
-            if '.' in host_session:
-                group, name = host_session.split('.')
-                nothandle = not self._quickHandleSession(group, name)
 
-            else:
-                errmsg = f'通过单一参数快速创建会话时，要使用 group.name 形式，如 #session pkuxkx.newstart'
-
-        elif len(args) >= 3:
+        if len(args) >= 3:
             session_name = args[0]
             session_host = args[1]
             session_port = int(args[2])
@@ -1020,7 +967,7 @@ class PyMudApp:
             nothandle = False
         
         if nothandle:
-            self.set_status(errmsg)
+            self.set_status("错误的#session命令")
 
     def enter_pressed(self, buffer: Buffer):
         "命令行回车按键处理"
@@ -1153,8 +1100,8 @@ class PyMudApp:
         #asyncio.run(self.run_async())
 
     def get_width(self):
-        "获取ConsoleView的实际宽度，等于输出宽度,（已经没有左右线条和滚动条了）"
-        size = self.app.output.get_size().columns
+        "获取ConsoleView的实际宽度，等于输出宽度-4,（左右线条宽度, 滚动条宽度，右边让出的1列）"
+        size = self.app.output.get_size().columns - 4
         if Settings.client["status_display"] == 2:
             size = size - Settings.client["status_width"] - 1
         return size
@@ -1214,6 +1161,21 @@ class PyMudApp:
             plugin.onSessionCreate(session)
         
 
-def startApp(cfg_data = None):
+def main(cfg_data = None):
     app = PyMudApp(cfg_data)
     app.run()
+
+if __name__ == "__main__":
+
+    cfg = "pymud.cfg"
+    import sys
+    args = sys.argv
+    if len(args) > 1:
+        cfg = args[1]
+
+    if os.path.exists(cfg):
+        with open(cfg, "r", encoding="utf8", errors="ignore") as fp:
+            cfg_data = json.load(fp)
+            main(cfg_data)
+    else:
+        main()