PyPtt 2.0.4__tar.gz → 2.0.5__tar.gz

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

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

@@ -948,10 +948,7 @@ class API:
         取得水球紀錄。
 
         Args:
-            post_action (WaterballPostAction): 取得水球後的處理方式。
-                - ``WaterballPostAction.KEEP``（預設）：保留水球記錄。
-                - ``WaterballPostAction.CLEAR``：清除水球記錄。
-                - ``WaterballPostAction.MAILBOX``：存入信箱。
+            post_action (:ref:`waterball-post-action`): 取得水球後的處理方式，預設為 KEEP。
 
         Returns:
             List[Dict]，水球紀錄清單，詳見 :ref:`waterball-field`。

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

@@ -1,4 +1,4 @@
-__version__ = '2.0.4'
+__version__ = '2.0.5'
 
 from .PTT import API
 from .data_type import *

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

@@ -34,6 +34,16 @@ def get_user(api, ptt_id: str) -> Dict:
     cmd_list.append(command.go_main_menu)
     cmd_list.append('T')
     cmd_list.append(command.enter)
+
+    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)

{pyptt-2.0.4 → pyptt-2.0.5}/PyPtt/_api_util.py

@@ -400,6 +400,7 @@ def goto_board(api, board: str, refresh: bool = False, end: bool = False) -> Non
         connect_core.TargetUnit('互動式動畫播放中', log_level=log.DEBUG, response=command.ctrl_c * 5),
         connect_core.TargetUnit(screens.Target.InBoard, 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, log_level=log.DEBUG, break_detect=True),
     ]
 
     if refresh:
@@ -414,7 +415,15 @@ def goto_board(api, board: str, refresh: bool = False, end: bool = False) -> Non
     # 這裡可能因為發現第一次進入看板會有進版畫面，一般來說都可以在 target_list 找到對應的標的
     # 但某些看板會卡在進版動畫中，但沒有顯示任意鍵繼續或互動是動畫，所以當 index == -1 (表示找不到標的 timeout 了)
     # 可以嘗試修改 cmd_list
-    api.connect_core.send(cmd, target_list, refresh=current_refresh)
+    index = api.connect_core.send(cmd, target_list, refresh=current_refresh)
+
+    # index == 4 表示偵測到 MainMenu_Exiting，代表導航到看板失敗
+    # 可能是暫時性的問題（閒置太久、連線狀態改變等），重試一次
+    if index == 4:
+        log.logger.debug('goto_board', board, 'failed, retrying')
+        index = api.connect_core.send(cmd, target_list, refresh=True)
+        if index == 4:
+            raise exceptions.NoSuchBoard(api.config, board)
 
     if end:
         cmd_list = []

pyptt-2.0.5/PyPtt/ssl_config.py

@@ -0,0 +1,24 @@
+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-----
+"""

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.0.4
+Version: 2.0.5
 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/tests/test_get_user.py

@@ -0,0 +1,35 @@
+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
+    assert user_info['ptt_id'].lower().startswith(test_user.lower())
+    assert 'money' in user_info
+    assert 'login_count' in user_info
+    assert 'account_verified' in user_info
+    assert 'legal_post' in user_info
+    assert 'activity' in user_info
+    assert 'last_login_date' in user_info
+
+
+def test_get_user(ptt_bots):
+    """Tests getting user information from PTT."""
+    test_users = [
+        'CodingMan',
+    ]
+
+    for ptt_bot in ptt_bots:
+        for test_user in test_users:
+            user_info = ptt_bot.get_user(test_user)
+            _check_user_info(user_info, test_user)
+
+
+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.4/PyPtt/ssl_config.py

@@ -1,24 +0,0 @@
-key = """-----BEGIN EC PARAMETERS-----
-BggqhkjOPQMBBw==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOE3tIbWxbdarjPa0fenJkhDse+yNGE+XbNMPwJbfFOtoAoGCCqGSM49
-AwEHoUQDQgAErjEPTt8Rikqr4wLdGYIXhd7wS7AWvPhrt8qtDONlCjsqAQ2oY4O7
-G87Ah+iXl2oRF2uPzQGtfM7CFsNTlLTfbw==
------END EC PRIVATE KEY-----
-"""
-
-cert = """-----BEGIN CERTIFICATE-----
-MIIB6TCCAY8CFFdRgQKRIcIm+scYtVi+9MfhfKC5MAoGCCqGSM49BAMCMHcxCzAJ
-BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
-CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
-EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNjA0MDIxMzEyMTlaFw0zNjAzMzAxMzEy
-MTlaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
-eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
-bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABK4xD07fEYpKq+MC3RmCF4Xe8EuwFrz4a7fKrQzjZQo7KgENqGODuxvO
-wIfol5dqERdrj80BrXzOwhbDU5S0328wCgYIKoZIzj0EAwIDSAAwRQIgO66bdeL+
-VmionJ9Ou8P/EOLAwVYEmopd9gMwk9NLi+8CIQDbwtIOEiojbDkOgkvdNT0YCjxh
-sdPJMimQlJB/o2AwBg==
------END CERTIFICATE-----
-"""

pyptt-2.0.4/tests/test_get_user.py

@@ -1,19 +0,0 @@
-def test_get_user(ptt_bots):
-    """Tests getting user information from PTT."""
-    test_users = [
-        'CodingMan'
-    ]
-
-    for ptt_bot in ptt_bots:
-        for test_user in test_users:
-            user_info = ptt_bot.get_user(test_user)
-
-            assert user_info is not None, f'get_user returned None for user {test_user} on host {ptt_bot.host}'
-            assert 'ptt_id' in user_info
-            assert user_info['ptt_id'].lower().startswith(test_user.lower())
-            assert 'money' in user_info
-            assert 'login_count' in user_info
-            assert 'account_verified' in user_info
-            assert 'legal_post' in user_info
-            assert 'activity' in user_info
-            assert 'last_login_date' in user_info