pymud 0.18.3__py3-none-any.whl → 0.18.4.post1__py3-none-any.whl

pymud/extras.py

@@ -128,9 +128,7 @@ class MudFormatProcessor(Processor):
     def tab_correction(self, line: str):
         return line.replace("\t", " " * Settings.client["tabstop"])
 
-    def apply_transformation(self, transformation_input):
-        # 准备（先还原为str）
-        line = fragment_list_to_text(transformation_input.fragments)
+    def line_correction(self, line: str):
         # 处理\r符号（^M）
         line = self.return_correction(line)
         # 处理Tab(\r)符号（^I）
@@ -138,6 +136,13 @@ class MudFormatProcessor(Processor):
         # 美化（解决中文英文在Console中不对齐的问题）
         if Settings.client["beautify"]:
             line = self.width_correction(line)
+
+        return line
+
+    def apply_transformation(self, transformation_input):
+        # 准备（先还原为str）
+        line = fragment_list_to_text(transformation_input.fragments)
+        line = self.line_correction(line)
         # 处理ANSI标记（生成FormmatedText）
         fragments = to_formatted_text(ANSI(line))
         return Transformation(fragments)

pymud/pymud.py

@@ -155,10 +155,12 @@ class PyMudApp:
             show_cursor=False
         )
 
+        self.mudFormatProc = MudFormatProcessor()
+
         self.consoleView = SessionBufferControl(
             buffer = None,
             input_processors=[
-                MudFormatProcessor(),
+                self.mudFormatProc,
                 HighlightSearchProcessor(),
                 HighlightSelectionProcessor(),
                 DisplayMultipleCursors(),
@@ -416,7 +418,8 @@ class PyMudApp:
 
                 if srow == erow:
                     # 单行情况
-                    line = b.document.current_line
+                    #line = b.document.current_line
+                    line = self.mudFormatProc.line_correction(b.document.current_line)
                     start = max(0, scol)
                     end = min(ecol, len(line))
                     line_plain = re.sub("\x1b\\[[\d;]+[abcdmz]", "", line, flags = re.IGNORECASE).replace("\r", "").replace("\x00", "")

pymud/session.py

@@ -105,7 +105,7 @@ class Session:
         self.buffer_pos_view  = 0                           # 标注查看位置光标指针
         self.buffer_pos_view_line = -1
         self.showHistory      = False                       # 是否显示历史
-
+        self._line_count      = 0                           # 快速访问行数
         self._status_maker = None                           # 创建状态窗口的函数（属性）
         self.display_line  = ""
 
@@ -333,8 +333,19 @@ class Session:
         "将数据写入到用于本地显示的缓冲中"
         self.buffer.insert_text(data)
 
+        if data[-1] == "\n":
+            self._line_count += 1
+
         if newline:
             self.buffer.insert_text(self.newline_cli)
+            self._line_count += 1
+
+    def clear_buffer(self):
+        "清除过多缓冲"
+        if (self._line_count >= 2 * Settings.client["buffer_lines"]) and self.buffer.document.is_cursor_at_the_end:
+            startindex = self.buffer.document.translate_row_col_to_index(-1 * Settings.client["buffer_lines"], 0)
+            self.buffer.text = self.buffer.document.text[startindex:]
+            self._line_count = self.buffer.document.line_count
 
     def feed_data(self, data) -> None:
         "永远只会传递1个字节的数据，以bytes形式"
@@ -369,6 +380,8 @@ class Session:
 
     def go_ahead(self) -> None:
         "把当前接收缓冲内容放到显示缓冲中"
+        self.clear_buffer()
+        
         raw_line = self._line_buffer.decode(self.encoding, Settings.server["encoding_errors"])
         tri_line = self.getPlainText(raw_line, trim_newline = True)
         self._line_buffer.clear()

pymud/settings.py

@@ -11,9 +11,9 @@ class Settings:
     "APP 名称, 默认PYMUD"
     __appdesc__   = "a MUD client written in Python"
     "APP 简要描述"
-    __version__   = "0.18.3"
+    __version__   = "0.18.4"
     "APP 当前版本"
-    __release__   = "2024-02-07"
+    __release__   = "2024-02-19"
     "APP 当前版本发布日期"
     __author__    = "本牛(newstart)@北侠"
     "APP 作者"
@@ -49,6 +49,7 @@ class Settings:
     "MUD协议所需的的默认MNES(Mud New-Environment Standard)配置信息"
 
     client = {
+        "buffer_lines"      : 5000,                 # 保留缓冲行数
         "status_width"      : 30,                   # 右侧状态栏的宽度
         "status_height"     : 6,                    # 下侧状态栏的高度
         "naws_width"        : 150,                  # 客户端NAWS宽度

{pymud-0.18.3.dist-info → pymud-0.18.4.post1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymud
-Version: 0.18.3
+Version: 0.18.4.post1
 Summary: a MUD Client written in Python
 Author-email: "newstart@pkuxkx" <crapex@crapex.cc>
 Maintainer-email: "newstart@pkuxkx" <crapex@crapex.cc>
@@ -682,6 +682,7 @@ License: GNU GENERAL PUBLIC LICENSE
 Project-URL: Homepage, https://github.com/crapex/pymud/
 Project-URL: Bug Reports, https://github.com/crapex/pymud/issues
 Project-URL: Source, https://github.com/crapex/pymud/
+Project-URL: document, https://pymud.readthedocs.io/
 Keywords: MUD,multi-user dungeon,client
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: End Users/Desktop
@@ -902,3 +903,10 @@ Requires-Dist: prompt-toolkit
 ### 0.18.3 (2024-02-07)
 + 功能调整：原#unload时通过调用__del__来实现卸载的时间不可控，现将模块卸载改为调用unload函数。若需卸载时人工清除有关定时器、触发器等，请在Configuration类下新增unload函数（参数仅self），并在其中进行实现
 + 功能新增：新增会话Variable和全局Global的删除接口。可以通过session.delVariable(name)删除一个变量，可以通过session.delGlobal(name)来删除一个全局Global变量
+
+### 0.18.4 (2024-02-19)
++ 功能新增：新增Settings.client["buffer_lines"]，表示保留的缓冲行数（默认5000）。当Session内容缓冲行数达到该值2倍时（10000行），将截取一半（5000行），后一半内容进行保留，前一半丢弃。此功能是为了减少长时挂机的内存消耗和响应时间。
++ 功能修复：解决在显示美化（Settings.client["beautify"]）打开之后，复制部分文字不能正确判断起始终止的问题。
+
+### 0.18.4post1 (2024-02-19)
++ 功能调整：修改缓冲行数判断逻辑，加快客户端判断响应速度。

pymud-0.18.4.post1.dist-info/RECORD

@@ -0,0 +1,16 @@
+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=iBSvh1KSLw2LDF1gAnH76hEMA55gg2TICJXdpAMiQBE,41601
+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=wzRTMFoJSPol6H-G6CXvgK7j5n1aIvTkxnkrEvBIrn4,38587
+pymud/session.py,sha256=tepG3Y2Pe1eQkYw5FtFq8cq2NkmLnEF31A1YQQqMgy4,71297
+pymud/settings.py,sha256=WUxwN6zh7k_uB2SDHQFFO1Qeg2T1aJqxGASFI_pIHFc,6557
+pymud-0.18.4.post1.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymud-0.18.4.post1.dist-info/METADATA,sha256=0cv_q7GEbfs157hTavRhVLk9C8RD9PTdT2i2gaUNnQA,63155
+pymud-0.18.4.post1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+pymud-0.18.4.post1.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
+pymud-0.18.4.post1.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
+pymud-0.18.4.post1.dist-info/RECORD,,

pymud-0.18.3.dist-info/RECORD

@@ -1,16 +0,0 @@
-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=2qnrNI_891y-Wo6Z0xjoPcbJSfrPLbyZOmUNXMsYAz0,28983
-pymud/pkuxkx.py,sha256=_CR4ETm-ihl5ZqznB75-pT3NdZSfUiuOsvEh5MwSjHI,11417
-pymud/protocol.py,sha256=F96Yq-1YO_5GN6QnJ4vMdNjCAzejVmDdsfrJguCjCeE,49120
-pymud/pymud.py,sha256=TTIuXMLPxmxuq9XSe3NP9DsLMdHxR5Xtu1b8rSOLcts,38447
-pymud/session.py,sha256=A9-VUlB6NMkS1J8_7K4zuSCaAJqiGMYJvBwcpiBLyyA,70648
-pymud/settings.py,sha256=Vxd6A7t0a2MrfY9HnMsAgAgRT0RqkwdrB1xOE5sOv8c,6483
-pymud-0.18.3.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymud-0.18.3.dist-info/METADATA,sha256=V-d8AHVp5VB70gab-zNIQVLfEn_zErGoE_8p3s2dpaI,62483
-pymud-0.18.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-pymud-0.18.3.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
-pymud-0.18.3.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
-pymud-0.18.3.dist-info/RECORD,,