PyPtt 1.2.16__tar.gz → 1.2.18__tar.gz

{pyptt-1.2.16 → pyptt-1.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PyPtt
-Version: 1.2.16
+Version: 1.2.18
 Summary: PyPtt
 Home-page: https://pyptt.cc/
 Author: CodingMan
@@ -37,12 +37,12 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
 ![](https://raw.githubusercontent.com/PttCodingMan/PyPtt/master/logo/facebook_cover_photo_2.png)
-# PyPtt
 [![Package Version](https://img.shields.io/pypi/v/PyPtt.svg)](https://pypi.python.org/pypi/PyPtt)
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/PyPtt)
 [![test](https://github.com/PyPtt/PyPtt/actions/workflows/test.yml/badge.svg)](https://github.com/PyPtt/PyPtt/actions/workflows/test.yml)
@@ -51,18 +51,27 @@ Dynamic: summary
 [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/PyPtt)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](http://paypal.me/CodingMan)
 
-#### PyPtt (PTT Library) 是一套 Pure Python PTT API 是目前支援最完整的 PTT API。具備大部分常用功能，無論推文、發文、取得文章、取得信件、寄信、發 P 幣、丟水球，你都可以在這裡找到完整的使用範例
-#### 使用帳號登入，支援使用登入之後才可以使用的功能，例如：推文、發文、寄信、發 P 幣等等
-#### 本專案意旨在提供 PTT 自動化機器人函式庫，無意違反任何 PTT 站方規範。如有牴觸，請馬上告知。
-#### 由於 PTT 封鎖雲端連線，建議在雲端以外的環境使用。
-####
-#### Pypi: https://pypi.org/project/PyPtt/
-<img src="https://raw.githubusercontent.com/PyPtt/PyPtt/master/docs/_static/login_1.0.gif" width="560">
+## PyPtt (PTT Library)
+
+PyPtt 是一套以 Pure Python 實作的 PTT (批踢踢) SDK，提供了完整功能讓您就像真人操作一樣地使用 PTT。
+
+### 主要功能
+- 帳號管理: 登入登出、修改密碼
+- 文章相關: 發文、推文、回覆、刪文
+- 看板相關: 搜尋文章、取得看板資訊
+- 信件系統: 寄信、收信、刪信
+- 管理功能: 水桶、修改看板標題
+- 其他功能: 即時訊息(水球)、P幣轉帳
 
-## 安裝
+### 系統需求
+- Python 3.6+
+- 非雲端環境 (因 PTT 封鎖雲端 IP)
+
+### 快速開始
 ```bash
 pip install PyPtt
 ```
+<img src="https://raw.githubusercontent.com/PyPtt/PyPtt/master/docs/_static/login_1.0.gif" width="560">
 
 ## 回報問題
 #### 請參考 [常見問題](https://pyptt.cc/faq.html) 章節
@@ -75,6 +84,10 @@ pip install PyPtt
 ####
 #### [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](http://paypal.me/CodingMan)
 
+## Star History
+
+[![Star History Chart](https://codingman.cc/images/star_history.svg)](https://www.star-history.com/#PyPtt/PyPtt&Date)
+
 ## 贊助清單
 
 #### leftc

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/PTT.py

@@ -29,6 +29,7 @@ from . import check_value
 from . import config
 from . import connect_core
 from . import data_type
+from . import exceptions
 from . import i18n
 from . import lib_util
 from . import log
@@ -139,16 +140,17 @@ class API:
 
         check_value.check_type(connect_mode, data_type.ConnectMode, 'connect_mode')
         if host in [data_type.HOST.PTT1, data_type.HOST.PTT2] and connect_mode is data_type.ConnectMode.TELNET:
-            raise ValueError('[PyPtt] TELNET is not available on PTT1 and PTT2')
+            raise exceptions.ParameterError('[PyPtt] TELNET is not available on PTT1 and PTT2')
         self.config.connect_mode = connect_mode
 
-        self.connect_core = connect_core.API(self.config)
-        self._exist_board_list = []
+        self.connect_core = connect_core.API(self)
+        self._exist_board_list = set()
         self._moderators = dict()
         self._thread_id = threading.get_ident()
-        self._goto_board_list = []
+        self._goto_board_list = set()
         self._board_info_list = dict()
         self._newest_index_data = data_type.TimedDict(timeout=2)
+        self.cursor = None
 
         log.logger.debug('thread_id', self._thread_id)
 

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/__init__.py

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

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/_api_comment.py

@@ -35,7 +35,7 @@ def _comment(api,
     elif post_index != 0:
         cmd_list.append(str(post_index))
     else:
-        raise ValueError('post_aid and post_index cannot be None at the same time')
+        raise exceptions.ParameterError('post_aid and post_index cannot be None at the same time')
 
     cmd_list.append(command.enter)
     cmd_list.append(command.comment)
@@ -138,13 +138,13 @@ def comment(api, board: str, push_type: data_type.CommentType, push_content: str
     check_value.check_type(post_index, int, 'index')
 
     if len(board) == 0:
-        raise ValueError(f'wrong parameter board: {board}')
+        raise exceptions.ParameterError(f'wrong parameter board: {board}')
 
     if post_index != 0 and isinstance(post_aid, str):
-        raise ValueError('wrong parameter index and aid can\'t both input')
+        raise exceptions.ParameterError('wrong parameter index and aid can\'t both input')
 
     if post_index == 0 and post_aid is None:
-        raise ValueError('wrong parameter index or aid must input')
+        raise exceptions.ParameterError('wrong parameter index or aid must input')
 
     if post_index != 0:
         newest_index = api.get_newest_index(
@@ -175,7 +175,7 @@ def comment(api, board: str, push_type: data_type.CommentType, push_content: str
 
     push_content = push_content.strip()
     push_list = []
-    
+
     while push_content:
         # 先找出符合長度限制的最大子字串
         test_content = push_content
@@ -183,7 +183,7 @@ def comment(api, board: str, push_type: data_type.CommentType, push_content: str
             if len(test_content.encode('big5uao', 'replace')) <= max_push_length:
                 break
             test_content = test_content[:-1]
-        
+
         # 找換行符號
         newline_pos = test_content.find('\n')
         if newline_pos != -1:

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/_api_del_post.py

@@ -29,13 +29,13 @@ def del_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
     check_value.check_type(post_index, int, 'PostIndex')
 
     if len(board) == 0:
-        raise ValueError(f'board error parameter: {board}')
+        raise exceptions.ParameterError(f'board error parameter: {board}')
 
     if post_index != 0 and isinstance(post_aid, str):
-        raise ValueError('wrong parameter index and aid can\'t both input')
+        raise exceptions.ParameterError('wrong parameter index and aid can\'t both input')
 
     if post_index == 0 and post_aid is None:
-        raise ValueError('wrong parameter index or aid must input')
+        raise exceptions.ParameterError('wrong parameter index or aid must input')
 
     if post_index != 0:
         newest_index = api.get_newest_index(
@@ -78,7 +78,7 @@ def del_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
     elif post_index != 0:
         cmd_list.append(str(post_index))
     else:
-        raise ValueError('post_aid and post_index cannot be None at the same time')
+        raise exceptions.ParameterError('post_aid and post_index cannot be None at the same time')
 
     cmd_list.append(command.enter)
     cmd_list.append('d')
@@ -106,4 +106,4 @@ def del_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
             log.logger.info(i18n.delete_post, '...', i18n.fail)
             raise exceptions.NoPermission(i18n.no_permission)
 
-    log.logger.info(i18n.delete_post, '...', i18n.success)
+    log.logger.info(i18n.delete_post, '...', i18n.success)

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/_api_get_board_info.py

@@ -30,31 +30,26 @@ 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)
 
-    nuser = None
+    online_user_line = None
     for line in ori_screen.split('\n'):
-        if '編號' not in line:
+        if '作  者' not in line:
             continue
         if '日 期' not in line:
             continue
-        if '人氣' not in line:
-            continue
 
-        nuser = line
+        online_user_line = line
         break
 
-    if nuser is None:
+    if online_user_line is None:
         raise exceptions.NoSuchBoard(api.config, board)
 
-    # print('------------------------')
-    # print('nuser', nuser)
-    # print('------------------------')
-    if '[靜]' in nuser:
+    if '[靜]' in online_user_line:
         online_user = 0
     else:
-        if '編號' not in nuser or '人氣' not in nuser:
+        if '日 期' not in online_user_line or '作  者' not in online_user_line:
             raise exceptions.NoSuchBoard(api.config, board)
         pattern = re.compile(r'[\d]+')
-        r = pattern.search(nuser)
+        r = pattern.search(online_user_line)
         if r is None:
             raise exceptions.NoSuchBoard(api.config, board)
         # 減一是把自己本身拿掉

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/_api_get_newest_index.py

@@ -96,6 +96,7 @@ 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.InBoardWithCursor, log_level=log.DEBUG, break_detect=True),
             connect_core.TargetUnit(screens.Target.MainMenu_Exiting,
                                     exceptions_=exceptions.NoSuchBoard(api.config, board)),
         ]
@@ -143,7 +144,7 @@ def get_newest_index(api, index_type: data_type.NewIndex, board: Optional[str] =
             raise exceptions.UnregisteredUser(lib_util.get_current_func_name())
 
         if board is not None:
-            raise ValueError('board should not input at NewIndex.MAIL.')
+            raise exceptions.ParameterError('board should not input at NewIndex.MAIL.')
 
         cmd_list = []
         cmd_list.append(command.go_main_menu)

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/_api_get_post.py

@@ -48,17 +48,17 @@ def get_post(api, board: str, aid: Optional[str] = None, index: Optional[int] =
         check_value.check_type(search_condition, str, 'search_condition')
 
     if len(board) == 0:
-        raise ValueError(f'board error parameter: {board}')
+        raise exceptions.ParameterError(f'board error parameter: {board}')
 
     if (index is not None and index > 0) and aid is not None:
-        raise ValueError('wrong parameter index and aid can\'t both input')
+        raise exceptions.ParameterError('wrong parameter index and aid can\'t both input')
 
     if aid is not None:
         pass
     elif index > 0:
         pass
     else:
-        raise ValueError('wrong parameter index or aid must input')
+        raise exceptions.ParameterError('wrong parameter index or aid must input')
 
     search_cmd = None
     if search_list is not None and len(search_list) > 0:
@@ -113,7 +113,7 @@ def _get_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
         cmd_list.append(command.enter)
         cmd_list.append(str(post_index))
     else:
-        raise ValueError('post_aid and post_index cannot be None at the same time')
+        raise exceptions.ParameterError('post_aid and post_index cannot be None at the same time')
 
     cmd_list.append(command.enter)
     cmd_list.append(command.query_post)

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/_api_get_post_index.py

@@ -2,7 +2,6 @@ from . import _api_util
 from . import command
 from . import connect_core
 from . import exceptions
-from . import i18n
 from . import log
 from . import screens
 

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/_api_get_user.py

@@ -28,7 +28,7 @@ def get_user(api, ptt_id: str) -> Dict:
 
     check_value.check_type(ptt_id, str, 'UserID')
     if len(ptt_id) < 2:
-        raise ValueError(f'wrong parameter user_id: {ptt_id}')
+        raise exceptions.ParameterError(f'wrong parameter user_id: {ptt_id}')
 
     cmd_list = []
     cmd_list.append(command.go_main_menu)

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/_api_loginout.py

@@ -65,7 +65,7 @@ def login(api, ptt_id: str, ptt_pw: str, kick_other_session: bool) -> None:
     def register_processing(screen):
         pattern = re.compile(r'[\d]+')
         api.process_picks = int(pattern.search(screen).group(0))
-        
+
     ptt_id = ptt_id[:12].strip()
     ptt_pw = ptt_pw[:8].strip()
 

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/_api_mail.py

@@ -45,7 +45,7 @@ def mail(api,
 
     if not check_sign_file:
         if sign_file.lower() != 'x':
-            raise ValueError(f'wrong parameter sign_file: {sign_file}')
+            raise exceptions.ParameterError(f'wrong parameter sign_file: {sign_file}')
 
     cmd_list = []
     # 回到主選單
@@ -130,7 +130,7 @@ def get_mail(api, index: int, search_type: Optional[data_type.SearchType] = None
     log.logger.info(i18n.get_mail)
 
     if not isinstance(index, int):
-        raise ValueError('index must be int')
+        raise exceptions.ParameterError('index must be int')
 
     current_index = api.get_newest_index(data_type.NewIndex.MAIL)
     if index <= 0 or current_index < index:

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/_api_mark_post.py

@@ -35,28 +35,28 @@ def mark_post(api, mark_type: int, board: str, post_aid: str, post_index: int, s
         check_value.check_type(search_condition, str, 'SearchCondition')
 
     if len(board) == 0:
-        raise ValueError(f'board error parameter: {board}')
+        raise exceptions.ParameterError(f'board error parameter: {board}')
 
     if mark_type != data_type.MarkType.DELETE_D:
         if post_index != 0 and isinstance(post_aid, str):
-            raise ValueError('wrong parameter index and aid can\'t both input')
+            raise exceptions.ParameterError('wrong parameter index and aid can\'t both input')
 
         if post_index == 0 and post_aid is None:
-            raise ValueError('wrong parameter index or aid must input')
+            raise exceptions.ParameterError('wrong parameter index or aid must input')
 
     if search_condition is not None and search_type == 0:
-        raise ValueError('wrong parameter index or aid must input')
+        raise exceptions.ParameterError('wrong parameter index or aid must input')
 
     if search_type == data_type.SearchType.COMMENT:
         try:
             S = int(search_condition)
         except ValueError:
-            raise ValueError(f'wrong parameter search_condition: {search_condition}')
+            raise exceptions.ParameterError(f'wrong parameter search_condition: {search_condition}')
 
         check_value.check_range(S, -100, 100, 'search_condition')
 
     if post_aid is not None and search_condition is not None:
-        raise ValueError('wrong parameter aid and search_condition can\'t both input')
+        raise exceptions.ParameterError('wrong parameter aid and search_condition can\'t both input')
 
     if post_index != 0:
         newest_index = api.get_newest_index(
@@ -104,7 +104,7 @@ def mark_post(api, mark_type: int, board: str, post_aid: str, post_index: int, s
 
         cmd_list.append(command.enter)
     else:
-        raise ValueError('post_aid and post_index cannot be None at the same time')
+        raise exceptions.ParameterError('post_aid and post_index cannot be None at the same time')
 
     if mark_type == data_type.MarkType.S:
         cmd_list.append('L')

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/_api_post.py

@@ -107,7 +107,7 @@ def post(api, board: str, title: str, content: str, title_index: int, sign_file:
     check_value.check_type(content, str, 'content')
 
     if str(sign_file).lower() not in sign_file_list:
-        raise ValueError(f'wrong parameter sign_file: {sign_file}')
+        raise exceptions.ParameterError(f'wrong parameter sign_file: {sign_file}')
 
     _api_util.check_board(api, board)
     _api_util.goto_board(api, board)

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/_api_reply_post.py

@@ -37,10 +37,10 @@ def reply_post(api, reply_to: data_type.ReplyTo, board: str, content: str, sign_
     sign_file_list.extend([str(x) for x in range(0, 10)])
 
     if str(sign_file).lower() not in sign_file_list:
-        raise ValueError(f'wrong parameter sign_file: {sign_file}')
+        raise exceptions.ParameterError(f'wrong parameter sign_file: {sign_file}')
 
     if post_aid is not None and post_index != 0:
-        raise ValueError('wrong parameter aid and index can\'t both input')
+        raise exceptions.ParameterError('wrong parameter aid and index can\'t both input')
 
     _api_util.check_board(api, board)
 
@@ -53,7 +53,7 @@ def reply_post(api, reply_to: data_type.ReplyTo, board: str, content: str, sign_
     elif post_index != 0:
         cmd_list.append(str(post_index))
     else:
-        raise ValueError('post_aid and post_index cannot be None at the same time')
+        raise exceptions.ParameterError('post_aid and post_index cannot be None at the same time')
 
     cmd_list.append(command.enter * 2)
     cmd_list.append('r')

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/_api_util.py

@@ -372,14 +372,15 @@ def goto_board(api, board: str, refresh: bool = False, end: bool = False) -> Non
     cmd_list.append('qs')
     cmd_list.append(board)
     cmd_list.append(command.enter)
-    cmd_list.append(command.space)
+    cmd_list.append(command.ctrl_c * 5)
 
     cmd = ''.join(cmd_list)
 
     target_list = [
-        connect_core.TargetUnit('任意鍵', log_level=log.DEBUG, response=' '),
-        connect_core.TargetUnit('互動式動畫播放中', log_level=log.DEBUG, response=command.ctrl_c),
+        connect_core.TargetUnit('任意鍵', log_level=log.DEBUG, response=command.space * 5),
+        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),
     ]
 
     if refresh:
@@ -389,8 +390,12 @@ def goto_board(api, board: str, refresh: bool = False, end: bool = False) -> Non
             current_refresh = True
         else:
             current_refresh = False
-    api._goto_board_list.append(board.lower())
-    api.connect_core.send(cmd, target_list, refresh=current_refresh)
+    api._goto_board_list.add(board.lower())
+
+    # 這裡可能因為發現第一次進入看板會有進版畫面，一般來說都可以在 target_list 找到對應的標的
+    # 但某些看板會卡在進版動畫中，但沒有顯示任意鍵繼續或互動是動畫，所以當 index == -1 (表示找不到標的 timeout 了)
+    # 可以嘗試修改 cmd_list
+    index = api.connect_core.send(cmd, target_list, refresh=current_refresh)
 
     if end:
         cmd_list = []
@@ -416,7 +421,7 @@ def one_thread(api):
 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)
-        api._exist_board_list.append(board.lower())
+        api._exist_board_list.add(board.lower())
         api._board_info_list[board.lower()] = board_info
 
         moderators = board_info[data_type.BoardField.moderators]

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/check_value.py

@@ -1,3 +1,4 @@
+from . import exceptions
 from . import i18n
 from . import log
 
@@ -21,19 +22,19 @@ def check_range(value, min_value, max_value, name) -> None:
 
     if min_value <= value <= max_value:
         return
-    raise ValueError(f'{name} {value} {i18n.must_between} {min_value} ~ {max_value}')
+    raise exceptions.ParameterError(f'{name} {value} {i18n.must_between} {min_value} ~ {max_value}')
 
 
 def check_index(name, index, max_value=None) -> None:
     check_type(index, int, name)
     if index < 1:
-        raise ValueError(f'{name} {i18n.must_bigger_than} 0')
+        raise exceptions.ParameterError(f'{name} {i18n.must_bigger_than} 0')
 
     if max_value is not None:
         if index > max_value:
             log.logger.info('index', index)
             log.logger.info('max_value', max_value)
-            raise ValueError(f'{name} {index} {i18n.must_between} 0 ~ {max_value}')
+            raise exceptions.ParameterError(f'{name} {index} {i18n.must_between} 0 ~ {max_value}')
 
 
 def check_index_range(start_name, start_index, end_name, end_index, max_value=None) -> None:
@@ -41,20 +42,20 @@ def check_index_range(start_name, start_index, end_name, end_index, max_value=No
     check_type(end_index, int, end_name)
 
     if start_index < 1:
-        raise ValueError(f'{start_name} {start_index} {i18n.must_bigger_than} 0')
+        raise exceptions.ParameterError(f'{start_name} {start_index} {i18n.must_bigger_than} 0')
 
     if end_index <= 1:
-        raise ValueError(f'{end_name} {end_index} {i18n.must_bigger_than} 1')
+        raise exceptions.ParameterError(f'{end_name} {end_index} {i18n.must_bigger_than} 1')
 
     if start_index > end_index:
-        raise ValueError(f'{end_name} {end_index} {i18n.must_bigger_than} {start_name} {start_index}')
+        raise exceptions.ParameterError(f'{end_name} {end_index} {i18n.must_bigger_than} {start_name} {start_index}')
 
     if max_value is not None:
         if start_index > max_value:
-            raise ValueError(f'{start_name} {start_index} {i18n.must_small_than} {max_value}')
+            raise exceptions.ParameterError(f'{start_name} {start_index} {i18n.must_small_than} {max_value}')
 
         if end_index > max_value:
-            raise ValueError(f'{end_name} {end_index} {i18n.must_small_than} {max_value}')
+            raise exceptions.ParameterError(f'{end_name} {end_index} {i18n.must_small_than} {max_value}')
 
 
 if __name__ == '__main__':

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/connect_core.py

@@ -25,10 +25,12 @@ from . import ssl_config
 
 try:
     import websockets.http
+
     websockets.http.USER_AGENT += f' PyPtt/{PyPtt.__version__}'
     use_http11 = False
 except AttributeError:
     import websockets.http11
+
     websockets.http11.USER_AGENT += f' PyPtt/{PyPtt.__version__}'
     use_http11 = True
 
@@ -80,7 +82,7 @@ class TargetUnit:
         self._max_match = max_match
         self._current_match = 0
 
-    def is_match(self, screen: str) -> bool:
+    def is_match(self, screen: str, cursor) -> bool:
         if self._current_match >= self._max_match > 0:
             return False
         if isinstance(self.detect_target, str):
@@ -89,8 +91,11 @@ class TargetUnit:
                 return True
             return False
         elif isinstance(self.detect_target, list):
-            for Target in self.detect_target:
-                if Target not in screen:
+            for target in self.detect_target:
+                if target == cursor:
+                    if not any(line.startswith(target) for line in screen.split('\n')):
+                        return False
+                elif target not in screen:
                     return False
             self._current_match += 1
             return True
@@ -152,10 +157,11 @@ class ReceiveDataQueue(object):
 
 
 class API(object):
-    def __init__(self, config):
+    def __init__(self, api):
 
         self.current_encoding = 'big5uao'
-        self.config = config
+        self.api = api
+        self.config = api.config
         self._RDQ = ReceiveDataQueue()
         self._UseTooManyResources = TargetUnit(screens.Target.use_too_many_resources,
                                                exceptions_=exceptions.UseTooManyResources())
@@ -209,7 +215,8 @@ class API(object):
                         loop = asyncio.new_event_loop()
                         asyncio.set_event_loop(loop)
 
-                    log.logger.debug('USER_AGENT', websockets.http11.USER_AGENT if use_http11 else websockets.http.USER_AGENT)
+                    log.logger.debug('USER_AGENT',
+                                     websockets.http11.USER_AGENT if use_http11 else websockets.http.USER_AGENT)
                     self._core = asyncio.get_event_loop().run_until_complete(
                         websockets.connect(
                             websocket_host,
@@ -249,8 +256,7 @@ class API(object):
         find_target = False
         target_index = -1
         for target in target_list:
-            condition = target.is_match(screen)
-            if condition:
+            if target.is_match(screen, self.api.cursor):
                 if target._Handler is not None:
                     target._Handler(screen)
                 if len(screen) > 0:
@@ -295,7 +301,7 @@ class API(object):
              secret: bool = False) -> int:
 
         if not all(isinstance(T, TargetUnit) for T in target_list):
-            raise ValueError('Item of TargetList must be TargetUnit')
+            raise exceptions.ParameterError('Item of TargetList must be TargetUnit')
 
         if self._UseTooManyResources not in target_list:
             target_list.append(self._UseTooManyResources)

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/exceptions.py

@@ -275,3 +275,11 @@ class ResetYourContactEmail(Error):
 
     def __str__(self):
         return self.message
+
+
+class ParameterError(Error):
+    def __init__(self, message):
+        self.message = message
+
+    def __str__(self):
+        return self.message

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/i18n.py

@@ -3,6 +3,7 @@ import random
 
 from . import __version__
 from . import data_type
+from . import exceptions
 
 locale_pool = {
     data_type.Language.ENGLISH,
@@ -26,7 +27,7 @@ def replace(string, *args):
 
 def init(locale: str, cache: bool = False) -> None:
     if locale not in locale_pool:
-        raise ValueError(f'Unknown locale: {locale}')
+        raise exceptions.ParameterError(f'Unknown locale: {locale}')
 
     if locale == data_type.Language.ENGLISH:
         from . import lang_en_US as lang
@@ -35,7 +36,7 @@ def init(locale: str, cache: bool = False) -> None:
     string_data = lang.string_data
 
     if string_data is None:
-        raise ValueError(f'Unknown locale: {locale}')
+        raise exceptions.ParameterError(f'Unknown locale: {locale}')
 
     for k, v in string_data.items():
 
@@ -44,7 +45,7 @@ def init(locale: str, cache: bool = False) -> None:
         elif isinstance(v, str):
             pass
         else:
-            raise ValueError(f'Unknown string data type: {v}')
+            raise exceptions.ParameterError(f'Unknown string data type: {v}')
 
         if locale == data_type.Language.ENGLISH:
             v = v[0].upper() + v[1:]
@@ -54,6 +55,4 @@ def init(locale: str, cache: bool = False) -> None:
 
         globals()[k] = v
         if cache:
-            global _lang_data
             _lang_data[k] = v
-

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/lib_util.py

@@ -12,6 +12,7 @@ import requests
 from . import __version__
 from . import check_value
 from . import data_type
+from . import exceptions
 from . import i18n
 from . import log
 
@@ -50,7 +51,7 @@ def get_aid_from_url(url: str) -> Tuple[str, str]:
     pattern = re.compile(r'https://www.ptt.cc/bbs/[-.\w]+/M.[\d]+.A[.\w]*.html')
     r = pattern.search(url)
     if r is None:
-        raise ValueError('wrong parameter url must be www.ptt.cc post url')
+        raise exceptions.ParameterError('wrong parameter url must be www.ptt.cc post url')
 
     board = url[23:]
     board = board[:board.find('/')]
@@ -87,7 +88,6 @@ sync_version_result: str = ''
 
 def sync_version() -> Tuple[data_type.Compare, str]:
     global sync_version_compare
-    global sync_version_result
 
     if sync_version_compare is not data_type.Compare.UNKNOWN:
         return sync_version_compare, sync_version_result
@@ -148,7 +148,7 @@ def uniform_new_line(text: str) -> str:
 @functools.lru_cache(maxsize=64)
 def check_aid(aid: str) -> str:
     if aid is None:
-        raise ValueError('aid is None')
+        raise exceptions.ParameterError('aid is None')
 
     if not isinstance(aid, str):
         raise TypeError('aid is not str')
@@ -157,12 +157,12 @@ def check_aid(aid: str) -> str:
         aid = aid[1:]
 
     if len(aid) != 8:
-        raise ValueError('aid is not valid')
+        raise exceptions.ParameterError('aid is not valid')
 
     # check the char of aid is in aid_table or not
     for char in aid:
         if char not in aid_table:
-            raise ValueError('aid is not valid')
+            raise exceptions.ParameterError('aid is not valid')
 
     return f'#{aid}'
 

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/screens.py

@@ -161,6 +161,11 @@ class Target:
         '--\n※ 發信站: 新批踢踢(ptt2.twbbs.org.tw)'
     ]
 
+    OnlineUser = [
+        '編號',
+        '日 期'
+    ]
+
 
 def show(config, screen_queue, function_name=None):
     if config.log_level != log.DEBUG:

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt/service.py

@@ -7,6 +7,7 @@ from typing import Optional
 
 from . import PTT
 from . import check_value
+from . import exceptions
 from . import log
 
 
@@ -136,7 +137,7 @@ class Service:
         check_value.check_type(args, dict, 'args')
 
         if api not in dir(self._api):
-            raise ValueError(f'api {api} not found')
+            raise exceptions.ParameterError(f'api {api} not found')
 
         call = {
             'api': api,
@@ -164,4 +165,4 @@ class Service:
         self._close = True
         self._thread.join()
 
-        self.logger.info('done')
+        self.logger.info('done')

pyptt-1.2.18/PyPtt/ssl_config.py

@@ -0,0 +1,24 @@
+key = """-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJbgsRW2TKkVA9Xes0BF+mZmt9xt55PQVkS/5fW7MSGRoAoGCCqGSM49
+AwEHoUQDQgAEovYlaBBO4yItJL4E64G3vnJ/35Y086ZHhasVSBcOHaWZ3gvPfEQ6
+bGzjAHcP0nvIHujHWZ0n+WiKHx5YrNBqdQ==
+-----END EC PRIVATE KEY-----
+"""
+
+cert = """-----BEGIN CERTIFICATE-----
+MIIB6TCCAY8CFBH32z9ttIrOFfV1B3S83UMpXJ8rMAoGCCqGSM49BAMCMHcxCzAJ
+BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
+CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
+EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNTA2MTEwMTI1NTZaFw0zNTA2MDkwMTI1
+NTZaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
+eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
+bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABKL2JWgQTuMiLSS+BOuBt75yf9+WNPOmR4WrFUgXDh2lmd4Lz3xEOmxs
+4wB3D9J7yB7ox1mdJ/loih8eWKzQanUwCgYIKoZIzj0EAwIDSAAwRQIhAOptXAaR
+UNGwem1Rrhu3u1xjXjquzYugsE4wEqe4ZtINAiAn8kWuKxsy+BLc3R4VOzzQ33zW
+RVgyl1y5FA4471yinw==
+-----END CERTIFICATE-----
+"""

{pyptt-1.2.16 → pyptt-1.2.18}/PyPtt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PyPtt
-Version: 1.2.16
+Version: 1.2.18
 Summary: PyPtt
 Home-page: https://pyptt.cc/
 Author: CodingMan
@@ -37,12 +37,12 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
 ![](https://raw.githubusercontent.com/PttCodingMan/PyPtt/master/logo/facebook_cover_photo_2.png)
-# PyPtt
 [![Package Version](https://img.shields.io/pypi/v/PyPtt.svg)](https://pypi.python.org/pypi/PyPtt)
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/PyPtt)
 [![test](https://github.com/PyPtt/PyPtt/actions/workflows/test.yml/badge.svg)](https://github.com/PyPtt/PyPtt/actions/workflows/test.yml)
@@ -51,18 +51,27 @@ Dynamic: summary
 [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/PyPtt)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](http://paypal.me/CodingMan)
 
-#### PyPtt (PTT Library) 是一套 Pure Python PTT API 是目前支援最完整的 PTT API。具備大部分常用功能，無論推文、發文、取得文章、取得信件、寄信、發 P 幣、丟水球，你都可以在這裡找到完整的使用範例
-#### 使用帳號登入，支援使用登入之後才可以使用的功能，例如：推文、發文、寄信、發 P 幣等等
-#### 本專案意旨在提供 PTT 自動化機器人函式庫，無意違反任何 PTT 站方規範。如有牴觸，請馬上告知。
-#### 由於 PTT 封鎖雲端連線，建議在雲端以外的環境使用。
-####
-#### Pypi: https://pypi.org/project/PyPtt/
-<img src="https://raw.githubusercontent.com/PyPtt/PyPtt/master/docs/_static/login_1.0.gif" width="560">
+## PyPtt (PTT Library)
+
+PyPtt 是一套以 Pure Python 實作的 PTT (批踢踢) SDK，提供了完整功能讓您就像真人操作一樣地使用 PTT。
+
+### 主要功能
+- 帳號管理: 登入登出、修改密碼
+- 文章相關: 發文、推文、回覆、刪文
+- 看板相關: 搜尋文章、取得看板資訊
+- 信件系統: 寄信、收信、刪信
+- 管理功能: 水桶、修改看板標題
+- 其他功能: 即時訊息(水球)、P幣轉帳
 
-## 安裝
+### 系統需求
+- Python 3.6+
+- 非雲端環境 (因 PTT 封鎖雲端 IP)
+
+### 快速開始
 ```bash
 pip install PyPtt
 ```
+<img src="https://raw.githubusercontent.com/PyPtt/PyPtt/master/docs/_static/login_1.0.gif" width="560">
 
 ## 回報問題
 #### 請參考 [常見問題](https://pyptt.cc/faq.html) 章節
@@ -75,6 +84,10 @@ pip install PyPtt
 ####
 #### [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](http://paypal.me/CodingMan)
 
+## Star History
+
+[![Star History Chart](https://codingman.cc/images/star_history.svg)](https://www.star-history.com/#PyPtt/PyPtt&Date)
+
 ## 贊助清單
 
 #### leftc

{pyptt-1.2.16 → pyptt-1.2.18}/README.md

@@ -1,5 +1,4 @@
 ![](https://raw.githubusercontent.com/PttCodingMan/PyPtt/master/logo/facebook_cover_photo_2.png)
-# PyPtt
 [![Package Version](https://img.shields.io/pypi/v/PyPtt.svg)](https://pypi.python.org/pypi/PyPtt)
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/PyPtt)
 [![test](https://github.com/PyPtt/PyPtt/actions/workflows/test.yml/badge.svg)](https://github.com/PyPtt/PyPtt/actions/workflows/test.yml)
@@ -8,18 +7,27 @@
 [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/PyPtt)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](http://paypal.me/CodingMan)
 
-#### PyPtt (PTT Library) 是一套 Pure Python PTT API 是目前支援最完整的 PTT API。具備大部分常用功能，無論推文、發文、取得文章、取得信件、寄信、發 P 幣、丟水球，你都可以在這裡找到完整的使用範例
-#### 使用帳號登入，支援使用登入之後才可以使用的功能，例如：推文、發文、寄信、發 P 幣等等
-#### 本專案意旨在提供 PTT 自動化機器人函式庫，無意違反任何 PTT 站方規範。如有牴觸，請馬上告知。
-#### 由於 PTT 封鎖雲端連線，建議在雲端以外的環境使用。
-####
-#### Pypi: https://pypi.org/project/PyPtt/
-<img src="https://raw.githubusercontent.com/PyPtt/PyPtt/master/docs/_static/login_1.0.gif" width="560">
+## PyPtt (PTT Library)
+
+PyPtt 是一套以 Pure Python 實作的 PTT (批踢踢) SDK，提供了完整功能讓您就像真人操作一樣地使用 PTT。
+
+### 主要功能
+- 帳號管理: 登入登出、修改密碼
+- 文章相關: 發文、推文、回覆、刪文
+- 看板相關: 搜尋文章、取得看板資訊
+- 信件系統: 寄信、收信、刪信
+- 管理功能: 水桶、修改看板標題
+- 其他功能: 即時訊息(水球)、P幣轉帳
 
-## 安裝
+### 系統需求
+- Python 3.6+
+- 非雲端環境 (因 PTT 封鎖雲端 IP)
+
+### 快速開始
 ```bash
 pip install PyPtt
 ```
+<img src="https://raw.githubusercontent.com/PyPtt/PyPtt/master/docs/_static/login_1.0.gif" width="560">
 
 ## 回報問題
 #### 請參考 [常見問題](https://pyptt.cc/faq.html) 章節
@@ -32,6 +40,10 @@ pip install PyPtt
 ####
 #### [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](http://paypal.me/CodingMan)
 
+## Star History
+
+[![Star History Chart](https://codingman.cc/images/star_history.svg)](https://www.star-history.com/#PyPtt/PyPtt&Date)
+
 ## 贊助清單
 
 #### leftc

pyptt-1.2.16/PyPtt/ssl_config.py

@@ -1,24 +0,0 @@
-key = """-----BEGIN EC PARAMETERS-----
-BggqhkjOPQMBBw==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFaMupPGfs4HeNqeO79cQ/T8oFhOW9XpJAOy7oc247DnoAoGCCqGSM49
-AwEHoUQDQgAESBT3HZWk/z7G0RWKULAbhYW3QEu6LWz8Js3N9vWefgEJSrSlSHw+
-uM06lbX+d6xXWFS0hkAYNP2IpsUyHEEFkg==
------END EC PRIVATE KEY-----
-"""
-
-cert = """-----BEGIN CERTIFICATE-----
-MIIB6jCCAY8CFHEG4hrPag+DbRaGd+PG27opXSxKMAoGCCqGSM49BAMCMHcxCzAJ
-BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
-CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
-EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNTAyMDMwODIyMzRaFw0zNTAyMDEwODIy
-MzRaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
-eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
-bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABEgU9x2VpP8+xtEVilCwG4WFt0BLui1s/CbNzfb1nn4BCUq0pUh8PrjN
-OpW1/nesV1hUtIZAGDT9iKbFMhxBBZIwCgYIKoZIzj0EAwIDSQAwRgIhAINzsXQz
-RAF1+F8ECSP3fyPH4FUw32kzoKRA5V0iR6uXAiEAwevGdpqmUIKRLGgAT/N/iZdi
-RkBaBNzGzP0yguxa5rg=
------END CERTIFICATE-----
-"""