pymud 0.21.2a1__py3-none-any.whl → 0.21.2.post1__py3-none-any.whl

pymud/extras.py

@@ -1,9 +1,10 @@
 # External Libraries
+from functools import lru_cache
 from unicodedata import east_asian_width
 from wcwidth import wcwidth
 from dataclasses import dataclass
-import time, re, logging
-
+import time, re, logging, linecache, os
+from typing import Optional, List, Dict
 from typing import Iterable, NamedTuple, Optional, Union, Tuple
 from prompt_toolkit import ANSI
 from prompt_toolkit.application import get_app
@@ -236,7 +237,7 @@ class VSplitWindow(Window):
             below = total - upper - 1
             
             #if isNotMargin:
-            if isinstance(self.content, SessionBufferControl):
+            if isinstance(self.content, PyMudBufferControl):
                 b = self.content.buffer
                 if not b:
                     return y
@@ -276,33 +277,35 @@ class VSplitWindow(Window):
                     
                 else:
                     # 有split window
-                    # 复制上半部分，正序复制，确保即使有自动折行时，第一行也保持在屏幕最顶部
-                    lineno = start_lineno
-                    while y < upper and lineno < line_count:
-                        line = ui_content.get_line(lineno)
-                        visible_line_to_row_col[y] = (lineno, horizontal_scroll)
-                        x = 0
-                        x, y = copy_line(line, lineno, x, y, is_input=True)
-                        lineno += 1
-                        y += 1
+                    
 
-                    # x = 0
-                    # x, y = copy_line([("","-"*width)], lineno, x, y, is_input=False)
-                    # y += 1
 
-                    # 复制下半部分，倒序复制，确保即使有自动折行时，最后一行也保持在屏幕最底部
+                    # 先复制下半部分，倒序复制，确保即使有自动折行时，最后一行也保持在屏幕最底部
                     y = total
                     lineno = line_count
 
-                    while y >= below and lineno >= 0:
+                    while y > below and lineno >= 0:
                         lineno -= 1
                         # Take the next line and copy it in the real screen.
                         display_lines = ui_content.get_height_for_line(lineno, width, None)
                         y -= display_lines
+                        if y <= below:
+                            break
                         line = ui_content.get_line(lineno)
                         visible_line_to_row_col[y] = (lineno, horizontal_scroll)
                         copy_line(line, lineno, 0, y, is_input=True)
 
+                    # 复制上半部分，正序复制，确保即使有自动折行时，第一行也保持在屏幕最顶部
+                    y = -vertical_scroll_2
+                    lineno = start_lineno
+                    while y <= below and lineno < line_count:
+                        line = ui_content.get_line(lineno)
+                        visible_line_to_row_col[y] = (lineno, horizontal_scroll)
+                        x = 0
+                        x, y = copy_line(line, lineno, x, y, is_input=True)
+                        lineno += 1
+                        y += 1
+
                     # 最后复制分割线，若上下有由于折行额外占用的内容，都用分割线给覆盖掉
                     copy_line([("","-"*width)], -1, 0, upper + 1, is_input=False)
                     
@@ -377,7 +380,7 @@ class VSplitWindow(Window):
         if info is None:
             return
 
-        if isinstance(self.content, SessionBufferControl):
+        if isinstance(self.content, PyMudBufferControl):
             b = self.content.buffer
             if not b:
                 return
@@ -394,7 +397,7 @@ class VSplitWindow(Window):
         if info is None:
             return
 
-        if isinstance(self.content, SessionBufferControl):
+        if isinstance(self.content, PyMudBufferControl):
             b = self.content.buffer
             if not b:
                 return
@@ -518,6 +521,7 @@ class EasternMenuContainer(MenuContainer):
 
         return Window(FormattedTextControl(get_text_fragments), style="class:menu")
 
+
 @dataclass
 class SessionSelectionState:
     start_row: int = -1
@@ -547,9 +551,53 @@ class SessionSelectionState:
             return self.end_row - self.start_row + 1
         else:
             return 0
-    
 
-class SessionBuffer:
+
+class BufferBase:
+    def __init__(self, name, newline = "\n", max_buffered_lines = 10000) -> None:
+        self.name = name
+        self.newline = newline
+        self.max_buffered_lines = max_buffered_lines
+        self.start_lineno = -1
+        self.selection = SessionSelectionState(-1, -1, -1, -1)
+
+    def clear(self):
+        pass
+
+    @property
+    def lineCount(self) -> int:
+        return 0
+
+    def getLine(self, lineno: int) -> str:
+        return ""
+
+    # 获取指定某行到某行的内容。当start未设置时，从首行开始。当end未设置时，到最后一行结束。
+    # 注意判断首位顺序逻辑，以及给定参数是否越界
+    def selection_range_at_line(self, lineno: int) -> Optional[Tuple[int, int]]:
+        if self.selection.is_valid():
+            if self.selection.rows > 1:
+                if lineno == self.selection.start_row:
+                    return (self.selection.start_col, len(self.getLine(lineno)) - 1)
+                elif lineno == self.selection.end_row:
+                    return (0, self.selection.end_col)
+                elif lineno > self.selection.start_row and lineno < self.selection.end_row:
+                    return (0, len(self.getLine(lineno)) - 1)
+
+            elif self.selection.rows == 1:
+                if lineno == self.selection.start_row:
+                    return (self.selection.start_col, self.selection.end_col)
+
+        return None
+
+    def exit_selection(self):
+        self.selection = SessionSelectionState(-1, -1, -1, -1)
+
+    def nosplit(self):
+        self.start_lineno = -1
+        get_app().invalidate()
+
+
+class SessionBuffer(BufferBase):
     def __init__(
         self, 
         name, 
@@ -557,13 +605,10 @@ class SessionBuffer:
         max_buffered_lines = 10000,
         ) -> None:
 
-        self.name = name
-        self.lines = []
-        self.newline = newline
-        self.isnewline = True
-        self.max_buffered_lines = max_buffered_lines
-        self.selection = SessionSelectionState(-1, -1, -1, -1)
-        self.start_lineno = -1
+        super().__init__(name, newline, max_buffered_lines)
+
+        self._lines : List[str] = []
+        self._isnewline = True
 
     def append(self, line: str):
         """
@@ -576,25 +621,25 @@ class SessionBuffer:
             line = line.rstrip(self.newline)
             newline_after_append = True
         if not self.newline in line:
-            if self.isnewline:
-                self.lines.append(line)
+            if self._isnewline:
+                self._lines.append(line)
             else:
-                self.lines[-1] += line
+                self._lines[-1] += line
 
         else:
             lines = line.split(self.newline)
-            if self.isnewline:
-                self.lines.extend(lines)
+            if self._isnewline:
+                self._lines.extend(lines)
             else:
-                self.lines[-1] += lines[0]
-                self.lines.extend(lines[1:])
+                self._lines[-1] += lines[0]
+                self._lines.extend(lines[1:])
 
-        self.isnewline = newline_after_append
+        self._isnewline = newline_after_append
 
         ## limit buffered lines
-        if len(self.lines) > self.max_buffered_lines:
-            diff = self.max_buffered_lines - len(self.lines)
-            del self.lines[:diff]
+        if len(self._lines) > self.max_buffered_lines:
+            diff = len(self._lines) - self.max_buffered_lines
+            del self._lines[:diff]
             ## adjust selection
             if self.selection.start_row >= 0:
                 self.selection.start_row -= diff
@@ -603,68 +648,60 @@ class SessionBuffer:
         get_app().invalidate()
 
     def clear(self):
-        self.lines.clear()
+        self._lines.clear()
         self.selection = SessionSelectionState(-1, -1, -1, -1)
 
         get_app().invalidate()
 
-    def loadfile(self, filename, encoding = 'utf-8', errors = 'ignore'):
-        with open(filename, 'r', encoding = encoding, errors = errors) as fp:
-            lines = fp.readlines()
-            self.clear()
-            self.lines.extend(lines)
-
-            get_app().invalidate()
-
     @property
     def lineCount(self):
-        return len(self.lines)
+        return len(self._lines)
         
-    def getLine(self, lineno):
-        if lineno < 0 or lineno >= len(self.lines):
+    def getLine(self, lineno: int):
+        if lineno < 0 or lineno >= len(self._lines):
             return ""
-        return self.lines[lineno]
+        return self._lines[lineno]
 
-    # 获取指定某行到某行的内容。当start未设置时，从首行开始。当end未设置时，到最后一行结束。
-    # 注意判断首位顺序逻辑，以及给定参数是否越界
-    def getLines(self, start = None, end = None):
-        if start is None:
-            start = 0
-        if end is None:
-            end = len(self.lines) - 1
-        if start < 0:
-            start = 0
-        if end >= len(self.lines):
-            end = len(self.lines) - 1
-        if start > end:
-            return []
-        return self.lines[start:end+1]
-
-    def selection_range_at_line(self, lineno):
-        if self.selection.is_valid():
-            if self.selection.rows > 1:
-                if lineno == self.selection.start_row:
-                    return (self.selection.start_col, len(self.lines[lineno]) - 1)
-                elif lineno == self.selection.end_row:
-                    return (0, self.selection.end_col)
-                elif lineno > self.selection.start_row and lineno < self.selection.end_row:
-                    return (0, len(self.lines[lineno]) - 1)
 
-            elif self.selection.rows == 1:
-                if lineno == self.selection.start_row:
-                    return (self.selection.start_col, self.selection.end_col)
+class LogFileBuffer(BufferBase):
+    def __init__(
+        self,
+        name,
+        filepath: Optional[str] = None,
+        ) -> None:
 
-        return None
+        super().__init__(name)
+        self._lines : Dict[int, str] = {}
+        self.loadfile(filepath)
+        
+    def loadfile(self, filepath: Optional[str] = None):
+        if filepath and os.path.exists(filepath):
+            self.filepath = filepath
+        else:
+            self.filepath = None
 
-    def exit_selection(self):
-        self.selection = SessionSelectionState(-1, -1, -1, -1)
+    def clear(self):
+        self.filepath = None
 
-    def nosplit(self):
-        self.start_lineno = -1
-        get_app().invalidate()
+    @property
+    def lineCount(self):
+        if not self.filepath or not os.path.exists(self.filepath):
+            return 0
+
+        with open(self.filepath, 'r', encoding = 'utf-8', errors = 'ignore') as fp:
+            return sum(1 for _ in fp)
+
+    def getLine(self, lineno: int):
+        if not self.filepath or not os.path.exists(self.filepath):
+            return ""
+
+        return linecache.getline(self.filepath, lineno).rstrip(self.newline)
+
+    def __del__(self):
+        self._lines.clear()
 
-class SessionBufferControl(UIControl):
-    def __init__(self, buffer: Optional[SessionBuffer]) -> None:
+class PyMudBufferControl(UIControl):
+    def __init__(self, buffer: Optional[BufferBase]) -> None:
         self.buffer = buffer
 
         # 为MUD显示进行校正的处理，包括对齐校正，换行颜色校正等
@@ -744,10 +781,14 @@ class SessionBufferControl(UIControl):
         def get_line(i: int) -> StyleAndTextTuples:
             line = buffer.getLine(i)
             # 颜色校正
+            SEARCH_LINES = 10
             thislinecolors = len(self.AVAI_COLOR_REGX.findall(line))
             if thislinecolors == 0:
                 lineno = i - 1
-                while lineno >= 0:
+                search = 0
+                while lineno >= 0 and search < SEARCH_LINES:
+                    search += 1
+
                     lastline = buffer.getLine(lineno)
                     allcolors = self.ALL_COLOR_REGX.findall(lastline)
                     
@@ -883,6 +924,9 @@ class SessionBufferControl(UIControl):
                 else:
                     # Don't handle scroll events here.
                     return NotImplemented
+            else:
+                # Don't handle scroll events here.
+                return NotImplemented
 
         # Not focused, but focusing on click events.
         else:

pymud/pymud.py

@@ -9,7 +9,7 @@ from prompt_toolkit.buffer import Buffer
 from prompt_toolkit.application import Application
 from prompt_toolkit.filters import Condition
 from prompt_toolkit.key_binding import KeyBindings
-from prompt_toolkit.layout import ConditionalContainer, Float, VSplit, HSplit, Window, WindowAlign, ScrollbarMargin, NumberedMargin
+from prompt_toolkit.layout import ConditionalContainer, Float, VSplit, HSplit, Window, WindowAlign, ScrollbarMargin, NumberedMargin, to_dimension
 from prompt_toolkit.layout.layout import Layout
 from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.layout.dimension import D
@@ -37,7 +37,7 @@ from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
 from wcwidth import wcwidth, wcswidth
 
 from .objects import CodeBlock
-from .extras import SessionBuffer, SessionBufferControl, EasternMenuContainer, VSplitWindow, DotDict, MenuItem
+from .extras import BufferBase, LogFileBuffer, SessionBuffer, PyMudBufferControl, EasternMenuContainer, VSplitWindow, DotDict, MenuItem
 from .modules import Plugin
 from .session import Session
 from .settings import Settings
@@ -164,7 +164,7 @@ class PyMudApp:
         self.logFileShown = ''          # 记录页显示的记录文件名
         #self.logSessionBuffer = SessionBuffer()
         #self.logSessionBuffer.name = "LOGBUFFER"
-        self.logSessionBuffer = SessionBuffer("LOGBUFFER", max_buffered_lines = -1)
+        self.logSessionBuffer = LogFileBuffer("LOGBUFFER")
 
         self.load_plugins()
 
@@ -218,7 +218,7 @@ class PyMudApp:
             show_cursor=False
         )
 
-        self.consoleView = SessionBufferControl(
+        self.consoleView = PyMudBufferControl(
             buffer = None,
             )
         
@@ -398,11 +398,26 @@ class PyMudApp:
         else:
             b = None
             
-        if isinstance(b, Buffer):
+        if isinstance(b, BufferBase):
             if lines < 0:
-                b.cursor_up(-1 * lines)
-            elif lines > 0:
-                b.cursor_down(lines)
+                if b.start_lineno < 0:
+                    self.console._scroll_up()
+                    b.start_lineno = b.lineCount - self.get_height() * 3 // 2
+                else:
+                    b.start_lineno += lines
+                    if b.start_lineno < 0:
+                        b.start_lineno = 0
+
+            else:
+                if b.start_lineno < 0:
+                    return
+
+                b.start_lineno += lines
+ 
+                if b.start_lineno >= b.lineCount - self.get_height():
+                    b.start_lineno = -1
+
+
 
     def page_up(self, event: KeyPressEvent) -> None:
         "快捷键PageUp: 用于向上翻页。翻页页数为显示窗口行数的一半减去一行。"
@@ -644,7 +659,7 @@ class PyMudApp:
             if os.path.exists(filename):
                 lock = threading.RLock()
                 lock.acquire()
-                self.logSessionBuffer.loadfile(filename, encoding = 'utf-8', errors = 'ignore')
+                self.logSessionBuffer.loadfile(filename)
                 lock.release()
 
             #self.logSessionBuffer.cursor_position = len(self.logSessionBuffer.text)
@@ -736,7 +751,7 @@ class PyMudApp:
 
         elif self.showLog:
             b = self.logSessionBuffer
-            b.exit_selection()
+            #b.exit_selection()
             #b.cursor_position = len(b.text)
             #b.start_lineno = -1
             b.nosplit()

pymud/session.py

@@ -571,16 +571,6 @@ class Session:
             self._line_count += 1
             self.log.log(self.newline_cli)
 
-    def clear_half(self):
-        """
-        清除半数缓冲。 **脚本中无需调用。**
-
-        半数的数量由 Settings.client['buffer_lines'] 确定，默认为5000行。
-        """
-        # if (Settings.client["buffer_lines"] > 0) and (self._line_count >= 2 * Settings.client["buffer_lines"]) and self.buffer.document.is_cursor_at_the_end:
-        #     self._line_count = self.buffer.clear_half()
-        pass
-
     def feed_data(self, data) -> None:
         """
         由协议对象调用，将收到的远程数据加入会话缓冲。永远只会传递1个字节的数据，以bytes形式。 **脚本中无需调用。**
@@ -695,7 +685,6 @@ class Session:
 
         # 将数据写入缓存添加到此处
         if len(self.display_line) > 0:
-            self.clear_half()
             self.writetobuffer(self.display_line)
 
     def set_exception(self, exc: Exception):

{pymud-0.21.2a1.dist-info → pymud-0.21.2.post1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymud
-Version: 0.21.2a1
+Version: 0.21.2.post1
 Summary: a MUD Client written in Python
 Author-email: "newstart@pkuxkx" <crapex@hotmail.com>
 Maintainer-email: "newstart@pkuxkx" <crapex@hotmail.com>
@@ -44,11 +44,11 @@ Dynamic: license-file
 
 ### 北大侠客行Mud (www.pkuxkx.net)，最好的中文Mud游戏！
 ### PyMUD是我为了更好的玩北大侠客行，特意自行开发的MUD客户端。PyMUD具有以下特点：
-+ 原生Python开发，除prompt-toolkit及其依赖库（wcwidth, pygment, pyperclip)外，不需要其他第三方库支持
++ 原生Python开发，除prompt-toolkit及其依赖库 wcwidth, pygment, pyperclip 外，不需要其他第三方库支持
 + 原生Python的asyncio实现的通信协议处理，支持async/await语法在脚本中直接应用，脚本实现的同步异步两种模式由你自己选择
-+ 基于控制台的全屏UI界面设计，支持鼠标操作（Android上支持触摸屏操作）
++ 基于控制台的全屏UI界面设计，支持鼠标操作（Android上支持触摸屏操作），极低资源需求，在单核1GB内存的Linux VPS上也可流畅运行
 + 支持分屏显示，在数据快速滚动的时候，上半屏保持不动，以确保不错过信息
-+ 解决了99%情况下，北大侠客行中文对不齐，也就是看不清字符画的问题（因为我没有走遍所有地方，不敢保证100%）
++ 解决了99%情况下，北大侠客行中文对不齐，也就是看不清字符画的问题
 + 真正的支持多session会话，支持命令或鼠标切换会话
 + 原生支持多种服务器端编码方式，不论是GBK、BIG5、还是UTF-8
 + 支持NWAS、MTTS协商，支持GMCP、MSDP、MSSP协议
@@ -66,10 +66,12 @@ Dynamic: license-file
 
 ## 版本更新信息
 
-### 0.22.0 (2025-05-27) 本版传错了，已无法使用。
+### 0.21.2 (2025-06-01)
 
 + 问题修复: 修复了当自动重连启动时，即使会话关闭了，也会自动重连的问题。
-+ 实现调整: 重写了专用的SessionBuffer与SessionBufferControl，降低内存使用。
++ 实现调整: 重写了专用的会话缓冲、记录缓冲与PyMud缓冲显示控制器，在prompt_toolkit的原Buffer和BufferControl的基础仅提供了PYMUD所需的基础功能，以降低内存占用。
+  经测试，当前内存基本稳定，视会话数量和脚本情况差异，维持在几百兆左右（500M以下），且不会有大幅波动。重写后，低配置的VPS也可以稳定运行PyMUD。
++ post1: 问题修复: 修复了当缓存行数超过规定值时，由于代码错误导致清屏的问题。
 
 ### 0.21.0 (2025-05-20)
 

{pymud-0.21.2a1.dist-info → pymud-0.21.2.post1.dist-info}/RECORD

@@ -2,7 +2,7 @@ pymud/__init__.py,sha256=oeHz0NM7_DwChCY8f_vQ_fBq0e_HoTd0cahCFwaavWE,806
 pymud/__main__.py,sha256=lIOBiJmi8X-EWXVIx_OoxSgUZ0FYKlZI8hXVnLUYTJQ,61
 pymud/decorators.py,sha256=XaxcZqHw4s44lC2EAgB5kZmbNvJnHGmpZnoW75tUeNY,9844
 pymud/dialogs.py,sha256=4kHycr47UgKQUHGX-KMZvERuWViPjT4hNrGhbe4j-NU,7056
-pymud/extras.py,sha256=b0D7dblleQKKuGRW7TMQadqfG-UPSbVgAHVTV05CzQg,35602
+pymud/extras.py,sha256=FQKZWn7ZR9J4H-FjXzbF5sxOTUNZ3b7tWxWhHhywplg,36657
 pymud/i18n.py,sha256=qLgvrmYhVfkTHKpbBR-LfYMOrGgi0skHrelbsj7ItbE,3034
 pymud/logger.py,sha256=WCsfXVkgl63qdq1RQEDJBnM7U0S6u8TeORFSMhcoydI,5840
 pymud/main.py,sha256=zaSjNhpbX3FMulKg-UNFrdiIJO8sOmmrUQrkPOalB-4,10224
@@ -10,14 +10,14 @@ pymud/modules.py,sha256=DoCregng5iAj_Hq_yUvRPreRTv2Ehb6sV6_4jfdbsik,11912
 pymud/objects.py,sha256=ZOxNjlPD_d4jk5DMBcXgYcvkt9d8xZih0IQtQlA3f1Y,38668
 pymud/pkuxkx.py,sha256=qDVry-Vd6MNui0NKWZFT52IpmP1sKS5Dz74EDY4tVGQ,14740
 pymud/protocol.py,sha256=KNKJYj9HFRoUy-jigNfhiQdDOM_kRSJE17QFpBarQTg,48335
-pymud/pymud.py,sha256=TEN8xwWjOyMSMEhEVhYBzEe4S7sH8wzgokP19mIhlg4,53058
-pymud/session.py,sha256=K7AUm6JcTryEvknZnMrvS-UfNEDFyMZSD7yiRXivLRM,155063
+pymud/pymud.py,sha256=40hn5XyMH9mtjimx_zG7N2M6fAGciee1izO08jsfFzQ,53486
+pymud/session.py,sha256=8sl8hdmq2jwNxj3bAAp5zTv8eNGBW-GOxNpGCuHKbAg,154603
 pymud/settings.py,sha256=S2sBEM7YtaDOVu3UpGfHBaU7zSB3Zhs7w-Z7PtdS0WQ,7697
 pymud/lang/i18n_chs.py,sha256=2cyaHHLwpYEBBwuQXyRTxa1opX53fTv1f8_QDQeGlC0,16836
 pymud/lang/i18n_eng.py,sha256=jcPz6Y5UuxJBQLY_e8UnEF3GYTlnAD44C14Oj7sK-QI,45935
-pymud-0.21.2a1.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymud-0.21.2a1.dist-info/METADATA,sha256=UGS0dauMo_3wXg4Az_lhkYsfTz_ivEdlKD8EIfZw6QM,44840
-pymud-0.21.2a1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pymud-0.21.2a1.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
-pymud-0.21.2a1.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
-pymud-0.21.2a1.dist-info/RECORD,,
+pymud-0.21.2.post1.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymud-0.21.2.post1.dist-info/METADATA,sha256=dBJD-AP44lsOfy-glrThVBKIcAA_mTbWvJUkNX2PEmE,45258
+pymud-0.21.2.post1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pymud-0.21.2.post1.dist-info/entry_points.txt,sha256=diPUOtTkhgC1hVny7Cdg4aRhaHSynMQoraE7ZhJxUcw,37
+pymud-0.21.2.post1.dist-info/top_level.txt,sha256=8Gp1eXjxixXjqhhti6tLCspV_8s9sNV3z5Em2_KRhD4,6
+pymud-0.21.2.post1.dist-info/RECORD,,