PyPtt 2.3.8__tar.gz → 2.3.9__tar.gz

{pyptt-2.3.8 → pyptt-2.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.3.8
+Version: 2.3.9
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)

{pyptt-2.3.8 → pyptt-2.3.9}/PyPtt/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.3.8'
+__version__ = '2.3.9'
 __author__ = 'CodingMan'
 __email__ = 'pttcodingman@gmail.com'
 

{pyptt-2.3.8 → pyptt-2.3.9}/PyPtt/screens.py

@@ -267,8 +267,9 @@ def show(config, screen_queue, function_name=None):
 
 xy_pattern_h = re.compile(r'^=ESC=\[[\d]+;[\d]+H')
 xy_pattern_s = re.compile(r'^=ESC=\[[\d]+;[\d]+s')
-# SGR 顏色 + DEC 私有模式開關 (ESC[?2026h/l 同步輸出): 後者若留著, 引擎會當未知 escape 而丟掉其後整段畫面
-_color_sgr = re.compile(r'\x1B\[(?:[\d+;]*m|\?[\d;]*[hl])')
+# SGR 顏色 + DEC 私有模式開關 (ESC[?2026h/l 同步輸出) + DSR 查詢 (ESC[6n, PTT 不等回應):
+# 後兩者若留著, 引擎會當未知 escape 而丟掉其後整段畫面
+_color_sgr = re.compile(r'\x1B\[(?:[\d+;]*m|\?[\d;]*[hl]|\d*n)')
 
 
 def _preprocess(data: str) -> str:

{pyptt-2.3.8 → pyptt-2.3.9}/PyPtt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.3.8
+Version: 2.3.9
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)

{pyptt-2.3.8 → pyptt-2.3.9}/tests/test_vt100_parser.py

@@ -451,3 +451,9 @@ def test_dec_private_mode_escape_does_not_drop_screen():
     # PTT 送 ESC[?2026h/l (同步輸出); 沒被吃掉時引擎會在此中止, 整個畫面變空白 (登入 LoginError)
     lines = parse(b'\x1b[2J\x1b[?2026h\x1b[3;1Hhello\x1b[?2026l\x1b[4;1Hworld')
     assert 'hello' in lines[2] and 'world' in lines[3]
+
+
+def test_dsr_query_is_ignored():
+    # PTT 歡迎畫面送 ESC[6n (DSR 游標位置查詢) 且不等回應; 沒被吃掉時畫面凍結在登入提示之前 (LoginError)
+    lines = parse(b'\x1b[2J\x1b[3;1Hhello\x1b[6n\x1b[4;1Hworld')
+    assert 'hello' in lines[2] and 'world' in lines[3]