pymud 0.18.1__py3-none-any.whl → 0.18.2__py3-none-any.whl

pymud/objects.py

@@ -104,8 +104,8 @@ class CodeLine:
         new_code_str = self.__code
         new_code = []
 
-        line = kwargs.get("line", None)
-        raw  = kwargs.get("raw", None)
+        line = kwargs.get("line", None) or session.getVariable("%line", "None")
+        raw  = kwargs.get("raw", None) or session.getVariable("%raw", "None")
         wildcards = kwargs.get("wildcards", None)
 
         for item in self.code:
@@ -116,7 +116,7 @@ class CodeLine:
                 if idx <= len(wildcards):
                     item_val = wildcards[idx-1]
                 else:
-                    item_val = None
+                    item_val = "None"
                 new_code.append(item_val)
                 new_code_str = new_code_str.replace(item, item_val, 1)
 
@@ -726,6 +726,7 @@ class Timer(BaseObject):
 
     def __init__(self, session, *args, **kwargs):
         self._task = None
+        self._halt = False
         super().__init__(session, *args, **kwargs)
 
     def __del__(self):
@@ -733,24 +734,36 @@ class Timer(BaseObject):
 
     def startTimer(self):
         if not isinstance(self._task, asyncio.Task):
+            self._halt = False
             self._task = asyncio.create_task(self.onTimerTask())
 
         asyncio.ensure_future(self._task)
 
     async def onTimerTask(self):
-        if self.enabled:
+        # 定时任务，修改为一直循环
+        while self._enabled:
             await asyncio.sleep(self.timeout)
+
             if callable(self._onSuccess):
                 self._onSuccess(self.id)
 
-            if self.oneShot:
-                self.enabled = False
-            else:   
-                await asyncio.create_task(self.onTimerTask())
+            if self.oneShot or self._halt:
+                break
+
+        # if self.enabled:
+        #     await asyncio.sleep(self.timeout)
+        #     if callable(self._onSuccess):
+        #         self._onSuccess(self.id)
+
+        #     if self.oneShot:
+        #         self.enabled = False
+        #     else:   
+        #         await asyncio.create_task(self.onTimerTask())
 
     def reset(self):
         "复位定时器，清除所创建的定时任务"
         try:
+            self._halt = True
             if isinstance(self._task, asyncio.Task) and (not self._task.done()):
                 self._task.cancel()
 
@@ -781,10 +794,9 @@ class SimpleTimer(Timer):
         self._code = code
         self._codeblock = CodeBlock(code)
         super().__init__(session, *args, **kwargs)
-        self.sync       = kwargs.get("sync", False)                 # 同步模式，默认异步
 
-    def onSuccess(self, *args, **kwargs):
-        self._codeblock.execute(self.session, *args, **kwargs)
+    def onSuccess(self, id):
+        self._codeblock.execute(self.session, id = id)
 
     def __detailed__(self) -> str:
         return f'<{self.__class__.__name__}> id = "{self.id}" group = "{self.group}" enabled = {self.enabled} timeout = {self.timeout} code = "{self._code}"'

pymud/session.py

@@ -1620,7 +1620,9 @@ class Session:
         "      注意：在触发器中使用。多行触发器时，替代只替代最后一行"
         "\x1b[1m相关\x1b[0m: gag\n"
         
-        self.replace(code.commandText[9:])
+        new_text, new_code = code.expand(self, *args, **kwargs)
+        self.replace(new_text[9:])
+        #self.replace(code.commandText[9:])
         #self.display_line = code.commandText[9:]
         
     def handle_gag(self, code: CodeLine = None, *args, **kwargs):

pymud/settings.py

@@ -11,15 +11,15 @@ class Settings:
     "APP 名称, 默认PYMUD"
     __appdesc__   = "a MUD client written in Python"
     "APP 简要描述"
-    __version__   = "0.18.1"
+    __version__   = "0.18.2"
     "APP 当前版本"
-    __release__   = "2024-02-05"
+    __release__   = "2024-02-06"
     "APP 当前版本发布日期"
     __author__    = "本牛(newstart)@北侠"
     "APP 作者"
     __email__     = "crapex@crapex.cc"
     "APP 作者邮箱"
-    __website__     = "https://github.com/crapex/pymud"
+    __website__     = "https://pypi.org/project/pymud"
     "APP 发布网址"
 
     server = {

{pymud-0.18.1.dist-info → pymud-0.18.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymud
-Version: 0.18.1
+Version: 0.18.2
 Summary: a MUD Client written in Python
 Author-email: "newstart@pkuxkx" <crapex@crapex.cc>
 Maintainer-email: "newstart@pkuxkx" <crapex@crapex.cc>
@@ -893,4 +893,8 @@ Requires-Dist: prompt-toolkit
 + 问题修复：统一处置了task.cancel的参数和create_task的name属性，以适应更低版本的python环境（低至3.7）
 + 实现调整：为解决同步/异步执行问题，在CodeLine和CodeBlock的实现中，会通过调用命令来判断是否使用同步模式（默认为异步）。#gag、#replace为强制同步，#wa为强制异步。当同时存在时，同步失效，异步执行。
 + 实现调整：将%line、%raw的访问传递到触发器内部的执行中，避免同步异步问题。
-+ 新增文档：将帮助文档添加到本项目，帮助文档自动同步到 pymud.readthedocs.org
++ 新增文档：将帮助文档添加到本项目，帮助文档自动同步到 pymud.readthedocs.org （文档内容暂未更新）
+
+### 0.18.2 (2024-02-06)
++ 问题修复：修改了定时器实现，以避免出现递归调用超限异常
++ 问题修复：修改了参数替代时的默认值，从None改为字符串"None"，以避免替代时报None异常

{pymud-0.18.1.dist-info → pymud-0.18.2.dist-info}/RECORD

@@ -2,15 +2,15 @@ pymud/__init__.py,sha256=G_k8deY6ulAJdtNkaYn6_zM0j2InJNddxMhnoSqZV30,417
 pymud/__main__.py,sha256=uGbkGxwhNkpZVYn0mGnPpfTdqkxzfu8Jf8WAV_Uykuo,361
 pymud/dialogs.py,sha256=_OE1vq_hbu7rUbjsvCH2mEEhEYMiwXEJE0TXIYZc0EI,5591
 pymud/extras.py,sha256=uFMjoO2fgSQT0lx7BoejAExeGKJ5QTkS5Kwatblfvdg,41490
-pymud/objects.py,sha256=_tmIsb0hYyybYC_VCz7ngaJlqD9VTJQthyVu4rI0jI4,28632
+pymud/objects.py,sha256=2qnrNI_891y-Wo6Z0xjoPcbJSfrPLbyZOmUNXMsYAz0,28983
 pymud/pkuxkx.py,sha256=_CR4ETm-ihl5ZqznB75-pT3NdZSfUiuOsvEh5MwSjHI,11417
 pymud/protocol.py,sha256=F96Yq-1YO_5GN6QnJ4vMdNjCAzejVmDdsfrJguCjCeE,49120
 pymud/pymud.py,sha256=Q0VB4aX-CV7Lyi88EuaKBb1Qai8f9hk5B-jG7CCs-70,38291
-pymud/session.py,sha256=wNP4kYQBP142sirmzV8lscvdp_eHtuJs7zwlOYvz2cc,70139
-pymud/settings.py,sha256=pYGixOdaH6twZ5gTEcb1qXsoL0G5wR1C8bbMnxIIOt8,6484
-pymud-0.18.1.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymud-0.18.1.dist-info/METADATA,sha256=gigQ4qn8YZbxiJnKXada0-Jb7u_7DKzpkTyk8JRfI4Y,61714
-pymud-0.18.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-pymud-0.18.1.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
-pymud-0.18.1.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
-pymud-0.18.1.dist-info/RECORD,,
+pymud/session.py,sha256=pehDGkNJDxt99aZ-5M151BkgFFiAXXg6sWK7f31_nS8,70241
+pymud/settings.py,sha256=eAMaavWTriI229pgPfYNHjOTNiv44QTu434fuLBqfWg,6483
+pymud-0.18.2.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymud-0.18.2.dist-info/METADATA,sha256=WjVXXZMkoN4tV6V-HozMjLx64Ik0MkBb4lJ5KLdfawI,61977
+pymud-0.18.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+pymud-0.18.2.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
+pymud-0.18.2.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
+pymud-0.18.2.dist-info/RECORD,,