pymud 0.21.4.post5__py3-none-any.whl → 0.21.5.post1__py3-none-any.whl

pymud/extras.py

@@ -626,6 +626,7 @@ class SessionBuffer(BufferBase):
         if line.endswith(self.newline):
             line = line.rstrip(self.newline)
             newline_after_append = True
+            
         if not self.newline in line:
             if self._isnewline:
                 self._lines.append(line)
@@ -659,6 +660,8 @@ class SessionBuffer(BufferBase):
         self._lines.clear()
         self.nosplit()
 
+    def forceNewline(self):
+        self._isnewline = True
 
     @property
     def lineCount(self):
@@ -712,10 +715,14 @@ class PyMudBufferControl(UIControl):
         self.buffer = buffer
 
         # 为MUD显示进行校正的处理，包括对齐校正，换行颜色校正等
-        self.FULL_BLOCKS = set("▂▃▅▆▇▄█━")
+        self.FULL_BLOCKS = set("▂▃▅▆▇▄█")
+        self.TABLE_LINES  = set("┃││║┃")
         self.SINGLE_LINES = set("┠┌└├┬┼┴╭╰─")
-        self.SINGLE_LINES_LEFT = set("┨┘┐┤")
+        self.SINGLE_LINES_LEFT = set("┨┘┐┤╮╯")
         self.DOUBLE_LINES = set("╔╚╠╦╪╩═")
+        self.DOUBLE_LINES_LEFT = set("╗╝╣")
+        self.THICK_LINES = set("┏┗━")
+        self.THICK_LINES_LEFT = set("┓┛ ")
         self.ALL_COLOR_REGX  = re.compile(r"(?:\[[\d;]+m)+")
         self.AVAI_COLOR_REGX = re.compile(r"(?:\[[\d;]+m)+(?!$)")
         self._color_start = ""
@@ -737,7 +744,6 @@ class PyMudBufferControl(UIControl):
         """
         return False
 
-
     def width_correction(self, line: str) -> str:
         new_str = []
         for idx, ch in enumerate(line):
@@ -752,15 +758,28 @@ class PyMudBufferControl(UIControl):
                 elif ch in self.DOUBLE_LINES:
                     new_str.append(ch)
                     new_str.append("═")
-                elif ch in self.SINGLE_LINES_LEFT:
-                    new_str.append("─")
+                elif ch in self.THICK_LINES:
                     new_str.append(ch)
+                    new_str.append("━")
                 else:
-                    right = line[idx+1:]
+                    right = str.rstrip(line[idx+1:])
                     right_len = fragment_list_width(to_formatted_text(ANSI(right)))
-                    if right_len == 0:
-                        new_str.append(" ")
-                        new_str.append(ch)
+                    if (idx == len(line) - 1) or (right_len == 0):
+                        if ch in self.SINGLE_LINES_LEFT:
+                            new_str.append("─")
+                            new_str.append(ch)
+                        elif ch in self.DOUBLE_LINES_LEFT:
+                            new_str.append("═")
+                            new_str.append(ch)
+                        elif ch in self.THICK_LINES_LEFT:
+                            new_str.append("━")
+                            new_str.append(ch)
+                        elif ch in self.TABLE_LINES:
+                            new_str.append(" ")
+                            new_str.append(ch)
+                        else:
+                            new_str.append(ch)
+                            new_str.append(' ')
                     else:
                         new_str.append(ch)
                         new_str.append(' ')
@@ -798,43 +817,6 @@ class PyMudBufferControl(UIControl):
 
         return line
 
-    def fragment_correction(self, fragments: StyleAndTextTuples):
-        """
-        处理ANSI标记，包括颜色标记，下划线标记等
-        """
-        new_fragments = []
-        frag_count = len(fragments)
-        for i  in range(0, frag_count):
-            style, text, *_ = fragments[i]
-            new_text = []
-
-            for j, ch in enumerate(text):
-                if (east_asian_width(ch) in "FWA") and (wcwidth(ch) == 1):
-                    if ch in self.FULL_BLOCKS:
-                        new_text.append(ch * 2)
-                    elif ch in self.SINGLE_LINES:
-                        new_text.append(ch)
-                        new_text.append("─")
-                    elif ch in self.DOUBLE_LINES:
-                        new_text.append(ch)
-                        new_text.append("═")
-                    elif ch in self.SINGLE_LINES_LEFT:
-                        new_text.append("─")
-                        new_text.append(ch)
-                    elif (i == frag_count - 1) and (j == len(ch) - 1):
-                        new_text.append(" ")
-                        new_text.append(ch)
-                    else:
-                        new_text.append(ch)
-                        new_text.append(' ')
-                else:
-                    new_text.append(ch)
-
-            fragments[i] = (style, "".join(new_text))
-            
-        return fragments
-
-
     def create_content(self, width: int, height: int) -> UIContent:
         """
         Generate the content for this user control.
@@ -899,8 +881,10 @@ class PyMudBufferControl(UIControl):
 
             if selection_at_line:
                 from_, to = selection_at_line
-                # from_ = source_to_display(from_)
-                # to = source_to_display(to)
+                total_display = fragment_list_width(fragments)
+                if to == len(buffer.getLine(i)):
+                    to = total_display
+
 
                 fragments = explode_text_fragments(fragments)
 
@@ -909,12 +893,14 @@ class PyMudBufferControl(UIControl):
                     # visualize the selection.
                     return [(selected_fragment, " ")]
                 else:
-                    for i in range(from_, to):
+                    for i in range(from_, min(to, total_display+1)):
                         if i < len(fragments):
                             old_fragment, old_text, *_ = fragments[i]
                             fragments[i] = (old_fragment + selected_fragment, old_text)
-                        elif i == len(fragments):
-                            fragments.append((selected_fragment, " "))
+                        # elif i == len(fragments):
+                        #     fragments.append((selected_fragment, " "))
+
+
 
             return fragments
 

pymud/pymud.py

@@ -672,7 +672,7 @@ class PyMudApp:
                     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()
+                        self.current_session.disconnect() 
 
                         # 增加延时等待确保会话关闭
                         wait_time = 0
@@ -696,13 +696,17 @@ class PyMudApp:
                 self.current_session = None
                 #self.consoleView.buffer = SessionBuffer()
                 self.consoleView.buffer = None
-                self.sessions.pop(name)
+                closesession = self.sessions.pop(name)
+                del closesession
                 #self.set_status(f"会话 {name} 已关闭")
                 if len(self.sessions.keys()) > 0:
                     new_sess = list(self.sessions.keys())[0]
                     self.activate_session(new_sess)
                     #self.set_status(f"当前会话已切换为 {self.current_session.name}")
 
+                import gc
+                gc.collect()
+
         asyncio.ensure_future(coroutine()) # type: ignore
 
     # 菜单选项操作 - 开始
@@ -1084,12 +1088,8 @@ class PyMudApp:
         "命令行回车按键处理"
         cmd_line = buffer.text
         space_index = cmd_line.find(" ")
-        
-        if len(cmd_line) == 0:
-            if self.current_session:
-                self.current_session.writeline("")
-        
-        elif cmd_line[0] != Settings.client["appcmdflag"]:
+
+        if (len(cmd_line) >= 1) and (cmd_line[0] != Settings.client["appcmdflag"]):
             if self.current_session:
                 self.current_session.last_command = cmd_line
 
@@ -1101,6 +1101,7 @@ class PyMudApp:
             if self.current_session:
                 if len(cmd_line) == 0:
                     self.current_session.writeline("")
+        
                 else:
                     try:
                         self.current_session.log.log(f"{Settings.gettext('msg_cmdline_input')} {cmd_line}\n")

pymud/session.py

@@ -810,9 +810,12 @@ class Session:
         else:
             if Settings.client["echo_input"]:
                 self.writetobuffer(f"\x1b[32m{line}\x1b[0m", True)
+
             else:
                 self.log.log(f"\x1b[32m{line}\x1b[0m\n")
 
+            # 当输入任意命令后，本地强制新行
+            self.buffer.forceNewline()
             self.record_command(line)
             cmd = line + self.newline
             self.write(cmd.encode(self.encoding, Settings.server["encoding_errors"]))

pymud/settings.py

@@ -15,7 +15,7 @@ class Settings:
     "APP 简要描述"
     __version__   = importlib.metadata.version("pymud")
     "APP 当前版本"
-    __release__   = "2025-06-08"
+    __release__   = "2025-06-10"
     "APP 当前版本发布日期"
     __author__    = "本牛(newstart)@北侠"
     "APP 作者"

{pymud-0.21.4.post5.dist-info → pymud-0.21.5.post1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymud
-Version: 0.21.4.post5
+Version: 0.21.5.post1
 Summary: a MUD Client written in Python
 Author-email: "newstart@pkuxkx" <crapex@hotmail.com>
 Maintainer-email: "newstart@pkuxkx" <crapex@hotmail.com>
@@ -66,6 +66,12 @@ Dynamic: license-file
 
 ## 版本更新信息
 
+### 0.21.5post1 (2025-06-10)
+
++ 功能完善: 完善了美化功能，已知情况下，基本不会出现断行和不对齐问题了。
++ 功能完善: 在向服务器送出命令后，本地显示也强制换行。在出现『未完待续』情况时，回车后不会再跟在后面显示了，而是会强制从下一行开始。
++ 功能完善: 当对行进行双击选择时，背景增加的选择标记（灰色）会按照实际显示的宽度进行匹配，而不是按照原始数据的宽度进行匹配。
+
 ### 0.21.4 (2025-06-08)
 
 + 问题修复: 修复了在多行选择碰到空行时，会导致从头开始全选的问题。

{pymud-0.21.4.post5.dist-info → pymud-0.21.5.post1.dist-info}/RECORD

@@ -2,7 +2,7 @@ pymud/__init__.py,sha256=oeHz0NM7_DwChCY8f_vQ_fBq0e_HoTd0cahCFwaavWE,806
 pymud/__main__.py,sha256=lIOBiJmi8X-EWXVIx_OoxSgUZ0FYKlZI8hXVnLUYTJQ,61
 pymud/decorators.py,sha256=rNuDaKk65Cwc9K6t0-BpqNUORs8-8X5Xsv6YaLQ7hc4,9839
 pymud/dialogs.py,sha256=1xo5NJjch-u7RSRcclhvUE4gi8POgiZWK84lNx_HJbs,6891
-pymud/extras.py,sha256=WAtLEyKgdsEn0-BumToX6BfV29d5iXn7SUyAWM2JPZw,39146
+pymud/extras.py,sha256=ehwEe48ObvypUTt6SVbGsI2C-3-Mn0J8mGZOMM-ighk,38779
 pymud/i18n.py,sha256=qLgvrmYhVfkTHKpbBR-LfYMOrGgi0skHrelbsj7ItbE,3034
 pymud/logger.py,sha256=F2LBUogdzv2WXHo10CNorDh2VleAX1Wbwmxc3zznHlM,5823
 pymud/main.py,sha256=zaSjNhpbX3FMulKg-UNFrdiIJO8sOmmrUQrkPOalB-4,10224
@@ -10,14 +10,14 @@ pymud/modules.py,sha256=CsOqY1c59CrejltCS4wf7QqdCr5k_ghel8AUqlKVGIw,11873
 pymud/objects.py,sha256=NlKAQnV6v9lSkz94zmgb513HPxskY8-tXnOdrYhuktc,38629
 pymud/pkuxkx.py,sha256=qDVry-Vd6MNui0NKWZFT52IpmP1sKS5Dz74EDY4tVGQ,14740
 pymud/protocol.py,sha256=noptJs6K0L9qM8VZIeP65H4k9FPLGJqxvm3qY2iAwvI,48315
-pymud/pymud.py,sha256=SrPGSls1QqrfSzctNpHV1gt_-M9WpOWi5cGH2VF8W6w,53483
-pymud/session.py,sha256=sTswAPEl5GWcxzYmgovG8lOlflNTd5k8ggW6zJ6vcMY,154690
-pymud/settings.py,sha256=V4wHKP2UjmX_l2bKJoUJSfNbH7vs3GZlN4u-1tRFbxA,7697
+pymud/pymud.py,sha256=9BxK51tzvaOGpSqawlGI57TOtWbaccSlK9mNNHdvyGI,53486
+pymud/session.py,sha256=uJI2zm3rT3UxF0Pyt-e_daW4RkqCUR6OnkXneUVZ0tg,154790
+pymud/settings.py,sha256=tWNRQAA-QnDUcXk-Vr3B9Bfi-JpSlroHC1UJ_PY2p8A,7697
 pymud/lang/i18n_chs.py,sha256=2cyaHHLwpYEBBwuQXyRTxa1opX53fTv1f8_QDQeGlC0,16836
 pymud/lang/i18n_eng.py,sha256=jcPz6Y5UuxJBQLY_e8UnEF3GYTlnAD44C14Oj7sK-QI,45935
-pymud-0.21.4.post5.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymud-0.21.4.post5.dist-info/METADATA,sha256=vPX5Gp0V0ZHqPWUcWhaMVeeSDIn0roS7ZrlGmud44aI,46537
-pymud-0.21.4.post5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pymud-0.21.4.post5.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
-pymud-0.21.4.post5.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
-pymud-0.21.4.post5.dist-info/RECORD,,
+pymud-0.21.5.post1.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymud-0.21.5.post1.dist-info/METADATA,sha256=yq8JnaorcCg5zk3cdQ6wsj04P-xucYWV-bI-rDbaAI8,47057
+pymud-0.21.5.post1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymud-0.21.5.post1.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
+pymud-0.21.5.post1.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
+pymud-0.21.5.post1.dist-info/RECORD,,