PyPtt 2.0.6__tar.gz → 2.0.8__tar.gz

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

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

@@ -147,6 +147,7 @@ class API:
 
         self.connect_core = connect_core.API(self)
         self._exist_board_list = set()
+        self._exist_user_list = set()
         self._moderators = dict()
         self._thread_id = threading.get_ident()
         self._goto_board_list = set()

{pyptt-2.0.6 → pyptt-2.0.8}/PyPtt/__init__.py

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

{pyptt-2.0.6 → pyptt-2.0.8}/PyPtt/_api_bucket.py

@@ -22,7 +22,7 @@ def bucket(api, board: str, bucket_days: int, reason: str, ptt_id: str) -> None:
     check_value.check_type(reason, str, 'reason')
     check_value.check_type(ptt_id, str, 'ptt_id')
 
-    api.get_user(ptt_id)
+    _api_util.check_user_exist(api, ptt_id)
 
     _api_util.check_board(api, board, check_moderator=True)
 

{pyptt-2.0.6 → pyptt-2.0.8}/PyPtt/_api_call_status.py

@@ -6,8 +6,7 @@ from . import log
 from . import screens
 
 
-def get_call_status(api) -> None:
-    # log.py = DefaultLogger('api', api.config.log_level)
+def get_call_status(api) -> data_type.CallStatus:
 
     cmd_list = []
     cmd_list.append(command.go_main_menu)
@@ -34,15 +33,15 @@ def get_call_status(api) -> None:
             raise exceptions.UnknownError('UnknownError')
 
     if index == 0:
-        return data_type.call_status.ON
+        return data_type.CallStatus.ON
     if index == 1:
-        return data_type.call_status.UNPLUG
+        return data_type.CallStatus.UNPLUG
     if index == 2:
-        return data_type.call_status.WATERPROOF
+        return data_type.CallStatus.WATERPROOF
     if index == 3:
-        return data_type.call_status.FRIEND
+        return data_type.CallStatus.FRIEND
     if index == 4:
-        return data_type.call_status.OFF
+        return data_type.CallStatus.OFF
 
     ori_screen = api.connect_core.get_screen_queue()[-1]
     raise exceptions.UnknownError(ori_screen)
@@ -63,10 +62,14 @@ def set_call_status(api, call_status) -> None:
     target_list = [
         connect_core.TargetUnit(screens.Target.InUserList, break_detect=True)]
 
-    while current_call_status != call_status:
+    for _ in range(6):
+        if current_call_status == call_status:
+            break
         api.connect_core.send(
             cmd,
             target_list,
             screen_timeout=api.config.screen_long_timeout)
 
         current_call_status = api._get_call_status()
+    else:
+        raise exceptions.UnknownError('could not set call status')

{pyptt-2.0.6 → pyptt-2.0.8}/PyPtt/_api_comment.py

@@ -67,7 +67,7 @@ def _comment(api,
 
     cmd_list = []
 
-    if index == 0 or index == 1:
+    if index in (0, 1, 2):
         push_option_line = api.connect_core.get_screen_queue()[-1]
         push_option_line = push_option_line.split('\n')[-1]
 

{pyptt-2.0.6 → pyptt-2.0.8}/PyPtt/_api_get_board_info.py

@@ -69,22 +69,27 @@ def get_board_info(api, board: str, get_post_kind: bool, call_by_others: bool) -
     ori_screen = api.connect_core.get_screen_queue()[-1]
     # print(ori_screen)
 
+    boardname = None
     p = re.compile(r'《(.+)》看板設定')
     r = p.search(ori_screen)
     if r is not None:
         boardname = r.group(0)[1:-5].strip()
 
+    if boardname is None:
+        raise exceptions.NoSuchBoard(api.config, board)
     logger.debug('看板名稱', boardname, board)
 
     if boardname.lower() != board.lower():
         raise exceptions.NoSuchBoard(api.config, board)
 
+    chinese_des = ''
     p = re.compile(r'中文敘述: (.+)')
     r = p.search(ori_screen)
     if r is not None:
         chinese_des = r.group(0)[5:].strip()
     logger.debug('中文敘述', chinese_des)
 
+    moderators = []
     p = re.compile(r'板主名單: (.+)')
     r = p.search(ori_screen)
     if r is not None:

{pyptt-2.0.6 → pyptt-2.0.8}/PyPtt/_api_get_user.py

@@ -30,12 +30,21 @@ def get_user(api, ptt_id: str) -> Dict:
     if len(ptt_id) < 2:
         raise exceptions.ParameterError(f'wrong parameter user_id: {ptt_id}')
 
-    cmd_list = []
-    cmd_list.append(command.go_main_menu)
-    cmd_list.append('T')
-    cmd_list.append(command.enter)
+    # Step 1: Navigate to Talk menu.
+    # AnyKey auto-dismiss is safe here because no query commands are pending.
+    cmd = command.go_main_menu + 'T' + command.enter
 
-    cmd = ''.join(cmd_list)
+    target_list = [
+        connect_core.TargetUnit(screens.Target.InTalk, break_detect=True),
+        connect_core.TargetUnit(screens.Target.AnyKey, response=' '),
+    ]
+
+    nav_index = api.connect_core.send(cmd, target_list)
+
+    # Step 2: Query user.
+    # Use AnyKey as break target — it's at the very bottom of the user info
+    # screen, so matching it confirms the screen is fully transmitted.
+    cmd = 'Q' + command.enter + ptt_id + command.enter
 
     # Use InTalk as a non-break target that auto-responds with the
     # query command, and max_match=1 to prevent re-matching on
@@ -76,7 +85,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:]
@@ -86,9 +101,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)
@@ -96,15 +122,16 @@ def get_user(api, ptt_id: str) -> Dict:
 
     # PTT2 沒有退文
     if api.config.host == data_type.HOST.PTT1:
-        illegal_post = int(re.findall(r'\d+', buff_1)[1])
+        int_list = re.findall(r'\d+', buff_1)
+        illegal_post = int(int_list[1]) if len(int_list) > 1 else 0
     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)
@@ -135,5 +162,7 @@ def get_user(api, ptt_id: str) -> Dict:
         UserField.chess: chess,
         UserField.signature_file: signature_file,
     }
+    api._exist_user_list.add(ptt_id.lower())
+
     user = json.dumps(user, cls=AutoJsonEncoder)
     return json.loads(user)

{pyptt-2.0.6 → pyptt-2.0.8}/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.6 → pyptt-2.0.8}/PyPtt/_api_give_money.py

@@ -33,8 +33,7 @@ def give_money(api, ptt_id: str, money: int, red_bag_title: str, red_bag_content
     log.logger.info(
         i18n.replace(i18n.give_money_to, ptt_id, money))
 
-    # Check data_type.user
-    api.get_user(ptt_id)
+    _api_util.check_user_exist(api, ptt_id)
 
     cmd_list = []
     cmd_list.append(command.go_main_menu)

{pyptt-2.0.6 → pyptt-2.0.8}/PyPtt/_api_mail.py

@@ -35,7 +35,7 @@ def mail(api,
     check_value.check_type(title, str, 'title')
     check_value.check_type(content, str, 'content')
 
-    api.get_user(ptt_id)
+    _api_util.check_user_exist(api, ptt_id)
 
     check_sign_file = False
     for i in range(0, 10):
@@ -277,7 +277,7 @@ def del_mail(api, index) -> None:
         raise exceptions.UnregisteredUser(lib_util.get_current_func_name())
 
     current_index = api.get_newest_index(data_type.NewIndex.MAIL)
-    check_value.check_index(index, current_index)
+    check_value.check_index('index', index, current_index)
 
     cmd_list = []
     # 進入主選單

{pyptt-2.0.6 → pyptt-2.0.8}/PyPtt/_api_mark_post.py

@@ -75,6 +75,7 @@ def mark_post(api, mark_type: int, board: str, post_aid: str, post_index: int, s
             raise exceptions.HostNotSupport(lib_util.get_current_func_name())
 
     _api_util.check_board(
+        api,
         board,
         check_moderator=True)
 

{pyptt-2.0.6 → pyptt-2.0.8}/PyPtt/_api_reply_post.py

@@ -68,6 +68,8 @@ def reply_post(api, reply_to: data_type.ReplyTo, board: str, content: str, sign_
     elif reply_to == data_type.ReplyTo.BOARD_MAIL:
         reply_msg = i18n.reply_board_mail
         reply_target_unit = connect_core.TargetUnit('▲ 回應至', log_level=log.INFO, response='B' + command.enter)
+    else:
+        raise exceptions.ParameterError(f'unsupported reply_to: {reply_to}')
     log.logger.info(reply_msg)
 
     cmd = ''.join(cmd_list)

{pyptt-2.0.6 → pyptt-2.0.8}/PyPtt/_api_util.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import functools
 import re
 import threading
 from dataclasses import dataclass
@@ -62,6 +61,8 @@ def get_content(api, post_mode: bool = True):
     first_page = True
     origin_post = []
     stop_dict = dict()
+    new_content_part = ''
+    get_line_b = 0
 
     while True:
         index = api.connect_core.send(cmd, target_list)
@@ -445,7 +446,11 @@ def one_thread(api):
         raise exceptions.MultiThreadOperated()
 
 
-@functools.lru_cache(maxsize=64)
+def check_user_exist(api, ptt_id: str) -> None:
+    if ptt_id.lower() not in api._exist_user_list:
+        api.get_user(ptt_id)
+
+
 def check_board(api, board: str, check_moderator: bool = False) -> Dict:
     if board.lower() not in api._exist_board_list:
         board_info = _api_get_board_info.get_board_info(api, board, get_post_kind=False, call_by_others=False)

{pyptt-2.0.6 → pyptt-2.0.8}/PyPtt/connect_core.py

@@ -249,6 +249,8 @@ class API(object):
                     self._RDQ.add(screen)
                     if target == self._UseTooManyResources:
                         use_too_many_res = True
+                        find_target = True
+                        log.logger.info(i18n.use_too_many_resources)
                         break
                     target.raise_exception()
 
@@ -327,19 +329,22 @@ class API(object):
                                 raise exceptions.UseTooManyResources()
                             raise exceptions.ConnectionClosed()
 
+                        if isinstance(data_chunk, str):
+                            data_chunk = data_chunk.encode('utf-8')
                         receive_data_buffer += data_chunk
 
                         screen, find_target, is_secret, break_detect_after_send, use_too_many_res, msg, target_index = \
                             self._decode_screen(receive_data_buffer, start_time, target_list, is_secret, refresh, msg)
 
-                        if self.current_encoding == 'big5uao' and not find_target:
-                            self.current_encoding = 'utf-8'
+                        if not find_target:
+                            original_encoding = self.current_encoding
+                            self.current_encoding = 'big5uao' if original_encoding == 'utf-8' else 'utf-8'
                             screen_, find_target, is_secret, break_detect_after_send, use_too_many_res, msg, target_index = \
                                 self._decode_screen(receive_data_buffer, start_time, target_list, is_secret, refresh, msg)
                             if find_target:
                                 screen = screen_
                             else:
-                                self.current_encoding = 'big5uao'
+                                self.current_encoding = original_encoding
 
                         if find_target:
                             break
@@ -348,13 +353,15 @@ class API(object):
                     vt100_p = screens.VT100Parser(receive_data_buffer, self.current_encoding)
                     screens.show(self.config, vt100_p.screen)
                     self._RDQ.add(vt100_p.screen)
+                if use_too_many_res:
+                    raise exceptions.UseTooManyResources()
                 return -1
 
             if target_index != -1:
                 return target_index
 
             if use_too_many_res:
-                continue
+                raise exceptions.UseTooManyResources()
 
             if not find_target:
                 return -1
@@ -366,7 +373,7 @@ class API(object):
             raise exceptions.ParameterError('Item of TargetList must be TargetUnit')
 
         if self._UseTooManyResources not in target_list:
-            target_list.append(self._UseTooManyResources)
+            target_list = target_list + [self._UseTooManyResources]
 
         if self.config.connect_mode == data_type.ConnectMode.TELNET:
             # Original Telnet logic remains, as it doesn't use asyncio
@@ -428,7 +435,11 @@ class API(object):
 
     def close(self):
         if self.config.connect_mode == data_type.ConnectMode.WEBSOCKETS:
-            if self._core and self._core.open:
+            try:
+                is_open = not self._core.closed
+            except AttributeError:
+                is_open = getattr(self._core, 'open', False)
+            if self._core and is_open:
                 loop = self._get_event_loop()
                 try:
                     loop.run_until_complete(asyncio.wait_for(self._core.close(), timeout=2.0))

{pyptt-2.0.6 → pyptt-2.0.8}/PyPtt/data_type.py

@@ -98,6 +98,14 @@ class PostField(AutoStrEnum):
     is_unconfirmed = auto()
 
 
+class CallStatus(AutoStrEnum):
+    ON = auto()
+    UNPLUG = auto()
+    WATERPROOF = auto()
+    FRIEND = auto()
+    OFF = auto()
+
+
 class WaterballType(AutoStrEnum):
     SEND = auto()
     CATCH = auto()

{pyptt-2.0.6 → pyptt-2.0.8}/PyPtt/screens.py

@@ -104,6 +104,8 @@ class Target:
 
     AnyKey = '任意鍵'
 
+    WaterballCleanup = '確定清除？'
+
     InTalk = [
         '【聊天說話】',
         '線上使用者列表',
@@ -149,7 +151,7 @@ class Target:
     ]
 
     use_too_many_resources = [
-        '程式耗用過多計算資源'
+        '程式耗用過多'
     ]
 
     Animation = [
@@ -215,11 +217,11 @@ class VT100Parser:
 
     def _move(self, x, y):
         self._cursor_x = x
-        self._cursor_y = y
+        self._cursor_y = min(y, len(self.screen) - 1)
 
     def _newline(self):
         self._cursor_x = 0
-        self._cursor_y += 1
+        self._cursor_y = min(self._cursor_y + 1, len(self.screen) - 1)
 
     def _k(self):
         if self._cursor_x == 0:

{pyptt-2.0.6 → pyptt-2.0.8}/PyPtt/service.py

@@ -13,7 +13,7 @@ from . import log
 
 class Service:
 
-    def __init__(self, pyptt_init_config: Optional[dict] = None):
+    def __init__(self, pyptt_init_config: Optional[dict] = None, call_interval: float = 0):
 
         """
 
@@ -24,6 +24,7 @@ class Service:
 
         Args:
             pyptt_init_config (dict): PyPtt 初始化設定，請參考 :ref:`初始化設定 <api-init>`。
+            call_interval (float): API 呼叫之間的最小時間間隔（秒），預設為 0（不限制）。
 
         Returns:
             None
@@ -48,7 +49,7 @@ class Service:
                     # 'language': PyPtt.Language.ENGLISH,
                 }
 
-                service = Service(pyptt_init_config)
+                service = Service(pyptt_init_config, call_interval=0.5)
 
                 try:
                     service.call('login', {'ptt_id': 'YOUR_PTT_ID', 'ptt_pw': 'YOUR_PTT_PW'})
@@ -69,6 +70,10 @@ class Service:
         if pyptt_init_config is None:
             pyptt_init_config = {}
 
+        check_value.check_type(call_interval, (int, float), 'call_interval')
+        if call_interval < 0:
+            raise exceptions.ParameterError('call_interval must be >= 0')
+
         log_level = pyptt_init_config.get('log_level', log.INFO)
         self.logger = log.init(log_level, 'service')
 
@@ -77,6 +82,9 @@ class Service:
         self._api = None
         self._api_init_config = pyptt_init_config
 
+        self._call_interval = call_interval
+        self._last_call_time = 0.0
+
         self._call_queue = Queue()
         self._call_result = {}
         self._call_result_cv = Condition()
@@ -106,6 +114,11 @@ class Service:
             except queue.Empty:
                 continue
 
+            if self._call_interval > 0:
+                elapsed = time.monotonic() - self._last_call_time
+                if elapsed < self._call_interval:
+                    time.sleep(self._call_interval - elapsed)
+
             func = getattr(self._api, call['api'])
 
             api_result = None
@@ -115,12 +128,14 @@ class Service:
             except Exception as e:
                 api_exception = e
 
+            self._last_call_time = time.monotonic()
+
             with self._call_result_cv:
                 self._call_result[call['id']] = {
                     'result': api_result,
                     'exception': api_exception
                 }
-                self._call_result_cv.notify()
+                self._call_result_cv.notify_all()
 
     def _get_call_id(self):
 
@@ -160,6 +175,20 @@ class Service:
 
         return call_result['result']
 
+    def set_call_interval(self, call_interval: float):
+        """設定 API 呼叫之間的最小時間間隔。
+
+        Args:
+            call_interval (float): 最小時間間隔（秒），必須 >= 0。
+
+        Returns:
+            None
+        """
+        check_value.check_type(call_interval, (int, float), 'call_interval')
+        if call_interval < 0:
+            raise exceptions.ParameterError('call_interval must be >= 0')
+        self._call_interval = call_interval
+
     def close(self):
         self.logger.info('close')
         self._close = True

pyptt-2.0.8/PyPtt/ssl_config.py

@@ -0,0 +1,24 @@
+key = """-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIERB+UA+r+F9qEtBJ52f9p3sWAQkNIl0UZJv6O3vj3qtoAoGCCqGSM49
+AwEHoUQDQgAEgTo7bZCEZpOdQa2o6P6KnSyVhfsFpvnEK0FGiU/V6xz6XWUMIVSy
++7dG5zGx7/OHa3iK6txCh11mPb+w/DYe8w==
+-----END EC PRIVATE KEY-----
+"""
+
+cert = """-----BEGIN CERTIFICATE-----
+MIIB6TCCAY8CFCwmWlM+i2IbtHKF0gLrHa2/PqvPMAoGCCqGSM49BAMCMHcxCzAJ
+BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
+CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
+EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNjA0MDUxNTIyNTZaFw0zNjA0MDIxNTIy
+NTZaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
+eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
+bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABIE6O22QhGaTnUGtqOj+ip0slYX7Bab5xCtBRolP1esc+l1lDCFUsvu3
+Rucxse/zh2t4iurcQoddZj2/sPw2HvMwCgYIKoZIzj0EAwIDSAAwRQIgc2K0N6II
+gvywv1b/rDjIhQdXK6/TF62MWyk5GtrX7N0CIQCMyhwOeA+HYyh4yBbrbP5pA70b
+n6j6snhIR6x2l0HWSw==
+-----END CERTIFICATE-----
+"""

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.0.6
+Version: 2.0.8
 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.6 → pyptt-2.0.8}/tests/test_get_user.py

@@ -17,12 +17,27 @@ def test_get_user(ptt_bots):
     """Tests getting user information from PTT."""
     test_users = [
         'CodingMan',
+        'codingman',
+        'CODINGMAN',
+        'cOdInGmAn',
     ]
 
-    for _ in range(100):
+    for _ in range(3):
         for test_user in test_users:
             user_info = ptt_bots[0].get_user(test_user)
             _check_user_info(user_info, test_user)
 
-            time.sleep(1)
 
+def test_get_user_no_such_user(ptt_bots):
+    """Tests that querying a non-existent user raises NoSuchUser."""
+    import PyPtt
+    import pytest
+
+    no_such_users = [
+        'zzznotexist999',
+        'qqzzxxyy123',
+    ]
+
+    for user in no_such_users:
+        with pytest.raises(PyPtt.exceptions.NoSuchUser):
+            ptt_bots[0].get_user(user)

{pyptt-2.0.6 → pyptt-2.0.8}/tests/test_service.py

@@ -5,6 +5,53 @@ import time
 from PyPtt import Service, PostField
 from tests import config # Assuming config.py has PTT1_ID and PTT1_PW
 
+class TestCallInterval:
+    """Tests for call_interval feature (no network required)."""
+
+    def test_default_call_interval(self):
+        service = Service()
+        assert service._call_interval == 0
+        service.close()
+
+    def test_init_with_call_interval(self):
+        service = Service(call_interval=1.5)
+        assert service._call_interval == 1.5
+        service.close()
+
+    def test_init_with_int_call_interval(self):
+        service = Service(call_interval=2)
+        assert service._call_interval == 2
+        service.close()
+
+    def test_set_call_interval(self):
+        service = Service()
+        service.set_call_interval(0.5)
+        assert service._call_interval == 0.5
+        service.set_call_interval(0)
+        assert service._call_interval == 0
+        service.close()
+
+    def test_negative_call_interval_init(self):
+        with pytest.raises(PyPtt.exceptions.ParameterError):
+            Service(call_interval=-1)
+
+    def test_negative_call_interval_setter(self):
+        service = Service()
+        with pytest.raises(PyPtt.exceptions.ParameterError):
+            service.set_call_interval(-1)
+        service.close()
+
+    def test_invalid_type_call_interval_init(self):
+        with pytest.raises(TypeError):
+            Service(call_interval='fast')
+
+    def test_invalid_type_call_interval_setter(self):
+        service = Service()
+        with pytest.raises(TypeError):
+            service.set_call_interval('fast')
+        service.close()
+
+
 @pytest.fixture(scope="module", autouse=True)
 def service_instance():
     import time

pyptt-2.0.6/PyPtt/ssl_config.py

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