pymud 0.20.2a1__py3-none-any.whl → 0.20.2a3__py3-none-any.whl

pymud/extras.py

@@ -40,6 +40,8 @@ from prompt_toolkit.layout.controls import (
 )
 from prompt_toolkit.layout.processors import (
     Processor,
+    TransformationInput,
+    Transformation
 )
 from prompt_toolkit.lexers import Lexer
 from prompt_toolkit.mouse_events import MouseEvent, MouseEventType
@@ -64,10 +66,11 @@ class MudFormatProcessor(Processor):
         self.FULL_BLOCKS = set("▂▃▅▆▇▄█")
         self.SINGLE_LINES = set("┌└├┬┼┴╭╰─")
         self.DOUBLE_LINES = set("╔╚╠╦╪╩═")
-        self.START_COLOR_REGX  = re.compile(r"^\[[\d;]+m")
+        #self.START_COLOR_REGX  = re.compile(r"^\[[\d;]+m")
         self.COLOR_REGX   = re.compile(r"\[[\d;]+m")
         self._color_start = ""
         self._color_correction = False
+        self._color_line_index = 0
 
     def width_correction(self, line: str) -> str:
         new_str = []
@@ -91,48 +94,48 @@ class MudFormatProcessor(Processor):
     def tab_correction(self, line: str):
         return line.replace("\t", " " * Settings.client["tabstop"])
 
-    def color_correction(self, line: str):
-        # 注：发现processer处理并非自上而下逐行处理的，因此不能使用这种颜色校正方式。
-        if self._color_correction:
-            other = self.COLOR_REGX.findall(line)
-
-            line = f"{self._color_start}{line}"
-            logging.debug(f"已校正增加颜色标志 {self._color_start}: {line}")
-
-            if other:
-                self._color_correction = False
-                self._color_start = ""
-                logging.debug(f"颜色校正结束: {line}")
-        else:
-            color = self.START_COLOR_REGX.findall(line)
-            if color:
-                other = self.COLOR_REGX.findall(line)
-                if len(other) == 1:
-                    self._color_correction = True
-                    self._color_start = color[0]
-                    logging.debug(f"获取到一个颜色开头 {color[0]}: {line}")
-
-        return line
-
     def line_correction(self, line: str):
         # 处理\r符号（^M）
         line = self.return_correction(line)
         # 处理Tab(\r)符号（^I）
         line = self.tab_correction(line)
-        # 处理颜色跨行问题。发现processer处理并非自上而下逐行处理的，因此不能使用这种颜色校正方式。
-        # line = self.color_correction(line)
+        
         # 美化（解决中文英文在Console中不对齐的问题）
         if Settings.client["beautify"]:
             line = self.width_correction(line)
 
         return line
 
-    def apply_transformation(self, transformation_input):
+    def apply_transformation(self, transformation_input: TransformationInput):
         # 准备（先还原为str）
         line = fragment_list_to_text(transformation_input.fragments)
+
+        # 颜色校正
+        thislinecolors = len(self.COLOR_REGX.findall(line))
+        if thislinecolors == 0:
+            lineno = transformation_input.lineno - 1
+            while lineno > 0:
+                lastline = transformation_input.document.lines[lineno]
+                # color = self.START_COLOR_REGX.findall(lastline)
+                # if color:
+                colors = self.COLOR_REGX.findall(lastline)
+                
+                if len(colors) == 0:
+                    lineno = lineno -1
+
+                elif len(colors) == 1:
+                    line = f"{colors[0]}{line}"
+                    break
+
+                else:
+                    break
+
+        # 其他校正
         line = self.line_correction(line)
+
         # 处理ANSI标记（生成FormmatedText）
         fragments = to_formatted_text(ANSI(line))
+
         return Transformation(fragments)
 
 class SessionBuffer(Buffer):

pymud/session.py

@@ -1949,7 +1949,6 @@ class Session:
         if remain:
             strlist.append(str[startindex:])
 
-        #self.info(f"原: {str}, 分隔为 {printable_length}, 结果为 {strlist}")
         return strlist
 
     def buildDisplayLines(self, vars: DotDict, title: str):
@@ -1962,7 +1961,7 @@ class Session:
         vars_complex = {}
 
         for k, v in vars.items():
-            if k in ("%line", "%raw"):
+            if k in ("%line", "%raw", "%copy"):
                 continue
 
             if dataclasses.is_dataclass(v) or (isinstance(v, Iterable) and not isinstance(v, str)):
@@ -1997,7 +1996,7 @@ class Session:
                 name = key.rjust(KEY_WIDTH + VAR_WIDTH)
 
             value_dis = vars_simple[key].__repr__()
-            var_display = "{} = {}".format(name, value_dis)
+            var_display = "{0} = {1}".format(name, value_dis)
             
             if (cursor + wcswidth(var_display) > totalWidth) or (var_count >= vars_per_line):
                 display_lines.append(line)
@@ -2035,17 +2034,31 @@ class Session:
                 if isinstance(value, dict):
                     max_len = self.getMaxLength(value.keys())
                     line += '{'
+                    display_lines.append(line)
+                    line = " " * (left_margin + KEY_WIDTH + 4)
                     for k, v in value.items():
-                        val_line = "{0}: {1},".format(k.ljust(max_len), v)
-                        line += val_line
-                        display_lines.append(line)
-                        line = " " * (left_margin + KEY_WIDTH + 4)
+                        subvalue_dis = "{},".format(v.__repr__())
+                        allow_len_subvalue = allow_len - max_len - 4
+                        if wcswidth(subvalue_dis) > allow_len_subvalue:
+                            subvalue_lines = self.splitByPrintableWidth(subvalue_dis, allow_len_subvalue)
+                            line += "{0}: ".format(k.ljust(max_len))
+                            for subline in subvalue_lines:
+                                line += subline
+                                display_lines.append(line)
+                                line = " " * (left_margin + KEY_WIDTH + 4 + max_len + 2)
+
+                            line = " " * (left_margin + KEY_WIDTH + 4)
+                        else:
+                            val_line = "{0}: {1}".format(k.ljust(max_len), subvalue_dis)
+                            line += val_line
+                            display_lines.append(line)
+                            line = " " * (left_margin + KEY_WIDTH + 4)
                     line = line[:-1] + '}'
                     display_lines.append(line)
                 elif isinstance(value, list):
                     line += '['
                     for v in value:
-                        val_line = "{0},".format(v)
+                        val_line = "{0},".format(v.__repr__())
                         line += val_line
                         display_lines.append(line)
                         line = " " * (left_margin + KEY_WIDTH + 4)
@@ -2090,61 +2103,6 @@ class Session:
         #args = code.code[2:]
 
         if len(args) == 0:
-            # vars = self._variables
-            # vars_simple = {}
-            # vars_complex = {}
-            # for k, v in vars.items():
-            #     # 不显示line, raw两个系统变量
-            #     if k in ("%line", "%raw"):
-            #         continue
-
-            #     if isinstance(v, Iterable) and not isinstance(v, str):
-            #         vars_complex[k] = v
-            #     else:
-            #         vars_simple[k] = v
-
-            # width = self.application.get_width() - 2        # 保留2个字符，防止 > 导致换行
-            
-            # title = f"  VARIABLE LIST IN SESSION {self.name}  "
-            # left = (width - len(title)) // 2
-            # right = width - len(title) - left
-            # self.writetobuffer("="*left + title + "="*right, newline = True)
-            
-            # # print vars in simple, 每个变量占40格，一行可以多个变量
-            # # 这里可以考虑调整一下，默认40, 但如果一个变量值太长，则选择占两个位置
-            # var_count = len(vars_simple)
-            # var_per_line = (width - 2) // 40
-            # lines = math.ceil(var_count / var_per_line)
-            # left_space = (width - var_per_line * 40) // 2
-            # if left_space > 4:  left_space = 4
-            
-            # var_keys = sorted(vars_simple.keys())
-
-            # for idx in range(0, lines):
-            #     start = idx * var_per_line
-            #     end   = (idx + 1) * var_per_line
-            #     if end > var_count: end = var_count
-            #     self.writetobuffer(" " * left_space)
-            #     line_vars = var_keys[start:end]
-            #     for var in line_vars:
-            #         repr = vars_simple[var].__repr__()
-            #         vwidth = 22 - (wcswidth(repr) - len(repr))
-            #         self.writetobuffer("{0} = {1}".format(var.rjust(20), repr.ljust(vwidth)))
-            #         #self.writetobuffer("{0:>18} = {1:<19}".format(var, vars_simple[var].__repr__()))
-
-            #     self.writetobuffer("", newline = True)
-
-            # # print vars in complex, 每个变量占1行
-            # var_keys = sorted(vars_complex.keys())
-            # for key in var_keys:
-            #     self.writetobuffer(" " * left_space)
-            #     self.writetobuffer("{0:>20} = {1}".format(key, vars_complex[key].__repr__()), newline = True)
-
-            # self.writetobuffer("="*width, newline = True)
-            # row, col = self.buffer.document.translate_index_to_position(len(self.buffer.text))
-            # if col:
-            #     self.writetobuffer("", newline = True)
-
             lines = self.buildDisplayLines(self._variables, f"  VARIABLE LIST IN SESSION {self.name}  ")
             
             for line in lines:
@@ -2153,7 +2111,12 @@ class Session:
         elif len(args) == 1:
             if args[0] in self._variables.keys():
                 obj = self.getVariable(args[0])
-                self.info(f"变量{args[0]}值为:{obj}")
+                var_dict = {args[0] : obj}
+                lines = self.buildDisplayLines(var_dict, f" VARIABLE [{args[0]}] IN SESSION {self.name} ")
+
+                for line in lines:
+                    self.writetobuffer(line, newline = True)
+                    
             else:
                 self.warning(f"当前session中不存在名称为 {args[0]} 的变量")
             
@@ -2165,6 +2128,7 @@ class Session:
                 val = args[1]
 
             self.setVariable(args[0], val)
+            self.info(f"成功设置变量 {args[0]} 值为 {val}")
 
     def handle_global(self, code: CodeLine = None, *args, **kwargs):
         '''
@@ -2190,51 +2154,6 @@ class Session:
         #args = code.code[2:]
 
         if len(args) == 0:
-            # vars = self.application.globals
-            # vars_simple = {}
-            # vars_complex = {}
-            # for k, v in vars.items():
-            #     if isinstance(v, Iterable) and not isinstance(v, str):
-            #         vars_complex[k] = v
-            #     else:
-            #         vars_simple[k] = v
-
-            # width = self.application.get_width() - 2        # 保留2个字符，防止 > 导致换行
-            
-            # title = f" GLOBAL VARIABLES LIST "
-            # left = (width - len(title)) // 2
-            # right = width - len(title) - left
-            # self.writetobuffer("="*left + title + "="*right, newline = True)
-            
-            # # print vars in simple, 每个变量占40格，一行可以多个变量
-            # var_count = len(vars_simple)
-            # var_per_line = (width - 2) // 40
-            # lines = math.ceil(var_count / var_per_line)
-            # left_space = (width - var_per_line * 40) // 2
-            # if left_space > 4:  left_space = 4
-            
-            # var_keys = sorted(vars_simple.keys())
-
-            # for idx in range(0, lines):
-            #     start = idx * var_per_line
-            #     end   = (idx + 1) * var_per_line
-            #     if end > var_count: end = var_count
-            #     self.writetobuffer(" " * left_space)
-            #     line_vars = var_keys[start:end]
-            #     for var in line_vars:
-            #         repr = vars_simple[var].__repr__()
-            #         vwidth = 22 - (wcswidth(repr) - len(repr))
-            #         self.writetobuffer("{0} = {1}".format(var.rjust(20), repr.ljust(vwidth)))
-
-            #     self.writetobuffer("", newline = True)
-
-            # # print vars in complex, 每个变量占1行
-            # for k, v in vars_complex.items():
-            #     self.writetobuffer(" " * left_space)
-            #     self.writetobuffer("{0:>20} = {1}".format(k, v.__repr__()), newline = True)
-
-            # self.writetobuffer("="*width, newline = True)
-
             lines = self.buildDisplayLines(self.application.globals, f" GLOBAL VARIABLES LIST ")
             
             for line in lines:
@@ -2243,7 +2162,13 @@ class Session:
         elif len(args) == 1:
             var = args[0]
             if var in self.application.globals.keys():
-                self.info("{0:>20} = {1:<22}".format(var, self.application.get_globals(var).__repr__()), "全局变量")
+                # self.info("{0:>20} = {1:<22}".format(var, self.application.get_globals(var).__repr__()), "全局变量")
+
+                var_dict = {var : self.application.get_globals(var)}
+                lines = self.buildDisplayLines(var_dict, f" GLOBAL VARIABLE [{var}] ")
+
+                for line in lines:
+                    self.writetobuffer(line, newline = True)
             else:
                 self.info("全局空间不存在名称为 {} 的变量".format(var), "全局变量")
             
@@ -2254,6 +2179,7 @@ class Session:
             except:
                 val = args[1]
             self.application.set_globals(args[0], val)
+            self.info(f"成功设置全局变量 {args[0]} 值为 {val}")
 
     def _handle_objs(self, name: str, objs: dict, *args):
         if len(args) == 0:
@@ -3084,14 +3010,18 @@ class Session:
                     triggered_enabled += 1
                     if not block: 
                         triggered += 1
-                        info_enabled.append(f"  {Settings.INFO_STYLE}{tri.__detailed__()} 正常触发。{Settings.CLR_STYLE}")
-                        info_enabled.append(f"    {Settings.INFO_STYLE}捕获：{state.wildcards}{Settings.CLR_STYLE}")
+                        # info_enabled.append(f"  {Settings.INFO_STYLE}{tri.__detailed__()} 正常触发。{Settings.CLR_STYLE}")
+                        # info_enabled.append(f"    {Settings.INFO_STYLE}捕获：{state.wildcards}{Settings.CLR_STYLE}")
+                        info_enabled.append(f"  {tri.__detailed__()} 正常触发。")
+                        info_enabled.append(f"    捕获：{state.wildcards}")
                     
                         if not tri.keepEval:                # 非持续匹配的trigger，匹配成功后停止检测后续Trigger
                             info_enabled.append(f"    {Settings.WARN_STYLE}该触发器未开启keepEval, 会阻止后续触发器。{Settings.CLR_STYLE}")
+                            #info_enabled.append(f"    该触发器未开启keepEval, 会阻止后续触发器。")
                             block = True
                     else:
                         info_enabled.append(f"  {Settings.WARN_STYLE}{tri.__detailed__()} 可以触发，但由于优先级与keepEval设定，触发器不会触发。{Settings.CLR_STYLE}")
+                        #info_enabled.append(f"  {tri.__detailed__()} 可以触发，但由于优先级与keepEval设定，触发器不会触发。")
             
             
             for tri in tris_disabled:
@@ -3102,22 +3032,23 @@ class Session:
 
                 if state.result == Trigger.SUCCESS:
                     triggered_disabled += 1
-                    info_disabled.append(f"  {Settings.INFO_STYLE}{tri.__detailed__()} 可以匹配触发。{Settings.CLR_STYLE}")
+                    # info_disabled.append(f"  {Settings.INFO_STYLE}{tri.__detailed__()} 可以匹配触发。{Settings.CLR_STYLE}")
+                    info_disabled.append(f"  {tri.__detailed__()} 可以匹配触发。")
 
             if triggered_enabled + triggered_disabled == 0:
                 info_all.append("")
 
         if triggered_enabled == 0:
-            info_enabled.insert(0, f"使能的触发器中，没有可以触发的。")
+            info_enabled.insert(0, f"{Settings.INFO_STYLE}使能的触发器中，没有可以触发的。")
         elif triggered < triggered_enabled:
-            info_enabled.insert(0, f"使能的触发器中，共有 {triggered_enabled} 个可以触发，实际触发 {triggered} 个，另有 {triggered_enabled - triggered} 个由于 keepEval 原因实际不会触发。")
+            info_enabled.insert(0, f"{Settings.INFO_STYLE}使能的触发器中，共有 {triggered_enabled} 个可以触发，实际触发 {triggered} 个，另有 {triggered_enabled - triggered} 个由于 keepEval 原因实际不会触发。")
         else:
-            info_enabled.insert(0, f"使能的触发器中，共有 {triggered_enabled} 个全部可以被正常触发。")
+            info_enabled.insert(0, f"{Settings.INFO_STYLE}使能的触发器中，共有 {triggered_enabled} 个全部可以被正常触发。")
 
         if triggered_disabled > 0:
-            info_disabled.insert(0, f"未使能的触发器中，共有 {triggered_disabled} 个可以匹配。")
+            info_disabled.insert(0, f"{Settings.INFO_STYLE}未使能的触发器中，共有 {triggered_disabled} 个可以匹配。")
         else:
-            info_disabled.insert(0, f"未使能触发器，没有可以匹配的。")
+            info_disabled.insert(0, f"{Settings.INFO_STYLE}未使能触发器，没有可以匹配的。")
 
         if triggered_enabled + triggered_disabled == 0:
             info_all.append(f"PYMUD 触发器测试: {'响应模式' if docallback else '测试模式'}")
@@ -3275,13 +3206,13 @@ class Session:
     def info2(self, msg, title = "PYMUD INFO", style = Settings.INFO_STYLE):
         msg = f"{msg}"
 
-        if Settings.client["newline"] in msg:
-            new_lines = list()
-            msg_lines = msg.split(Settings.client["newline"])
-            for line in msg_lines:
-                new_lines.append("{}{}".format(style, line))
+        # if Settings.client["newline"] in msg:
+        #     new_lines = list()
+        #     msg_lines = msg.split(Settings.client["newline"])
+        #     for line in msg_lines:
+        #         new_lines.append("{}{}".format(style, line))
 
-            msg = Settings.client["newline"].join(new_lines)
+        #     msg = Settings.client["newline"].join(new_lines)
 
         # 将颜色跨行显示移动到了MudFormatProcessor中，此处无需再处理(不行，还得恢复)
         self.writetobuffer("{}[{}] {}{}".format(style, title, msg, Settings.CLR_STYLE), newline = True)

pymud/settings.py

@@ -11,9 +11,9 @@ class Settings:
     "APP 名称, 默认PYMUD"
     __appdesc__   = "a MUD client written in Python"
     "APP 简要描述"
-    __version__   = "0.20.1"
+    __version__   = "0.20.2"
     "APP 当前版本"
-    __release__   = "2024-11-16"
+    __release__   = "2024-11-18"
     "APP 当前版本发布日期"
     __author__    = "本牛(newstart)@北侠"
     "APP 作者"

{pymud-0.20.2a1.dist-info → pymud-0.20.2a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymud
-Version: 0.20.2a1
+Version: 0.20.2a3
 Summary: a MUD Client written in Python
 Author-email: "newstart@pkuxkx" <crapex@hotmail.com>
 Maintainer-email: "newstart@pkuxkx" <crapex@hotmail.com>
@@ -737,10 +737,11 @@ Requires-Dist: prompt-toolkit
 
 ## 版本更新信息
 
-## 0.20.2 (2024-11-18)
-+ 功能调整: MTTS协商中，将256 Color明确写入协商回复。原先仅包含ANSI 和 TrueColor。
+## 0.20.2 (2024-11-20)
++ 功能调整: MTTS协商中，将256 Color明确写入协商回复。原先仅包含ANSI 和 TrueColor。推测武庙特殊颜色偶尔不正常与此有关。
 + 功能调整: 修复了纯文本正则处理，目前理论上支持所有ANSI控制代码的处置，以正确响应纯文本触发器。
 + 功能调整: 修改了#var和#global的显示实现，提高了变量打印排列的整齐度和辨识度，以适应长值变量和复杂变量。
++ 问题修复: 修复了单行颜色代码跨行无法显示问题。现在星宿毒草可以正常辨认颜色了。
 
 ## 0.20.1 (2024-11-16)
 + 功能调整: 会话中触发器匹配实现进行部分调整，减少循环次数以提高响应速度

{pymud-0.20.2a1.dist-info → pymud-0.20.2a3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 pymud/__init__.py,sha256=AP4Edhx90gMKrNfD1O_KVciA3SOnyX5Qt9fZY_JhsTY,574
 pymud/__main__.py,sha256=hFzZjadLlcOuoLM7D8wFiFVO8mqF7vMuo9y-9xfIhRc,64
 pymud/dialogs.py,sha256=p-LidObSuDyOeMif5CsqhF5qq3rizZ1lmThWHrxDyRg,6726
-pymud/extras.py,sha256=Gr-gX7YRWZMmeKV73sk7h_Gf5eZVJ6GcAXvSEfJ4uMI,41124
+pymud/extras.py,sha256=Lr4_B1-KFM47cEMqfLZy7R3Kw8eF3b5MucqaHYQwKOE,40817
 pymud/logger.py,sha256=sq9HhZ6-prY34NnDUO1NjaCRy-e5-fr2j0na8FKp9ks,5789
 pymud/main.py,sha256=b_Ui_cN4W8IfhYNyc1duwr3Bp7pYYZQusKTSafCWZIA,6534
 pymud/modules.py,sha256=XoqTeYfZCgqDsV3SYxeehzsbkTzs0swelAUIxyWuL9g,7423
@@ -9,11 +9,11 @@ pymud/objects.py,sha256=qSOFuVZvMh3lxjg6x5JUzcr_sTSgakWWySh801x7TNQ,39457
 pymud/pkuxkx.py,sha256=jRQRUs2xtw7GzYHtLYZXOASnqMumKh0iCoOeKZs8NnU,11467
 pymud/protocol.py,sha256=nlsyXMBAHEf_067mPNGDHzN_zIm9808D8YDIZTNrygg,49118
 pymud/pymud.py,sha256=4v-pdSheWfWCK7O-3bAipK7WE6zPe8mRLil7E1Zbnas,51663
-pymud/session.py,sha256=SrDcYxbHEJDC01x9cM0mWh1U5RC3jNjH660qlAjiuzU,141531
-pymud/settings.py,sha256=ZsKGkjcNGNwqeb2DztwhIrCcRDPYYN1SxtdjWNAJ9CY,7145
-pymud-0.20.2a1.dist-info/LICENSE.txt,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-pymud-0.20.2a1.dist-info/METADATA,sha256=cvzddI3UTmc53fgWNcUK1eQxgMtMk0PlJ_G0sO5OhnE,74774
-pymud-0.20.2a1.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-pymud-0.20.2a1.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
-pymud-0.20.2a1.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
-pymud-0.20.2a1.dist-info/RECORD,,
+pymud/session.py,sha256=b98nAkM5IcBHiE2gG7v9W7oZ8YL8s5PlvCpHNEzboKg,138880
+pymud/settings.py,sha256=c9345jdR0APj1xebymyLzAATqhIFqGwToSCBXRtGuHo,7145
+pymud-0.20.2a3.dist-info/LICENSE.txt,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+pymud-0.20.2a3.dist-info/METADATA,sha256=GmnvkxqaUVxgPET6HkUXbeo4AK7NOZQAAd8766XrZ_w,74948
+pymud-0.20.2a3.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+pymud-0.20.2a3.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
+pymud-0.20.2a3.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
+pymud-0.20.2a3.dist-info/RECORD,,