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

pymud/extras.py

@@ -66,8 +66,8 @@ 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.COLOR_REGX   = re.compile(r"\[[\d;]+m")
+        self.ALL_COLOR_REGX  = re.compile(r"(?:\[[\d;]+m)+")
+        self.AVAI_COLOR_REGX = re.compile(r"(?:\[[\d;]+m)+(?!$)")
         self._color_start = ""
         self._color_correction = False
         self._color_line_index = 0
@@ -111,21 +111,25 @@ class MudFormatProcessor(Processor):
         line = fragment_list_to_text(transformation_input.fragments)
 
         # 颜色校正
-        thislinecolors = len(self.COLOR_REGX.findall(line))
+        thislinecolors = len(self.AVAI_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)
+                allcolors = self.ALL_COLOR_REGX.findall(lastline)
                 
-                if len(colors) == 0:
-                    lineno = lineno -1
+                if len(allcolors) == 0:
+                    lineno = lineno - 1
 
-                elif len(colors) == 1:
-                    line = f"{colors[0]}{line}"
-                    break
+                elif len(allcolors) == 1:
+                    colors = self.AVAI_COLOR_REGX.findall(lastline)
+                    
+                    if len(colors) == 1:
+                        line = f"{colors[0]}{line}"
+                        break
+
+                    else:
+                        break
 
                 else:
                     break

pymud/session.py

@@ -3012,15 +3012,15 @@ class Session:
                         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"  {tri.__detailed__()} 正常触发。")
-                        info_enabled.append(f"    捕获：{state.wildcards}")
+                        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"      {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"    {Settings.WARN_STYLE}{tri.__detailed__()} 可以触发，但由于优先级与keepEval设定，触发器不会触发。{Settings.CLR_STYLE}")
                         #info_enabled.append(f"  {tri.__detailed__()} 可以触发，但由于优先级与keepEval设定，触发器不会触发。")
             
             
@@ -3033,35 +3033,37 @@ 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"  {tri.__detailed__()} 可以匹配触发。")
+                    info_disabled.append(f"    {tri.__detailed__()} 可以匹配触发。")
 
             if triggered_enabled + triggered_disabled == 0:
                 info_all.append("")
 
         if triggered_enabled == 0:
-            info_enabled.insert(0, f"{Settings.INFO_STYLE}使能的触发器中，没有可以触发的。")
+            info_enabled.insert(0, f"{Settings.INFO_STYLE}  使能的触发器中，没有可以触发的。")
         elif triggered < triggered_enabled:
-            info_enabled.insert(0, f"{Settings.INFO_STYLE}使能的触发器中，共有 {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"{Settings.INFO_STYLE}使能的触发器中，共有 {triggered_enabled} 个全部可以被正常触发。")
+            info_enabled.insert(0, f"{Settings.INFO_STYLE}  使能的触发器中，共有 {triggered_enabled} 个全部可以被正常触发。")
 
         if triggered_disabled > 0:
-            info_disabled.insert(0, f"{Settings.INFO_STYLE}未使能的触发器中，共有 {triggered_disabled} 个可以匹配。")
+            info_disabled.insert(0, f"{Settings.INFO_STYLE}  未使能的触发器中，共有 {triggered_disabled} 个可以匹配。")
         else:
-            info_disabled.insert(0, f"{Settings.INFO_STYLE}未使能触发器，没有可以匹配的。")
-
+            info_disabled.insert(0, f"{Settings.INFO_STYLE}  未使能触发器，没有可以匹配的。")
+        
+        info_all.append("")
         if triggered_enabled + triggered_disabled == 0:
-            info_all.append(f"PYMUD 触发器测试: {'响应模式' if docallback else '测试模式'}")
+            #info_all.append(f"PYMUD 触发器测试: {'响应模式' if docallback else '测试模式'}")
             info_all.append(f"  测试内容: {line}")
             info_all.append(f"  测试结果: 没有可以匹配的触发器。")
         else:
-            info_all.append(f"PYMUD 触发器测试: {'响应模式' if docallback else '测试模式'}")
+            #info_all.append(f"PYMUD 触发器测试: {'响应模式' if docallback else '测试模式'}")
             info_all.append(f"  测试内容: {line}")
             info_all.append(f"  测试结果: 有{triggered}个触发器可以被正常触发，一共有{triggered_enabled + triggered_disabled}个满足匹配触发要求。")
             info_all.extend(info_enabled)
             info_all.extend(info_disabled)
-
-        self.info("\n".join(info_all), "PYMUD 触发器测试")
+        
+        title = f"触发器测试 - {'响应模式' if docallback else '测试模式'}"
+        self.info("\n".join(info_all), title)
         #self.info("PYMUD 触发器测试 完毕")
 
     def handle_plugins(self, code: CodeLine = None, *args, **kwargs):
@@ -3185,7 +3187,7 @@ class Session:
         '''
         
         new_text, new_code = code.expand(self, *args, **kwargs)
-        self.warning(new_text[6:])
+        self.warning(new_text[9:])
 
     def handle_error(self, code: CodeLine = None, *args, **kwargs):
         '''
@@ -3201,9 +3203,9 @@ class Session:
         '''
         
         new_text, new_code = code.expand(self, *args, **kwargs)
-        self.error(new_text[6:])
+        self.error(new_text[7:])
 
-    def info2(self, msg, title = "PYMUD INFO", style = Settings.INFO_STYLE):
+    def info2(self, msg, title = "消息", style = Settings.INFO_STYLE):
         msg = f"{msg}"
 
         # if Settings.client["newline"] in msg:
@@ -3215,9 +3217,9 @@ class Session:
         #     msg = Settings.client["newline"].join(new_lines)
 
         # 将颜色跨行显示移动到了MudFormatProcessor中，此处无需再处理(不行，还得恢复)
-        self.writetobuffer("{}[{}] {}{}".format(style, title, msg, Settings.CLR_STYLE), newline = True)
+        self.writetobuffer("{}〔{}〕{}{}".format(style, title, msg, Settings.CLR_STYLE), newline = True)
 
-    def info(self, msg, title = "PYMUD INFO", style = Settings.INFO_STYLE):
+    def info(self, msg, title = "提示", style = Settings.INFO_STYLE):
         """
         使用默认的INFO_STYLE（绿色）输出信息，并自动换行。信息格式类似 [title] msg
         
@@ -3227,7 +3229,7 @@ class Session:
         """
         self.info2(msg, title, style)
 
-    def warning(self, msg, title = "PYMUD WARNING", style = Settings.WARN_STYLE):
+    def warning(self, msg, title = "警告", style = Settings.WARN_STYLE):
         """
         使用默认的WARN_STYLE（黄色）输出信息，并自动换行。信息格式类似 [title] msg
         
@@ -3237,7 +3239,7 @@ class Session:
         """
         self.info2(msg, title, style)
 
-    def error(self, msg, title = "PYMUD ERROR", style = Settings.ERR_STYLE):
+    def error(self, msg, title = "错误", style = Settings.ERR_STYLE):
         """
         使用默认的ERR_STYLE（红色）输出信息，并自动换行。信息格式类似 [title] msg
         

pymud/settings.py

@@ -174,8 +174,8 @@ class Settings:
         "value"     : "fg:green",
     }
 
-    INFO_STYLE     = "\x1b[32m"     #"\x1b[38;2;0;128;255m"
-    WARN_STYLE     = "\x1b[33m"
-    ERR_STYLE      = "\x1b[31m"
+    INFO_STYLE     = "\x1b[48;5;22m\x1b[38;5;252m"     #"\x1b[38;2;0;128;255m"
+    WARN_STYLE     = "\x1b[48;5;220m\x1b[38;5;238m"
+    ERR_STYLE      = "\x1b[48;5;160m\x1b[38;5;252m"
     CLR_STYLE      = "\x1b[0m"
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymud
-Version: 0.20.2a3
+Version: 0.20.2a5
 Summary: a MUD Client written in Python
 Author-email: "newstart@pkuxkx" <crapex@hotmail.com>
 Maintainer-email: "newstart@pkuxkx" <crapex@hotmail.com>
@@ -742,6 +742,7 @@ Requires-Dist: prompt-toolkit
 + 功能调整: 修复了纯文本正则处理，目前理论上支持所有ANSI控制代码的处置，以正确响应纯文本触发器。
 + 功能调整: 修改了#var和#global的显示实现，提高了变量打印排列的整齐度和辨识度，以适应长值变量和复杂变量。
 + 问题修复: 修复了单行颜色代码跨行无法显示问题。现在星宿毒草可以正常辨认颜色了。
++ 功能调整: 调整了info/warning/error的显示处理，默认样式进行了修改。
 
 ## 0.20.1 (2024-11-16)
 + 功能调整: 会话中触发器匹配实现进行部分调整，减少循环次数以提高响应速度

{pymud-0.20.2a3.dist-info → pymud-0.20.2a5.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=Lr4_B1-KFM47cEMqfLZy7R3Kw8eF3b5MucqaHYQwKOE,40817
+pymud/extras.py,sha256=lCRlNIaYqrcCLGe8zrulFvh7aC5nU_jHFMD2sI9JCrU,40955
 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=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,,
+pymud/session.py,sha256=dO6asU6Pva9JjuhecyUHDCp1qH59FkSIUsmJbTjtFDI,139001
+pymud/settings.py,sha256=LHDomT7AMVUi1QQqlFS02mgQ6AqJJBkZeg8YoF-43SE,7204
+pymud-0.20.2a5.dist-info/LICENSE.txt,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+pymud-0.20.2a5.dist-info/METADATA,sha256=8oYUsKU0Rwbys95Xc9esV2-5SfyV6VY7QVSTdP2fSZo,75041
+pymud-0.20.2a5.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+pymud-0.20.2a5.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
+pymud-0.20.2a5.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
+pymud-0.20.2a5.dist-info/RECORD,,