pymud 0.19.3.post2__py3-none-any.whl → 0.19.4__py3-none-any.whl

pymud/objects.py

@@ -120,27 +120,27 @@ class CodeLine:
                 else:
                     item_val = "None"
                 new_code.append(item_val)
-                new_code_str = new_code_str.replace(item, item_val, 1)
+                new_code_str = new_code_str.replace(item, f"{item_val}", 1)
 
             # 系统变量，%开头
             elif item == "%line":
                 new_code.append(line)
-                new_code_str = new_code_str.replace(item, line, 1)
+                new_code_str = new_code_str.replace(item, f"{line}", 1)
 
             elif item == "%raw":
                 new_code.append(raw)
-                new_code_str = new_code_str.replace(item, raw, 1)
+                new_code_str = new_code_str.replace(item, f"{raw}", 1)
 
             elif item[0] == "%":
                 item_val = session.getVariable(item, "")
                 new_code.append(item_val)
-                new_code_str = new_code_str.replace(item, item_val, 1)
+                new_code_str = new_code_str.replace(item, f"{item_val}", 1)
 
             # 非系统变量，@开头，在变量明前加@引用
             elif item[0] == "@":
                 item_val = session.getVariable(item[1:], "")
                 new_code.append(item_val)
-                new_code_str = new_code_str.replace(item, item_val, 1)
+                new_code_str = new_code_str.replace(item, f"{item_val}", 1)
 
             else:
                 new_code.append(item)

pymud/pymud.py

@@ -462,8 +462,12 @@ class PyMudApp:
         """
         b = self.consoleView.buffer
         if b.selection_state:
-            srow, scol = b.document.translate_index_to_position(b.selection_state.original_cursor_position)
-            erow, ecol = b.document.translate_index_to_position(b.document.cursor_position)
+            cur1, cur2 = b.selection_state.original_cursor_position, b.document.cursor_position
+            start, end = min(cur1, cur2), max(cur1, cur2)
+            srow, scol = b.document.translate_index_to_position(start)
+            erow, ecol = b.document.translate_index_to_position(end)
+            # srow, scol = b.document.translate_index_to_position(b.selection_state.original_cursor_position)
+            # erow, ecol = b.document.translate_index_to_position(b.document.cursor_position)
 
             if not raw:
                 # Control-C 复制纯文本

pymud/session.py

@@ -1677,7 +1677,10 @@ class Session:
             - #global
         '''
 
-        args = code.code[2:]
+        new_cmd_text, new_code = code.expand(self, *args, **kwargs)
+        args = new_code[2:]
+
+        #args = code.code[2:]
 
         if len(args) == 0:
             vars = self._variables
@@ -1735,7 +1738,13 @@ class Session:
                 self.warning(f"当前session中不存在名称为 {args[0]} 的变量")
             
         elif len(args) == 2:
-            self.setVariable(args[0], args[1])
+            val = None
+            try:
+                val = eval(args[1])
+            except:
+                val = args[1]
+
+            self.setVariable(args[0], val)
 
     def handle_global(self, code: CodeLine = None, *args, **kwargs):
         '''
@@ -1756,7 +1765,9 @@ class Session:
             - #variable
         '''
 
-        args = code.code[2:]
+        new_cmd_text, new_code = code.expand(self, *args, **kwargs)
+        args = new_code[2:]
+        #args = code.code[2:]
 
         if len(args) == 0:
             vars = self.application.globals
@@ -1810,7 +1821,12 @@ class Session:
                 self.info("全局空间不存在名称为 {} 的变量".format(var), "全局变量")
             
         elif len(args) == 2:
-            self.application.set_globals(args[0], args[1])
+            val = None
+            try:
+                val = eval(args[1])
+            except:
+                val = args[1]
+            self.application.set_globals(args[0], val)
 
     def _handle_objs(self, name: str, objs: dict, *args):
         if len(args) == 0:
@@ -2775,6 +2791,8 @@ class Session:
         self.error(new_text[6:])
 
     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"])

pymud/settings.py

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

{pymud-0.19.3.post2.dist-info → pymud-0.19.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymud
-Version: 0.19.3.post2
+Version: 0.19.4
 Summary: a MUD Client written in Python
 Author-email: "newstart@pkuxkx" <crapex@crapex.cc>
 Maintainer-email: "newstart@pkuxkx" <crapex@crapex.cc>
@@ -963,3 +963,10 @@ Requires-Dist: prompt-toolkit
 
 ### 0.19.3post2 （2024-04-05）
 + 问题修复: 修复退出程序时的小bug
+
+### 0.19.4 (2024-04-20)
++ 功能调整: info 现在 msg 恢复为可接受任何类型参数，不一定是 str
++ 功能调整: #var, #global 指令中，现在可以使用参数扩展了，例如 #var max_qi @qi
++ 功能调整: #var, #global 指令中，现在对字符串会先使用 eval 转换类型，转换失败时使用 str 类型。例如， #var myvar 1 时，myvar类型将为int
++ 功能调整: 变量替代时，会自动实现类型转化，当被替代变量值为非 str 类型时不会再报错
++ 问题修复: 修复之前从后向前选择时，无法复制的问题

pymud-0.19.4.dist-info/RECORD

@@ -0,0 +1,16 @@
+pymud/__init__.py,sha256=5SteBKAKAizt98QOxDRuGxRHhoDAijdG8lC5U7az2SM,422
+pymud/__main__.py,sha256=I6jFLnTErSuM0G828WUx5EIAmMNAzqYr2AT1zdtGmp0,4636
+pymud/dialogs.py,sha256=SRNHOashupNi7128Bg_35J1rrI2TsZEakTbaMW5d9PU,5596
+pymud/extras.py,sha256=p2fgnzKFtaAvcYqayMNSZhrC3BpvfkbF_la3SfGaWBA,42400
+pymud/objects.py,sha256=hERTIctGF660CoHwZf00-5RZ1-bqCPK2QuwmTZ7NceU,38088
+pymud/pkuxkx.py,sha256=vWXHU6GF0HQ0eWb3LmxFVRP0cKnigffCX7Z-LJvwVtw,11496
+pymud/protocol.py,sha256=QfDXjlg2OcJXmVoXf_3mAemnYotRXDUlEZNQjhkfXdA,49106
+pymud/pymud.py,sha256=HgmAXBXNMjo8xKAVQRS2XOshp-hieEy7bjvaXGq_0Y0,43230
+pymud/session.py,sha256=18QIArVTPKEBETv4pTWSXssy12XbM4cFj0IhCyio49U,114503
+pymud/settings.py,sha256=p1YPxDAh0isRsoRVGOgklawXYkzUE490irNiizWylB4,7092
+pymud-0.19.4.dist-info/LICENSE.txt,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+pymud-0.19.4.dist-info/METADATA,sha256=ApUZTZZRwQvR0vXUAd1gMTlcfLjT3NWYz2mKtmuHJmo,67839
+pymud-0.19.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pymud-0.19.4.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
+pymud-0.19.4.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
+pymud-0.19.4.dist-info/RECORD,,

pymud-0.19.3.post2.dist-info/RECORD

@@ -1,16 +0,0 @@
-pymud/__init__.py,sha256=5SteBKAKAizt98QOxDRuGxRHhoDAijdG8lC5U7az2SM,422
-pymud/__main__.py,sha256=I6jFLnTErSuM0G828WUx5EIAmMNAzqYr2AT1zdtGmp0,4636
-pymud/dialogs.py,sha256=SRNHOashupNi7128Bg_35J1rrI2TsZEakTbaMW5d9PU,5596
-pymud/extras.py,sha256=p2fgnzKFtaAvcYqayMNSZhrC3BpvfkbF_la3SfGaWBA,42400
-pymud/objects.py,sha256=1cEhGtJ0mPrPSEXUw9t_okj9br2jN3Yx7djT1ht1a-4,38063
-pymud/pkuxkx.py,sha256=vWXHU6GF0HQ0eWb3LmxFVRP0cKnigffCX7Z-LJvwVtw,11496
-pymud/protocol.py,sha256=QfDXjlg2OcJXmVoXf_3mAemnYotRXDUlEZNQjhkfXdA,49106
-pymud/pymud.py,sha256=t0LOkqNaQnV1jhnn8O6Qr3e0mTxOEtLZgvnYcK6xa7A,42928
-pymud/session.py,sha256=d5MGyLO2-s2vhFuuFhU-URXN74KycdO_Xp0Zh4et2dY,114021
-pymud/settings.py,sha256=bP0zfX14wLZ6sVlVYCdxZmJqGoqNctu385L322moTeQ,7092
-pymud-0.19.3.post2.dist-info/LICENSE.txt,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-pymud-0.19.3.post2.dist-info/METADATA,sha256=_g-MsxMSBpGxoe11rx0hDaC70ZisLI0e9U4Frw1Qhe8,67251
-pymud-0.19.3.post2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pymud-0.19.3.post2.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
-pymud-0.19.3.post2.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
-pymud-0.19.3.post2.dist-info/RECORD,,