PyPtt 2.0.5__tar.gz → 2.0.6__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.0.5
+Version: 2.0.6
 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.6}/PyPtt/__init__.py

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

{pyptt-2.0.5 → pyptt-2.0.6}/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)

pyptt-2.0.6/PyPtt/ssl_config.py

@@ -0,0 +1,24 @@
+key = """-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIFnari/tIK4DobE9n6Q66VNwZ3iIMO4OIfYlxriiiiO2oAoGCCqGSM49
+AwEHoUQDQgAEPB+56uUrwmG6uqxqvRWA/Q3qEMYcmyw4c/KgEKLN8IpzzH8oqfrc
+94C1WVZ6w/VBePPn8NG4EOTSEzJoMEHKkQ==
+-----END EC PRIVATE KEY-----
+"""
+
+cert = """-----BEGIN CERTIFICATE-----
+MIIB6jCCAY8CFAqMFEZkRx5MTexvhJ87UaaYKbmNMAoGCCqGSM49BAMCMHcxCzAJ
+BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
+CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
+EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNjA0MDMwMzE5MjhaFw0zNjAzMzEwMzE5
+MjhaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
+eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
+bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABDwfuerlK8Jhurqsar0VgP0N6hDGHJssOHPyoBCizfCKc8x/KKn63PeA
+tVlWesP1QXjz5/DRuBDk0hMyaDBBypEwCgYIKoZIzj0EAwIDSQAwRgIhAImZ1AX9
+SW/lm0nyJMeAgtOm29LosMscrNNqoGz50Ha+AiEAxSLRceZ4WocAWxMNXXLqbRq5
+FDyqLTDZ4WFPLAGhhkY=
+-----END CERTIFICATE-----
+"""

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.0.5
+Version: 2.0.6
 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.6}/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-----
-"""