PyPtt 2.0.5__tar.gz → 2.0.7__tar.gz

{pyptt-2.0.5 → pyptt-2.0.7}/PKG-INFO

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

{pyptt-2.0.5 → pyptt-2.0.7}/PyPtt/__init__.py

@@ -1,4 +1,6 @@
-__version__ = '2.0.5'
+__version__ = '2.0.7'
+__author__ = 'CodingMan'
+__email__ = 'pttcodingman@gmail.com'
 
 from .PTT import API
 from .data_type import *

{pyptt-2.0.5 → pyptt-2.0.7}/PyPtt/_api_get_user.py

@@ -37,30 +37,21 @@ def get_user(api, ptt_id: str) -> Dict:
 
     cmd = ''.join(cmd_list)
 
-    target_list = [
-        connect_core.TargetUnit(screens.Target.InTalk, break_detect=True),
-    ]
-
-    api.connect_core.send(cmd, target_list)
-
-    cmd_list = []
-    cmd_list.append('Q')
-    cmd_list.append(command.enter)
-    cmd_list.append(ptt_id)
-    cmd_list.append(command.enter)
-
-    cmd = ''.join(cmd_list)
+    # Use InTalk as a non-break target that auto-responds with the
+    # query command, and max_match=1 to prevent re-matching on
+    # intermediate screens (race condition fix).
+    query_cmd = 'Q' + command.enter + ptt_id + command.enter
 
     target_list = [
         connect_core.TargetUnit(screens.Target.AnyKey, break_detect=True),
-        connect_core.TargetUnit(screens.Target.InTalk, break_detect=True),
+        connect_core.TargetUnit(screens.Target.InTalk,
+                                response=query_cmd,
+                                max_match=1),
     ]
 
-    index = api.connect_core.send(
-        cmd,
-        target_list)
+    index = api.connect_core.send(cmd, target_list)
     ori_screen = api.connect_core.get_screen_queue()[-1]
-    if index == 1:
+    if index != 0:
         raise exceptions.NoSuchUser(ptt_id)
     # PTT1
     # 《ＩＤ暱稱》CodingMan (專業程式 BUG 製造機)《經濟狀況》小康 ($73866)
@@ -85,7 +76,13 @@ def get_user(api, ptt_id: str) -> Dict:
 
     # 《個人名片》CodingMan 目前沒有名片
 
-    lines = ori_screen.split('\n')[1:]
+    lines = ori_screen.split('\n')
+
+    def find_line(marker):
+        for i, line in enumerate(lines):
+            if marker in line:
+                return i, line
+        return -1, ''
 
     def parse_user_info_from_line(line: str) -> (str, str):
         part_0 = line[line.find('》') + 1:]
@@ -95,9 +92,20 @@ def get_user(api, ptt_id: str) -> Dict:
 
         return part_0, part_1
 
-    ptt_id, buff_1 = parse_user_info_from_line(lines[0])
+    id_idx, id_line = find_line('《ＩＤ暱稱》')
+    login_idx, login_line = find_line('《登入次數》')
+    activity_idx, activity_line = find_line('《目前動態》')
+    last_login_idx, last_login_line = find_line('《上次上站》')
+    chess_idx, chess_line = find_line('《 五子棋 》')
+
+    if any(idx == -1 for idx in [id_idx, login_idx, activity_idx, last_login_idx, chess_idx]):
+        log.logger.debug('get_user_parse_error', ori_screen)
+        raise exceptions.UnknownError(f'get_user parse error: {ori_screen}')
+
+    ptt_id, buff_1 = parse_user_info_from_line(id_line)
     money = int(int_list[0]) if len(int_list := re.findall(r'\d+', buff_1)) > 0 else buff_1
-    buff_0, buff_1 = parse_user_info_from_line(lines[1])
+
+    buff_0, buff_1 = parse_user_info_from_line(login_line)
 
     login_count = int(re.findall(r'\d+', buff_0)[0])
     account_verified = ('同天內只計一次' in buff_0)
@@ -109,11 +117,11 @@ def get_user(api, ptt_id: str) -> Dict:
     else:
         illegal_post = None
 
-    activity, mail = parse_user_info_from_line(lines[2])
-    last_login_date, last_login_ip = parse_user_info_from_line(lines[3])
-    five_chess, chess = parse_user_info_from_line(lines[4])
+    activity, mail = parse_user_info_from_line(activity_line)
+    last_login_date, last_login_ip = parse_user_info_from_line(last_login_line)
+    five_chess, chess = parse_user_info_from_line(chess_line)
 
-    signature_file = '\n'.join(lines[5:-1]).strip('\n')
+    signature_file = '\n'.join(lines[chess_idx + 1:-1]).strip('\n')
 
     log.logger.debug('ptt_id', ptt_id)
     log.logger.debug('money', money)

{pyptt-2.0.5 → pyptt-2.0.7}/PyPtt/_api_get_waterball.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import re
+from datetime import datetime
 from typing import List, Dict
 
 from . import _api_util
@@ -19,6 +20,11 @@ _to_target_pattern = re.compile(r'To (\S+):')
 _from_target_pattern = re.compile(r'★(\S+) ')
 
 
+def _parse_date(date_str: str) -> datetime:
+    """Parse waterball date string into datetime object."""
+    return datetime.strptime(date_str, '%m/%d/%Y %H:%M:%S')
+
+
 def _merge_continuation_lines(lines: list) -> list:
     merged = []
     i = 0
@@ -52,7 +58,7 @@ def _parse_waterball_line(line: str) -> Dict | None:
             WaterballField.type: WaterballType.SEND,
             WaterballField.target: target,
             WaterballField.content: content,
-            WaterballField.date: date,
+            WaterballField.date: _parse_date(date),
         }
     elif line.startswith('★'):
         target_match = _from_target_pattern.search(line)
@@ -66,7 +72,7 @@ def _parse_waterball_line(line: str) -> Dict | None:
             WaterballField.type: WaterballType.CATCH,
             WaterballField.target: target,
             WaterballField.content: content,
-            WaterballField.date: date,
+            WaterballField.date: _parse_date(date),
         }
     return None
 
@@ -128,6 +134,8 @@ def get_waterball(api, post_action: WaterballPostAction = WaterballPostAction.KE
             target_list_exit = [
                 connect_core.TargetUnit(screens.Target.WaterBallPostAction, log_level=log.DEBUG,
                                         response=action_cmd + command.enter),
+                connect_core.TargetUnit(screens.Target.WaterballCleanup, log_level=log.DEBUG,
+                                        response='y' + command.enter),
                 connect_core.TargetUnit(screens.Target.MainMenu, log_level=log.DEBUG, break_detect=True),
             ]
             api.connect_core.send('q', target_list_exit)

{pyptt-2.0.5 → pyptt-2.0.7}/PyPtt/screens.py

@@ -104,6 +104,8 @@ class Target:
 
     AnyKey = '任意鍵'
 
+    WaterballCleanup = '確定清除？'
+
     InTalk = [
         '【聊天說話】',
         '線上使用者列表',

pyptt-2.0.7/PyPtt/ssl_config.py

@@ -0,0 +1,24 @@
+key = """-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIFvkfPbkl4Ke99iXWTXG1LJnhFeMFREJWW9d4I76PZmGoAoGCCqGSM49
+AwEHoUQDQgAErWNfoKcmEmi+0tNm2CCne7MhF0+4iKZYJvtrn5kxRG73XWhoR79c
+7tfex7gLuFn/VXiP+rgDOe4MLT1LGrtD4A==
+-----END EC PRIVATE KEY-----
+"""
+
+cert = """-----BEGIN CERTIFICATE-----
+MIIB6TCCAY8CFFzZNObjJZqIs69GFDYbSXJqNpBIMAoGCCqGSM49BAMCMHcxCzAJ
+BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
+CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
+EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNjA0MDMxNDM1MzRaFw0zNjAzMzExNDM1
+MzRaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
+eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
+bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABK1jX6CnJhJovtLTZtggp3uzIRdPuIimWCb7a5+ZMURu911oaEe/XO7X
+3se4C7hZ/1V4j/q4AznuDC09Sxq7Q+AwCgYIKoZIzj0EAwIDSAAwRQIhAOAM8IPM
+5D4BoaWYf3SaSVzrm8v6FtSIhWrSYJatYjwoAiAW3NggrC+qYY3wYRDq8UmaiHLv
+pkJCEsbjl+remcwPbg==
+-----END CERTIFICATE-----
+"""

{pyptt-2.0.5 → pyptt-2.0.7}/PyPtt.egg-info/PKG-INFO

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

{pyptt-2.0.5 → pyptt-2.0.7}/tests/test_get_user.py

@@ -1,3 +1,6 @@
+import time
+
+
 def _check_user_info(user_info, test_user):
     assert user_info is not None, f'get_user returned None for user {test_user}'
     assert 'ptt_id' in user_info
@@ -16,20 +19,10 @@ def test_get_user(ptt_bots):
         'CodingMan',
     ]
 
-    for ptt_bot in ptt_bots:
+    for _ in range(100):
         for test_user in test_users:
-            user_info = ptt_bot.get_user(test_user)
+            user_info = ptt_bots[0].get_user(test_user)
             _check_user_info(user_info, test_user)
 
+            time.sleep(1)
 
-def test_get_user_ptt1_only(ptt_bots):
-    """Tests getting user information that only exists on PTT1."""
-    ptt1_bot = ptt_bots[0]
-
-    test_users = [
-        'janice001',
-    ]
-
-    for test_user in test_users:
-        user_info = ptt1_bot.get_user(test_user)
-        _check_user_info(user_info, test_user)

pyptt-2.0.5/PyPtt/ssl_config.py

@@ -1,24 +0,0 @@
-key = """-----BEGIN EC PARAMETERS-----
-BggqhkjOPQMBBw==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIKoC26Q5VfzkSPN5TShnQWBjUczlLrchp6TUvZz3yUvGoAoGCCqGSM49
-AwEHoUQDQgAE9FSTa74Y+hPSchUFAl0c0oX631NUsDjDZ2BR5/5uZ0CHcPNPiObg
-D3uXFU0vPdGIqDWIDHDf3VmshiDUD9IUgQ==
------END EC PRIVATE KEY-----
-"""
-
-cert = """-----BEGIN CERTIFICATE-----
-MIIB6DCCAY8CFGo6SqurrckTpxffizxr9VUuLqI9MAoGCCqGSM49BAMCMHcxCzAJ
-BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
-CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
-EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNjA0MDIxNTExNTdaFw0zNjAzMzAxNTEx
-NTdaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
-eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
-bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABPRUk2u+GPoT0nIVBQJdHNKF+t9TVLA4w2dgUef+bmdAh3DzT4jm4A97
-lxVNLz3RiKg1iAxw391ZrIYg1A/SFIEwCgYIKoZIzj0EAwIDRwAwRAIgSrQ9dTQ9
-qajw32Ws/Ua9s3WvPaPa9QGwmv2Mm1Wk02sCICh8iO5eApwSnSD+PdoTVgrINx72
-aDsfqjLNJ4BPjSDw
------END CERTIFICATE-----
-"""