PyPtt 2.3.16__tar.gz → 2.3.18__tar.gz

{pyptt-2.3.16 → pyptt-2.3.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.3.16
+Version: 2.3.18
 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.16 → pyptt-2.3.18}/PyPtt/PTT.py

@@ -162,6 +162,8 @@ class API:
         self._moderators = dict()
         self._thread_id = threading.get_ident()
         self._goto_board_list = set()
+        self._current_board = None
+        self._current_search = ()
         self._board_info_list = dict()
         self._newest_index_data = data_type.TimedDict(timeout=2)
         self._mail_capacity = None

{pyptt-2.3.16 → pyptt-2.3.18}/PyPtt/__init__.py

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

{pyptt-2.3.16 → pyptt-2.3.18}/PyPtt/_api_get_newest_index.py

@@ -85,7 +85,8 @@ def get_newest_index(api, index_type: data_type.NewIndex, board: Optional[str] =
         check_value.check_type(board, str, 'board')
 
         _api_util.check_board(api, board)
-        _api_util.goto_board(api, board)
+        # 有搜尋條件時 goto_board 會停在搜尋結果裡；搜不到直接丟 NoSearchResult
+        _api_util.goto_board(api, board, search_list=search_list)
 
         cmd_list = []
         cmd_list.append('1')
@@ -97,10 +98,18 @@ def get_newest_index(api, index_type: data_type.NewIndex, board: Optional[str] =
         target_list = [
             connect_core.TargetUnit('沒有文章...', log_level=log.DEBUG, break_detect=True),
             connect_core.TargetUnit(screens.Target.InBoard, log_level=log.DEBUG, break_detect=True),
+            connect_core.TargetUnit(screens.Target.InSearchList, log_level=log.DEBUG, break_detect=True),
             connect_core.TargetUnit(screens.Target.InBoardWithCursor, log_level=log.DEBUG, break_detect=True),
             connect_core.TargetUnit(screens.Target.MainMenu_Exiting,
                                     exceptions_=exceptions.NoSuchBoard(api.config, board)),
         ]
+        if search_list:
+            # 搜不到時 goto_board 已經丟 NoSearchResult；萬一提示框沒被認出來，'1\r' 會打開游標所在的文章
+            # (游標文是動畫文時先停在「要開始播放嗎？」)，落在文章裡同樣是沒有結果
+            target_list.append(connect_core.TargetUnit(screens.Target.InPost,
+                                                       exceptions_=exceptions.NoSearchResult()))
+            target_list.append(connect_core.TargetUnit(screens.Target.Animation,
+                                                       exceptions_=exceptions.NoSearchResult()))
 
         index = api.connect_core.send(cmd, target_list)
         if index < 0:
@@ -111,43 +120,7 @@ def get_newest_index(api, index_type: data_type.NewIndex, board: Optional[str] =
         if index == 0:
             return 0
 
-        normal_newest_index = _get_newest_index(api)
-
-        if search_list is not None and len(search_list) > 0:
-            target_list.insert(2,
-                               connect_core.TargetUnit(
-                                   screens.Target.InBoardWithCursor,
-                                   log_level=log.DEBUG,
-                                   break_detect=True))
-            # 新版搜尋無結果時，後面的 '1\r' 會打開游標所在的文章；落在文章裡就是沒有結果
-            # 游標文是動畫文時會先停在「要開始播放嗎？」；同樣是沒有結果 (畫面留在詢問上，由下一支 API 的導航離開)
-            target_list.append(connect_core.TargetUnit(screens.Target.InPost,
-                                                       exceptions_=exceptions.NoSearchResult()))
-            target_list.append(connect_core.TargetUnit(screens.Target.Animation,
-                                                       exceptions_=exceptions.NoSearchResult()))
-
-            cmd_list = _api_util.get_search_condition_cmd(index_type, search_list)
-
-            cmd_list.append('1')
-            cmd_list.append(command.enter)
-            cmd_list.append('$')
-            cmd = ''.join(cmd_list)
-
-            index = api.connect_core.send(cmd, target_list)
-            if index < 0:
-                if api.connect_core.last_timeout_was_silent:
-                    raise exceptions.ConnectionClosed()
-                raise exceptions.NoSuchBoard(api.config, board)
-
-            if index == 0:
-                return 0
-
-            newest_index = _get_newest_index(api)
-
-            if normal_newest_index == newest_index:
-                raise exceptions.NoSearchResult()
-        else:
-            newest_index = normal_newest_index
+        newest_index = _get_newest_index(api)
 
     elif index_type == data_type.NewIndex.MAIL:
 

{pyptt-2.3.16 → pyptt-2.3.18}/PyPtt/_api_get_post.py

@@ -61,10 +61,8 @@ def get_post(api, board: str, aid: Optional[str] = None, index: Optional[int] =
     else:
         raise exceptions.ParameterError('wrong parameter index or aid must input')
 
-    search_cmd = None
     if search_list is not None and len(search_list) > 0:
         current_index = api.get_newest_index(data_type.NewIndex.BOARD, board=board, search_list=search_list)
-        search_cmd = _api_util.get_search_condition_cmd(data_type.NewIndex.BOARD, search_list)
     else:
         current_index = api.get_newest_index(data_type.NewIndex.BOARD, board=board)
 
@@ -75,7 +73,7 @@ def get_post(api, board: str, aid: Optional[str] = None, index: Optional[int] =
     post = {}
     for i in range(max_retry):
         try:
-            post = _get_post(api, board, aid, index, query, search_cmd)
+            post = _get_post(api, board, aid, index, query, search_list)
             if not post:
                 pass
             elif not post[PostField.pass_format_check]:
@@ -97,9 +95,10 @@ def get_post(api, board: str, aid: Optional[str] = None, index: Optional[int] =
 
 
 def _get_post(api, board: str, post_aid: Optional[str] = None, post_index: int = 0, query: bool = False,
-              search_cmd_list: Optional[list[str]] = None) -> Dict:
+              search_list: Optional[list] = None) -> Dict:
     _api_util.check_board(api, board)
-    _api_util.goto_board(api, board)
+    # 用 AID 找文章時不需要搜尋條件；用編號時要停在同一組條件的搜尋結果裡，編號才對得上
+    _api_util.goto_board(api, board, search_list=search_list if post_aid is None else None)
 
     cmd_list = []
 
@@ -107,9 +106,6 @@ def _get_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
         cmd_list.append(lib_util.check_aid(post_aid))
     elif post_index != 0:
 
-        if search_cmd_list is not None:
-            cmd_list.extend(search_cmd_list)
-
         cmd_list.append(str(max(1, post_index - 100)))
         cmd_list.append(command.enter)
         cmd_list.append(str(post_index))
@@ -126,6 +122,7 @@ def _get_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
             screens.Target.PTT1_QueryPost if api.config.host == data_type.HOST.PTT1 else screens.Target.PTT2_QueryPost,
             log_level=log.DEBUG, break_detect=True, refresh=False),
         connect_core.TargetUnit(screens.Target.InBoard, log_level=log.DEBUG, break_detect=True),
+        connect_core.TargetUnit(screens.Target.InSearchList, log_level=log.DEBUG, break_detect=True),
         connect_core.TargetUnit(screens.Target.MainMenu_Exiting, exceptions_=exceptions.NoSuchBoard(api.config, board)),
     ]
 
@@ -155,7 +152,7 @@ def _get_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
         PostField.is_unconfirmed: False,
     }
 
-    if index < 0 or index == 1:
+    if index < 0 or index in (1, 2):
         # Known gap (intentionally not fixed here): a connection that dies
         # mid-redraw (bytes received, so last_timeout_was_silent is False)
         # leaves a stale listing screen with a cursor line in RDQ, and

{pyptt-2.3.16 → pyptt-2.3.18}/PyPtt/_api_get_post_list.py

@@ -11,6 +11,24 @@ from . import log
 from . import screens
 
 
+def _cell_width(char: str) -> int:
+    # 終端機上全形字佔 2 格 (例如推文數的「爆」)，用 big5uao 的位元組數當作顯示寬度
+    return len(char.encode('big5uao', 'replace'))
+
+
+def _split_columns(line: str, bounds: List[int]) -> List[str]:
+    """依顯示欄位 (不是字元位置) 切開列表的一行。bounds 是各欄的起始欄位。"""
+    fields = [''] * len(bounds)
+    column = 0
+    for char in line:
+        for i in range(len(bounds) - 1, -1, -1):
+            if column >= bounds[i]:
+                fields[i] += char
+                break
+        column += _cell_width(char)
+    return fields
+
+
 def get_post_list(api, board: str, limit: int = 20, offset: int = 0) -> List[Dict]:
     _api_util.one_thread(api)
 
@@ -84,18 +102,21 @@ def get_post_list(api, board: str, limit: int = 20, offset: int = 0) -> List[Dic
                     # offsets here were tuned to that padded layout.
                     line = f' {line}'
 
+                # 欄位是固定的顯示寬度；推文數「爆」是全形字，用字元位置切會讓後面每一欄都偏一格
+                index_field, status, comment, list_date, _, author, title = _split_columns(
+                    line, [0, 8, 10, 12, 17, 18, 31])
+
                 try:
-                    cur_index = int(line[:8].strip())
+                    cur_index = int(index_field.strip())
                 except ValueError:
                     # Pinned/announcement posts use '★' instead of a numeric
                     # index — they have no sequential index and cannot be
                     # fetched by index, so skip them.
                     continue
-                status = line[8:10].strip()
-                comment = line[10:12].strip()
-                list_date = line[12:17].strip()
-                author = line[18:31].strip()
-                title = line[31:]
+                status = status.strip()
+                comment = comment.strip()
+                list_date = list_date.strip()
+                author = author.strip()
 
                 cur_post = {
                     data_type.PostField.board: board,

{pyptt-2.3.16 → pyptt-2.3.18}/PyPtt/_api_mark_post.py

@@ -79,28 +79,17 @@ def mark_post(api, mark_type: int, board: str, post_aid: str, post_index: int, s
         board,
         check_moderator=True)
 
-    _api_util.goto_board(api, board)
+    search_list = None
+    if post_aid is None and search_condition is not None:
+        # 用編號找文章時要停在同一組條件的搜尋結果裡，編號才對得上
+        search_list = [(search_type, search_condition)]
+    _api_util.goto_board(api, board, search_list=search_list)
 
     cmd_list = []
     if post_aid is not None:
         cmd_list.append(lib_util.check_aid(post_aid))
         cmd_list.append(command.enter)
     elif post_index != 0:
-        if search_condition is not None:
-            if search_type == data_type.SearchType.KEYWORD:
-                cmd_list.append('/')
-            elif search_type == data_type.SearchType.AUTHOR:
-                cmd_list.append('a')
-            elif search_type == data_type.SearchType.COMMENT:
-                cmd_list.append('Z')
-            elif search_type == data_type.SearchType.MARK:
-                cmd_list.append('G')
-            elif search_type == data_type.SearchType.MONEY:
-                cmd_list.append('A')
-
-            cmd_list.append(search_condition)
-            cmd_list.append(command.enter)
-
         cmd_list.append(str(post_index))
 
         cmd_list.append(command.enter)
@@ -123,6 +112,7 @@ def mark_post(api, mark_type: int, board: str, post_aid: str, post_index: int, s
     target_list = [
         connect_core.TargetUnit('刪除所有標記', log_level=log.INFO, response='y' + command.enter),
         connect_core.TargetUnit(screens.Target.InBoard, log_level=log.INFO, break_detect=True),
+        connect_core.TargetUnit(screens.Target.InSearchList, log_level=log.INFO, break_detect=True),
     ]
 
     api.connect_core.send(cmd, target_list)

{pyptt-2.3.16 → pyptt-2.3.18}/PyPtt/_api_util.py

@@ -547,7 +547,142 @@ def run_in_board_setting(api, flow):
         raise
 
 
-def goto_board(api, board: str, refresh: bool = False, end: bool = False) -> None:
+def search_key(search_list: Optional[list]) -> tuple:
+    # 搜尋條件的比對鍵；空 tuple 表示一般文章列表
+    return tuple((search_type, search_condition) for search_type, search_condition in (search_list or []))
+
+
+def board_list_kind(api, screen: str, board: str) -> Optional[str]:
+    """目前畫面是 board 的哪一種列表：'plain' 一般文章列表、'search' 搜尋結果，其他回傳 None。
+
+    一般列表標頭是「看板《Python》」；搜尋結果是「系列《Python》」。"""
+    if screens.in_board_setting(screen):
+        return None
+    first_line = screen.split('\n', 1)[0]
+    match = re.search(r'(看板|系列)《([^》]+)》', first_line)
+    if match is None or match.group(2).lower() != board.lower():
+        return None
+    if match.group(1) == '看板' and is_article_list(api, screen):
+        return 'plain'
+    if match.group(1) == '系列' and connect_core.TargetUnit(screens.Target.InSearchList).is_match(screen, api.cursor):
+        return 'search'
+    return None
+
+
+def forget_current_board(api) -> None:
+    # 送出 goto_board 以外的搜尋指令後，畫面上的搜尋結果跟記錄對不起來；
+    # 下一次 goto_board 一定要走完整路徑重新進板
+    api._current_board = None
+    api._current_search = ()
+
+
+def _list_targets() -> list:
+    return [
+        connect_core.TargetUnit(screens.Target.InBoard, log_level=log.DEBUG, break_detect=True),
+        connect_core.TargetUnit(screens.Target.InSearchList, log_level=log.DEBUG, break_detect=True),
+    ]
+
+
+def _stay_in_board(api, board: str, want: tuple) -> Optional[str]:
+    """上一個 API 停在同一個看板時，不回主選單、不重新進板，只用 ← 退回需要的列表。
+
+    回傳 'search' 表示已經在 want 這組條件的搜尋結果裡；'plain' 表示在一般文章列表
+    (呼叫端視需要再搜尋)；None 表示判斷不了，交給完整路徑 (go_main_menu 從任何畫面都能回主選單)。
+    每一步都以畫面確認：標頭的看板名稱、一般列表或搜尋結果。"""
+    if getattr(api, '_current_board', None) != board.lower():
+        return None
+
+    # 最多: 提示框 → 文章內文 → 搜尋結果 → 一般列表
+    for _ in range(4):
+        screen = last_screen(api)
+        kind = board_list_kind(api, screen, board)
+        if kind == 'plain':
+            return 'plain'
+        if kind == 'search' and want and api._current_search == want:
+            return 'search'
+
+        if kind is None and '任意鍵' in screen.rstrip().rsplit('\n', 1)[-1]:
+            # 「請按任意鍵繼續」(查詢文章資訊 Q、發文/回文完成)；完整路徑也是先按空白鍵關掉提示框
+            key = command.space
+        elif kind is None and connect_core.TargetUnit(screens.Target.InPost).is_match(screen, api.cursor):
+            # 文章內文 ← 回到點進來的列表
+            key = command.left
+        elif kind == 'search':
+            # 搜尋結果 ← 直接回到一般列表 (多層搜尋也是一次)
+            key = command.left
+        else:
+            return None
+
+        target_list = _list_targets() + [
+            connect_core.TargetUnit(screens.Target.InPost, log_level=log.DEBUG, break_detect=True),
+        ]
+        index = api.connect_core.send(key, target_list)
+        if index < 0:
+            if api.connect_core.last_timeout_was_silent:
+                raise exceptions.ConnectionClosed()
+            return None
+        if kind == 'search':
+            api._current_search = ()
+
+    return None
+
+
+def _search_in_board(api, board: str, search_list: list, want: tuple) -> None:
+    # 從一般文章列表送出搜尋條件；搜不到時 PTT 跳出「找不到符合條件的文章」並留在一般列表
+    cmd = ''.join(get_search_condition_cmd(data_type.NewIndex.BOARD, search_list))
+    target_list = [
+        connect_core.TargetUnit(screens.Target.NoSearchResult, log_level=log.DEBUG, break_detect=True),
+        connect_core.TargetUnit(screens.Target.InSearchList, log_level=log.DEBUG, break_detect=True),
+    ]
+    index = api.connect_core.send(cmd, target_list)
+    if index == 1 and board_list_kind(api, last_screen(api), board) == 'search':
+        api._current_search = want
+        return
+
+    if index == 0:
+        # 關掉提示框；回到一般列表就留在板內，下一次不用重新進板
+        index = api.connect_core.send(command.space, _list_targets())
+        if index == 0 and board_list_kind(api, last_screen(api), board) == 'plain':
+            api._current_search = ()
+            raise exceptions.NoSearchResult()
+
+        # 提示框之後畫面不明；下一次 goto_board 走完整路徑
+        forget_current_board(api)
+        if index < 0 and api.connect_core.last_timeout_was_silent:
+            raise exceptions.ConnectionClosed()
+        raise exceptions.NoSearchResult()
+
+    # 搜尋後認不得畫面 (跟改版前一樣：完全沒回應是斷線，其他當成進不了看板)
+    forget_current_board(api)
+    if index < 0 and api.connect_core.last_timeout_was_silent:
+        raise exceptions.ConnectionClosed()
+    raise exceptions.NoSuchBoard(api.config, board)
+
+
+def goto_board(api, board: str, refresh: bool = False, end: bool = False,
+               search_list: Optional[list] = None) -> None:
+    """進到 board 的文章列表；給 search_list 時進到該條件的搜尋結果 (搜不到丟 NoSearchResult)。
+    refresh=True 保證最後一個畫面是剛重畫的一般列表 (不跟 search_list 一起用)。
+
+    上一個 API 已經停在同一個看板時不重新進板 (見 _stay_in_board)。"""
+    want = search_key(search_list)
+    state = _stay_in_board(api, board, want)
+    if state == 'plain' and refresh:
+        # 呼叫端要讀最新畫面 (get_board_info 的人氣)：不重新進板，重畫一次
+        index = api.connect_core.send(command.refresh, _list_targets(), refresh=False)
+        if index < 0 and api.connect_core.last_timeout_was_silent:
+            raise exceptions.ConnectionClosed()
+        if index != 0 or board_list_kind(api, last_screen(api), board) != 'plain':
+            state = None
+    if state is not None:
+        if want and state == 'plain':
+            _search_in_board(api, board, search_list, want)
+        if end:
+            _goto_board_end(api)
+        return
+
+    forget_current_board(api)
+
     cmd_list = []
     cmd_list.append(command.go_main_menu)
     cmd_list.append('qs')
@@ -591,18 +726,28 @@ def goto_board(api, board: str, refresh: bool = False, end: bool = False) -> Non
         if index == 4:
             raise exceptions.NoSuchBoard(api.config, board)
 
+    if index in (2, 3):
+        api._current_board = board.lower()
+        api._current_search = ()
+        if want:
+            _search_in_board(api, board, search_list, want)
+
     if end:
-        cmd_list = []
-        cmd_list.append('1')
-        cmd_list.append(command.enter)
-        cmd_list.append('$')
-        cmd = ''.join(cmd_list)
+        _goto_board_end(api)
 
-        target_list = [
-            connect_core.TargetUnit(screens.Target.InBoard, log_level=log.DEBUG, break_detect=True),
-        ]
 
-        api.connect_core.send(cmd, target_list)
+def _goto_board_end(api) -> None:
+    cmd_list = []
+    cmd_list.append('1')
+    cmd_list.append(command.enter)
+    cmd_list.append('$')
+    cmd = ''.join(cmd_list)
+
+    target_list = [
+        connect_core.TargetUnit(screens.Target.InBoard, log_level=log.DEBUG, break_detect=True),
+    ]
+
+    api.connect_core.send(cmd, target_list)
 
 
 def one_thread(api):

{pyptt-2.3.16 → pyptt-2.3.18}/PyPtt/screens.py

@@ -97,6 +97,16 @@ class Target:
         ['相關主題', '(b)進板'],
     ]
 
+    # 搜尋結果列表: 標頭「系列《Python》」(pttbbs 一直以來的寫法)；PTT1 新版頁尾是 '系列文章  (^P)發表 ...'，
+    # 頁尾各站不一定相同，所以只認標頭跟看板說明列
+    InSearchList = [
+        '系列《',
+        ['看板資訊/設定', '[i]看板設定'],
+        ['相關主題', '(b)進板'],
+    ]
+
+    NoSearchResult = '找不到符合條件的文章'
+
     InBoardWithCursor = [
         '【',
         ['看板資訊/設定', '[i]看板設定'],
@@ -346,7 +356,8 @@ xy_pattern_h = re.compile(r'^=ESC=\[[\d]+;[\d]+H')
 xy_pattern_s = re.compile(r'^=ESC=\[[\d]+;[\d]+s')
 # 依 ECMA-48 剝掉引擎不處理的 CSI (顏色、ESC[?2026h、ESC[6n…, PttCurrent M.1789835163.A.633),
 # 以及被下一個 ESC 打斷的孤立 ESC (主選單動畫尾端的 '\x1b\x1b[?2026h'); 留著會讓引擎凍住畫面
-_color_sgr = re.compile(r'\x1B(?=\x1B)|\x1B\[(?!(?:\d+;\d+)?[Hs]|K|2J)[0-?]*[ -/]*[@-~]')
+# OSC (ESC ] ... BEL 或 ESC \\) 也一併剝掉, 例如內文網址的 OSC 8 超連結 '\x1b]8;;URL\x1b\\'
+_color_sgr = re.compile(r'\x1B\][^\x07\x1B]*(?:\x07|\x1B\\)|\x1B(?=\x1B)|\x1B\[(?!(?:\d+;\d+)?[Hs]|K|2J)[0-?]*[ -/]*[@-~]')
 
 
 def _preprocess(data: str) -> str:
@@ -531,6 +542,8 @@ def _escape_complete(seq: str) -> bool:
     engine will bail on it, same as the batch parser)."""
     if len(seq) < 2:
         return False            # lone ESC — wait for more
+    if seq[1] == ']':
+        return '\x07' in seq or '\x1b\\' in seq   # OSC 要等到 BEL 或 ESC \\ 結尾
     if seq[1] != '[':
         return True             # ESC + non-'[': engine bails on it
     for ch in seq[2:]:
@@ -571,6 +584,9 @@ class IncrementalScreen(_VT100Engine):
         while cut > 0 and s[cut - 1] in ' \x08':
             cut -= 1
         esc = s.rfind('\x1b')
+        osc = s.rfind('\x1b]')
+        if osc != -1 and not _escape_complete(s[osc:]):
+            esc = osc           # OSC 的 ESC \\ 結尾可能還沒到, 從 OSC 開頭整段留著
         if esc != -1 and not _escape_complete(s[esc:]):
             while esc > 0 and s[esc - 1] == '\x1b':
                 esc -= 1        # 孤立 ESC 要跟後面的 ESC 一起送, _preprocess 才認得

{pyptt-2.3.16 → pyptt-2.3.18}/PyPtt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.3.16
+Version: 2.3.18
 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.16 → pyptt-2.3.18}/PyPtt.egg-info/SOURCES.txt

@@ -82,6 +82,7 @@ tests/test_get_time.py
 tests/test_get_user.py
 tests/test_get_waterball.py
 tests/test_give_money.py
+tests/test_goto_board_same_board.py
 tests/test_half_dead_connection.py
 tests/test_i18n.py
 tests/test_incremental_parity.py

{pyptt-2.3.16 → pyptt-2.3.18}/tests/test_get_post_list_parser.py

@@ -118,6 +118,16 @@ class TestLineLayouts:
         assert posts[0][data_type.PostField.push_number] == ''
         assert posts[0][data_type.PostField.list_date] == '4/17'
 
+    def test_full_width_push_count(self):
+        # 「爆」是全形字，終端機上佔 2 格；用字元位置切的話後面每一欄都會左移一格
+        cursor = '>  9446 +爆10/15 someone      □ [問安] 1015'
+        api = _build_api(_build_screen(cursor, []), newest=9446)
+        posts = _api_get_post_list.get_post_list(api, 'Python', limit=1)
+        assert posts[0][data_type.PostField.push_number] == '爆'
+        assert posts[0][data_type.PostField.list_date] == '10/15'
+        assert posts[0][data_type.PostField.author] == "someone"
+        assert posts[0][data_type.PostField.title].strip() == '□ [問安] 1015'
+
     def test_reply_marker_R_in_title(self):
         # Title section includes the kind marker ('R:', '□', '轉', '鎖').
         cursor = '>  9440   4 1/15 ddavid       R: [問題] @property 真正的運用是啥'

pyptt-2.3.18/tests/test_goto_board_same_board.py

@@ -0,0 +1,231 @@
+"""No-network tests for goto_board's same-board shortcut.
+
+When the previous API left PyPtt on the same board (article list, search
+result, or an article opened from either), goto_board must not go back to the
+main menu and re-enter the board; it only sends ← and confirms the list header
+names the board. A search result is reused when the search conditions are the
+same. Anything it cannot confirm takes the full path.
+"""
+from types import SimpleNamespace
+
+import pytest
+
+import PyPtt
+from PyPtt import _api_util
+from PyPtt import command
+from PyPtt import config
+from PyPtt.data_type import SearchType
+from tests.test_board_setting_flow import ARTICLE_LIST, FakeCore
+
+LEFT, ENTER, CTRL_C = command.left, command.enter, command.ctrl_c
+FULL_PATH = command.go_main_menu + 'qsgive' + ENTER + CTRL_C * 5
+
+POST = ('作者  someone (nick)                                 看板  give\n'
+        ' 標題  [贈送] 測試文章\n 時間  Sun Oct 19 08:00:00 2026\n\nbody\n' + '\n' * 17 +
+        '  瀏覽 第 1/1 頁 (100%)  目前顯示: 第 01~05 行  (y)回應(X%)推文(h)說明(←)離開 ')
+QUERY_POPUP = (ARTICLE_LIST.rsplit('\n', 1)[0] +
+               '\n ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ 請按任意鍵繼續 ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ')
+OTHER_LIST = ARTICLE_LIST.replace('看板《give》', '看板《Test》')
+MAIL_LIST = '''【郵件選單】                                                   信箱《SomeBM》
+   編號   日 期 作 者          信  件  標  題
+>    1 + 10/18 someone      測試
+  (y)回信 (x)站內轉寄 (d/D)刪信 (^P)寄發新信 (←)離開 (h)說明 '''
+
+
+SEARCH_LIST = (ARTICLE_LIST.replace('看板《give》', '系列《give》')
+               .replace(' 文章列表  (^P)', ' 系列文章  (^P)'))
+NO_RESULT = ARTICLE_LIST.rsplit('\n', 1)[0] + '\n ◆ 找不到符合條件的文章。                [按任意鍵繼續] '
+KEYWORD = [(SearchType.KEYWORD, '贈送')]
+AUTHOR = [(SearchType.AUTHOR, 'someone')]
+KEYWORD_CMD = '/贈送' + ENTER
+AUTHOR_CMD = 'asomeone' + ENTER
+
+
+def make_api(screen_list, start, current_board='give', current_search=()):
+    return SimpleNamespace(
+        connect_core=FakeCore(screen_list, start),
+        config=config.Config(),
+        _is_login=True,
+        cursor='>',
+        _goto_board_list={'give'},
+        _current_board=current_board,
+        _current_search=tuple(current_search),
+    )
+
+
+class TestSameBoardShortcut:
+    def test_article_list_of_same_board_sends_nothing(self):
+        api = make_api([], start=ARTICLE_LIST)
+        _api_util.goto_board(api, 'give')
+        assert api.connect_core.keys == []
+
+    def test_board_name_is_case_insensitive(self):
+        api = make_api([], start=ARTICLE_LIST)
+        _api_util.goto_board(api, 'GIVE')
+        assert api.connect_core.keys == []
+
+    def test_article_of_same_board_sends_one_left(self):
+        api = make_api([ARTICLE_LIST], start=POST)
+        _api_util.goto_board(api, 'give')
+        assert api.connect_core.keys == [LEFT]
+        assert api._current_board == 'give'
+
+    def test_refresh_redraws_instead_of_entering(self):
+        # get_board_info 要最新的人氣：重畫一次，不重新進板
+        api = make_api([ARTICLE_LIST], start=ARTICLE_LIST)
+        _api_util.goto_board(api, 'give', refresh=True)
+        assert api.connect_core.keys == [command.refresh]
+
+    def test_refresh_from_article(self):
+        api = make_api([ARTICLE_LIST, ARTICLE_LIST], start=POST)
+        _api_util.goto_board(api, 'give', refresh=True)
+        assert api.connect_core.keys == [LEFT, command.refresh]
+
+    def test_query_popup_is_dismissed(self):
+        # get_post(query=True) 停在「請按任意鍵繼續」
+        api = make_api([ARTICLE_LIST], start=QUERY_POPUP)
+        _api_util.goto_board(api, 'give')
+        assert api.connect_core.keys == [' ']
+
+    def test_popup_then_article(self):
+        api = make_api([POST, ARTICLE_LIST], start=QUERY_POPUP)
+        _api_util.goto_board(api, 'give')
+        assert api.connect_core.keys == [' ', LEFT]
+
+    def test_end_from_shortcut_jumps_to_bottom(self):
+        api = make_api([ARTICLE_LIST, ARTICLE_LIST], start=POST)
+        _api_util.goto_board(api, 'give', end=True)
+        assert api.connect_core.keys == [LEFT, '1' + ENTER + '$']
+
+
+class TestFallsBackToFullPath:
+    def test_different_board(self):
+        api = make_api([OTHER_LIST, ARTICLE_LIST], start=OTHER_LIST, current_board='test')
+        _api_util.goto_board(api, 'give')
+        assert api.connect_core.keys == [FULL_PATH]
+        assert api._current_board == 'give'
+
+    def test_unknown_current_board(self):
+        # 第一次進板，或搜尋過後 (forget_current_board)
+        api = make_api([ARTICLE_LIST], start=ARTICLE_LIST, current_board=None)
+        _api_util.goto_board(api, 'give')
+        assert api.connect_core.keys == [FULL_PATH]
+
+    def test_header_names_another_board(self):
+        # 追蹤的看板跟畫面不一致 (例如其他 API 換過地方) 時，以畫面為準
+        api = make_api([ARTICLE_LIST], start=OTHER_LIST)
+        _api_util.goto_board(api, 'give')
+        assert api.connect_core.keys == [FULL_PATH]
+
+    def test_left_from_article_lands_elsewhere(self):
+        # 停在信件內文：← 回到信箱，不是看板
+        api = make_api([MAIL_LIST, ARTICLE_LIST], start=POST)
+        _api_util.goto_board(api, 'give')
+        assert api.connect_core.keys == [LEFT, FULL_PATH]
+
+    def test_left_times_out_with_data(self):
+        api = make_api(['half drawn', ARTICLE_LIST], start=POST)
+        _api_util.goto_board(api, 'give')
+        assert api.connect_core.keys == [LEFT, FULL_PATH]
+
+    def test_main_menu_screen(self):
+        api = make_api([ARTICLE_LIST], start='【主功能表】                    批踢踢實業坊')
+        _api_util.goto_board(api, 'give')
+        assert api.connect_core.keys == [FULL_PATH]
+
+    def test_refresh_redraw_not_list_takes_full_path(self):
+        api = make_api(['garbage', ARTICLE_LIST], start=ARTICLE_LIST)
+        _api_util.goto_board(api, 'give', refresh=True)
+        assert api.connect_core.keys == [command.refresh, FULL_PATH]
+
+    def test_popup_over_other_screen_takes_full_path(self):
+        # 提示框關掉後不是這個看板 (例如查詢使用者之後)
+        api = make_api(['【主功能表】   看板《give》\n (h)說明', ARTICLE_LIST], start=QUERY_POPUP)
+        _api_util.goto_board(api, 'give')
+        assert api.connect_core.keys == [' ', FULL_PATH]
+
+    def test_silent_timeout_after_left_raises(self):
+        api = make_api([None], start=POST)
+        with pytest.raises(PyPtt.exceptions.ConnectionClosed):
+            _api_util.goto_board(api, 'give')
+
+
+class TestSearch:
+    def test_same_search_list_sends_nothing(self):
+        api = make_api([], start=SEARCH_LIST, current_search=KEYWORD)
+        _api_util.goto_board(api, 'give', search_list=KEYWORD)
+        assert api.connect_core.keys == []
+
+    def test_article_from_same_search_sends_one_left(self):
+        api = make_api([SEARCH_LIST], start=POST, current_search=KEYWORD)
+        _api_util.goto_board(api, 'give', search_list=KEYWORD)
+        assert api.connect_core.keys == [LEFT]
+        assert api._current_search == tuple(KEYWORD)
+
+    def test_plain_list_wanted_from_search_list(self):
+        # 搜尋結果 ← 一次就回到一般列表
+        api = make_api([ARTICLE_LIST], start=SEARCH_LIST, current_search=KEYWORD)
+        _api_util.goto_board(api, 'give')
+        assert api.connect_core.keys == [LEFT]
+        assert api._current_search == ()
+
+    def test_plain_list_wanted_from_article_in_search(self):
+        api = make_api([SEARCH_LIST, ARTICLE_LIST], start=POST, current_search=KEYWORD)
+        _api_util.goto_board(api, 'give')
+        assert api.connect_core.keys == [LEFT, LEFT]
+
+    def test_other_search_goes_back_and_searches_again(self):
+        api = make_api([ARTICLE_LIST, SEARCH_LIST], start=SEARCH_LIST, current_search=KEYWORD)
+        _api_util.goto_board(api, 'give', search_list=AUTHOR)
+        assert api.connect_core.keys == [LEFT, AUTHOR_CMD]
+        assert api._current_search == tuple(AUTHOR)
+
+    def test_search_from_plain_list(self):
+        api = make_api([SEARCH_LIST], start=ARTICLE_LIST)
+        _api_util.goto_board(api, 'give', search_list=KEYWORD + AUTHOR)
+        assert api.connect_core.keys == [KEYWORD_CMD + AUTHOR_CMD]
+        assert api._current_search == tuple(KEYWORD + AUTHOR)
+
+    def test_full_path_then_search(self):
+        api = make_api([ARTICLE_LIST, SEARCH_LIST], start=OTHER_LIST, current_board='test')
+        _api_util.goto_board(api, 'give', search_list=KEYWORD)
+        assert api.connect_core.keys == [FULL_PATH, KEYWORD_CMD]
+        assert (api._current_board, api._current_search) == ('give', tuple(KEYWORD))
+
+    def test_no_result_dismisses_and_stays_in_board(self):
+        api = make_api([NO_RESULT, ARTICLE_LIST], start=ARTICLE_LIST)
+        with pytest.raises(PyPtt.exceptions.NoSearchResult):
+            _api_util.goto_board(api, 'give', search_list=KEYWORD)
+        assert api.connect_core.keys == [KEYWORD_CMD, ' ']
+        assert (api._current_board, api._current_search) == ('give', ())
+
+    def test_unknown_screen_after_search_is_no_such_board(self):
+        api = make_api(['garbage'], start=ARTICLE_LIST)
+        with pytest.raises(PyPtt.exceptions.NoSuchBoard):
+            _api_util.goto_board(api, 'give', search_list=KEYWORD)
+        assert api._current_board is None
+
+    def test_no_result_then_unknown_screen_forgets_board(self):
+        api = make_api([NO_RESULT, 'garbage'], start=ARTICLE_LIST)
+        with pytest.raises(PyPtt.exceptions.NoSearchResult):
+            _api_util.goto_board(api, 'give', search_list=KEYWORD)
+        assert api._current_board is None
+
+    def test_search_list_without_record_is_not_reused(self):
+        # 畫面在搜尋結果，但記錄的條件不同 (或沒有記錄)：退回一般列表重搜
+        api = make_api([ARTICLE_LIST, SEARCH_LIST], start=SEARCH_LIST, current_search=())
+        _api_util.goto_board(api, 'give', search_list=KEYWORD)
+        assert api.connect_core.keys == [LEFT, KEYWORD_CMD]
+
+    def test_search_list_of_other_board(self):
+        other = SEARCH_LIST.replace('系列《give》', '系列《Test》')
+        api = make_api([ARTICLE_LIST], start=other, current_search=KEYWORD)
+        _api_util.goto_board(api, 'give', search_list=None)
+        assert api.connect_core.keys == [FULL_PATH]
+
+
+def test_forget_current_board():
+    api = make_api([], start=ARTICLE_LIST, current_search=KEYWORD)
+    _api_util.forget_current_board(api)
+    assert api._current_board is None
+    assert api._current_search == ()

{pyptt-2.3.16 → pyptt-2.3.18}/tests/test_half_dead_connection.py

@@ -124,9 +124,9 @@ def test_newest_index_noisy_timeout_still_raises_no_such_board():
 
 
 def test_newest_index_search_round_silent_timeout_raises_connection_closed():
-    """The second (search) send at _api_get_newest_index.py:128 has its own
-    flag check; the goto_board and first '$' sends must not mask it."""
-    api = FakeApi(FakeConnectCore([(2, False), (2, False), (-1, True)],
+    """The search send (goto_board's _search_in_board) has its own flag
+    check; the goto_board send before it must not mask it."""
+    api = FakeApi(FakeConnectCore([(2, False), (-1, True)],
                                   screens=(BOARD_SCREEN,)))
     with pytest.raises(exceptions.ConnectionClosed):
         _api_get_newest_index.get_newest_index(
@@ -135,7 +135,7 @@ def test_newest_index_search_round_silent_timeout_raises_connection_closed():
 
 
 def test_newest_index_search_round_noisy_timeout_raises_no_such_board():
-    api = FakeApi(FakeConnectCore([(2, False), (2, False), (-1, False)],
+    api = FakeApi(FakeConnectCore([(2, False), (-1, False)],
                                   screens=(BOARD_SCREEN,)))
     with pytest.raises(exceptions.NoSuchBoard):
         _api_get_newest_index.get_newest_index(

{pyptt-2.3.16 → pyptt-2.3.18}/tests/test_incremental_parity.py

@@ -54,6 +54,8 @@ CRAFTED = [
     b'  \x08\x08\xe2\x97\x8e tail',                     # ◎ via reservation pair
     b'\x1b[10;1H  \x08\x08\xe2\x80\xbb\x1b[10;3H \xe7\x99\xbc\xe4\xbf\xa1\xe7\xab\x99: x',
     b'\x1b[6nHELLO',                                    # unknown escape -> bail
+    b'a\x1b]8;;https://x.y/z\x1b\\link\x1b]8;;\x1b\\b',     # OSC 8 hyperlink (ST)
+    b'a\x1b]8;;https://x.y/z\x07link\x1b]8;;\x07b',         # OSC 8 hyperlink (BEL)
     b'line1\r\nline2',                                  # CRLF
     b'helloworld\x1b[1;2HXY',                           # replace mode
     b'\x1b[100;1HX',                                    # row clamp

{pyptt-2.3.16 → pyptt-2.3.18}/tests/test_new_screen_fixes.py

@@ -289,7 +289,8 @@ def _newest_api(screen_list):
 
 
 def test_newest_index_no_search_result(no_board_nav):
-    api = _newest_api([_fx('newest_index_board.txt'), _fx('newest_index_in_post.txt')])
+    # goto_board (含搜尋) 被換掉；搜尋後的 '1\r$' 落在文章裡就是沒有結果
+    api = _newest_api([_fx('newest_index_in_post.txt')])
     with pytest.raises(exceptions.NoSearchResult):
         _api_get_newest_index.get_newest_index(api, data_type.NewIndex.BOARD, board='Test',
                                                search_type=data_type.SearchType.AUTHOR,
@@ -297,7 +298,7 @@ def test_newest_index_no_search_result(no_board_nav):
 
 
 def test_newest_index_no_search_result_on_animation_post(no_board_nav):
-    api = _newest_api([_fx('newest_index_board.txt'), screens.Target.Animation[0]])
+    api = _newest_api([screens.Target.Animation[0]])
     with pytest.raises(exceptions.NoSearchResult):
         _api_get_newest_index.get_newest_index(api, data_type.NewIndex.BOARD, board='Test',
                                                search_type=data_type.SearchType.AUTHOR,

{pyptt-2.3.16 → pyptt-2.3.18}/tests/test_vt100_parser.py

@@ -481,3 +481,26 @@ def test_stray_esc_split_across_chunks():
         s.feed(data[:cut])
         s.feed(data[cut:])
         assert s.screen == VT100Parser(data, 'utf-8').screen, cut
+
+
+# 內文網址被包成 OSC 8 超連結 (ESC ] 8 ; ; URL ST 文字 ESC ] 8 ; ; ST); 沒被吃掉時引擎凍住, get_content 讀不到頁尾
+OSC8_POST = (b'\x1b[2J\x1b[3;1H\xe7\xb6\xb2\xe5\x9d\x80 \x1b]8;;https://example.com/a?b=1\x1b\\https://example.com/a?b=1'
+             b'\x1b]8;;\x1b\\ end\x1b[4;1H\x1b]8;;https://ptt.cc\x07ptt\x1b]8;;\x07\x1b[24;1Hfooter')
+
+
+def test_osc8_hyperlink_is_stripped():
+    lines = parse(OSC8_POST)
+    assert lines[2] == '網址 https://example.com/a?b=1 end'
+    assert lines[3] == 'ptt'
+    assert lines[23] == 'footer'
+
+
+def test_osc8_hyperlink_split_across_chunks():
+    from PyPtt.screens import IncrementalScreen
+    expected = VT100Parser(OSC8_POST, 'utf-8').screen
+    for cut in range(1, len(OSC8_POST)):
+        s = IncrementalScreen('utf-8')
+        s.feed(OSC8_POST[:cut])
+        s.feed(OSC8_POST[cut:])
+        assert not s._bailed, cut
+        assert s.screen == expected, cut