pymud 0.20.2a4__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

@@ -3217,7 +3217,7 @@ 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 = "提示", style = Settings.INFO_STYLE):
         """

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymud
-Version: 0.20.2a4
+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>

{pymud-0.20.2a4.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=97KIOD6OxMDIMkAxAinbuKTMEtvPvO_F2DMbITQbekU,40827
+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=qOQJbh-EW1uQwS36UpZncLHgVJDJ4bawfqqPASeylmM,138999
+pymud/session.py,sha256=dO6asU6Pva9JjuhecyUHDCp1qH59FkSIUsmJbTjtFDI,139001
 pymud/settings.py,sha256=LHDomT7AMVUi1QQqlFS02mgQ6AqJJBkZeg8YoF-43SE,7204
-pymud-0.20.2a4.dist-info/LICENSE.txt,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-pymud-0.20.2a4.dist-info/METADATA,sha256=Ru0i-uTvROJHer1YOaNPV8oZC99LiYU67m62YyZLLbA,75041
-pymud-0.20.2a4.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-pymud-0.20.2a4.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
-pymud-0.20.2a4.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
-pymud-0.20.2a4.dist-info/RECORD,,
+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,,