PyPtt 1.1.2.dev95668__tar.gz → 1.2.1__tar.gz

{PyPtt-1.1.2.dev95668 → PyPtt-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPtt
-Version: 1.1.2.dev95668
+Version: 1.2.1
 Summary: PyPtt
 Home-page: https://pyptt.cc/
 Author: CodingMan
@@ -27,9 +27,9 @@ License-File: LICENSE
 Requires-Dist: progressbar2
 Requires-Dist: websockets
 Requires-Dist: uao
-Requires-Dist: SingleLog
 Requires-Dist: requests
 Requires-Dist: AutoStrEnum
+Requires-Dist: PyYAML
 
 ![](https://raw.githubusercontent.com/PttCodingMan/PyPtt/master/logo/facebook_cover_photo_2.png)
 # PyPtt

{PyPtt-1.1.2.dev95668 → PyPtt-1.2.1}/PyPtt/PTT.py

@@ -4,8 +4,6 @@ import functools
 import threading
 from typing import Dict, Tuple, Callable, List, Optional, Any
 
-from SingleLog import LogLevel, DefaultLogger
-
 from . import __version__
 from . import _api_bucket
 from . import _api_change_pw
@@ -33,15 +31,11 @@ from . import connect_core
 from . import data_type
 from . import i18n
 from . import lib_util
+from . import log
 
 
 class API:
-    def __init__(self, language: data_type.Language = data_type.Language.MANDARIN, log_level: LogLevel = LogLevel.INFO,
-                 screen_timeout: int = 3.0, screen_long_timeout: int = 10.0, screen_post_timeout: int = 60.0,
-                 connect_mode: data_type.ConnectMode = data_type.ConnectMode.WEBSOCKETS, port: int = 23,
-                 logger_callback: Optional[Callable] = None, host=data_type.HOST.PTT1,
-                 check_update: bool = True) -> None:
-
+    def __init__(self, **kwargs):
         """
 
         初始化 PyPtt。
@@ -69,26 +63,44 @@ class API:
         參考: :ref:`language`、LogLevel_、:ref:`connect-mode`、:ref:`host`
 
         .. _LogLevel: https://github.com/PttCodingMan/SingleLog/blob/d7c19a1b848dfb1c9df8201f13def9a31afd035c/SingleLog/SingleLog.py#L22
-        """
 
-        self.logger = None
+        英文顯示範例::
+
+            import PyPtt
+
+            ptt_bot = PyPtt.API(
+                language=PyPtt.Language.ENGLISH)
+
+        除錯範例::
+
+            import PyPtt
+
+            ptt_bot = PyPtt.API(
+                log_level=PyPtt.LogLevel.DEBUG)
 
-        if not isinstance(log_level, LogLevel):
-            raise TypeError('[PyPtt] log_level must be LogLevel')
 
-        if logger_callback is not None and not callable(logger_callback):
-            raise TypeError('[PyPtt] logger_callback must be callable')
+        """
+
+        log_level = kwargs.get('log_level', log.INFO)
+        if not isinstance(log_level, log.LogLv):
+            raise TypeError('[PyPtt] log_level must be log.Level')
 
-        self.logger = DefaultLogger('PyPtt', log_level, handler=logger_callback, **config.LOGGER_CONFIG)
+        logger_callback = kwargs.get('logger_callback', None)
+        log.init(log_level, logger_callback=logger_callback)
 
-        if not isinstance(language, data_type.Language):
+        language = kwargs.get('language', data_type.Language.MANDARIN)
+        if not isinstance(language, str):
+            raise TypeError('[PyPtt] language must be PyPtt.Language')
+        if language not in i18n.locale_pool:
             raise TypeError('[PyPtt] language must be PyPtt.Language')
 
         self.config = config.Config()
         self.config.log_level = log_level
 
         self.config.language = language
-        i18n.load(self.config.language)
+
+        print('language', self.config.language)
+        i18n.init(self.config.language)
 
         self.is_mailbox_full: bool = False
         self.is_registered_user: bool = False
@@ -98,9 +110,15 @@ class API:
         self._ptt_pw: str = ''
         self._is_login: bool = False
 
+        host = kwargs.get('host', data_type.HOST.PTT1)
+        screen_timeout = kwargs.get('screen_timeout', 3.0)
+        screen_long_timeout = kwargs.get('screen_long_timeout', 10.0)
+        screen_post_timeout = kwargs.get('screen_post_timeout', 60.0)
+
         check_value.check_type(host, (data_type.HOST, str), 'host')
         check_value.check_type(screen_timeout, float, 'screen_timeout')
         check_value.check_type(screen_long_timeout, float, 'screen_long_timeout')
+        check_value.check_type(screen_post_timeout, float, 'screen_post_timeout')
 
         if screen_timeout != 0:
             self.config.screen_timeout = screen_timeout
@@ -112,10 +130,14 @@ class API:
         self.config.host = host
         self.host = host
 
+        port = kwargs.get('port', 23)
+
         check_value.check_type(port, int, 'port')
         check_value.check_range(port, 1, 65535 - 1, 'port')
         self.config.port = port
 
+        connect_mode = kwargs.get('connect_mode', data_type.ConnectMode.WEBSOCKETS)
+
         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')
@@ -129,47 +151,53 @@ class API:
         self._board_info_list = dict()
         self._newest_index_data = data_type.TimedDict(timeout=2)
 
-        self.logger.debug('ThreadID', self._thread_id)
+        log.logger.debug('thread_id', self._thread_id)
 
-        self.logger.info(i18n.welcome)
+        log.logger.info(
+            i18n.replace(i18n.welcome, __version__))
 
-        self.logger.info('PyPtt', i18n.init)
+        log.logger.info('PyPtt', i18n.initialization)
 
         if self.config.connect_mode == data_type.ConnectMode.TELNET:
-            self.logger.info(i18n.set_connect_mode, i18n.connect_mode_TELNET)
+            log.logger.info(i18n.set_connect_mode, '...', i18n.connect_mode_TELNET)
         elif self.config.connect_mode == data_type.ConnectMode.WEBSOCKETS:
-            self.logger.info(i18n.set_connect_mode, i18n.connect_mode_WEBSOCKET)
+            log.logger.info(i18n.set_connect_mode, '...', i18n.connect_mode_WEBSOCKET)
 
         if self.config.language == data_type.Language.MANDARIN:
-            self.logger.info(i18n.set_up_lang_module, i18n.mandarin_module)
+            log.logger.info(i18n.set_up_lang_module, '...', i18n.mandarin_module)
         elif self.config.language == data_type.Language.ENGLISH:
-            self.logger.info(i18n.set_up_lang_module, i18n.english_module)
+            log.logger.info(i18n.set_up_lang_module, '...', i18n.english_module)
 
         if self.config.host == data_type.HOST.PTT1:
-            self.logger.info(i18n.set_connect_host, i18n.PTT)
+            log.logger.info(i18n.set_connect_host, '...', i18n.PTT)
         elif self.config.host == data_type.HOST.PTT2:
-            self.logger.info(i18n.set_connect_host, i18n.PTT2)
+            log.logger.info(i18n.set_connect_host, '...', i18n.PTT2)
         elif self.config.host == data_type.HOST.LOCALHOST:
-            self.logger.info(i18n.set_connect_host, i18n.localhost)
+            log.logger.info(i18n.set_connect_host, '...', i18n.localhost)
         else:
-            self.logger.info(i18n.set_connect_host, self.config.host)
+            log.logger.info(i18n.set_connect_host, '...', self.config.host)
+
+        log.logger.info('PyPtt', i18n.initialization, '...', i18n.done)
+
+        check_update = kwargs.get('check_update', True)
+        check_value.check_type(check_update, bool, 'check_update')
 
         if check_update:
             version_compare, remote_version = lib_util.sync_version()
 
             if version_compare is data_type.Compare.SMALLER:
-                self.logger.info(i18n.current_version, __version__)
-                self.logger.info(i18n.new_version, remote_version)
+                log.logger.info(i18n.current_version, __version__)
+                log.logger.info(i18n.new_version, remote_version)
             elif version_compare is data_type.Compare.BIGGER:
-                self.logger.info(i18n.development_version, __version__)
+                log.logger.info(i18n.development_version, __version__)
             else:
-                self.logger.info(i18n.latest_version, __version__)
+                log.logger.info(i18n.latest_version, __version__)
         else:
-            self.logger.info(i18n.current_version, __version__)
+            log.logger.info(i18n.current_version, __version__)
 
     def __del__(self):
-        if self.logger:
-            self.logger.debug(i18n.goodbye)
+        if log.logger:
+            log.logger.debug(i18n.goodbye)
 
     def login(self, ptt_id: str, ptt_pw: str, kick_other_session: bool = False) -> None:
 
@@ -258,7 +286,7 @@ class API:
 
     def get_post(self, board: str, aid: Optional[str] = None, index: Optional[int] = None,
                  search_type: Optional[data_type.SearchType] = None, search_condition: Optional[str] = None,
-                 search_list: Optional[List[str]] = None, query: bool = False) -> Dict:
+                 search_list: Optional[List[tuple]] = None, query: bool = False) -> Dict:
         """
         取得文章。
 
@@ -266,8 +294,6 @@ class API:
             board (str): 看板名稱。
             aid (str): 文章編號。
             index: 文章編號。
-            search_type (:ref:`search-type`): 搜尋類型。
-            search_condition (str): 搜尋條件。
             search_list (List[str]): 搜尋清單。
             query (bool): 是否為查詢模式。
 
@@ -302,6 +328,22 @@ class API:
             finally:
                 ptt_bot.logout()
 
+        使用搜尋範例::
+
+            import PyPtt
+
+            ptt_bot = PyPtt.API()
+            try:
+                # .. login ..
+                post_info = ptt_bot.get_post(
+                    'Python',
+                    index=1,
+                    search_list=[(PyPtt.SearchType.KEYWORD, 'PyPtt')]
+                )
+                # .. do something ..
+            finally:
+                ptt_bot.logout()
+
         | 更多範例參考 :ref:`取得文章 <check_post_status>`
         | 參考 :ref:`取得最新文章編號 <api-get-newest-index>`
         """

{PyPtt-1.1.2.dev95668 → PyPtt-1.2.1}/PyPtt/__init__.py

@@ -1,12 +1,11 @@
-__version__ = '1.1.2.dev95668'
-
-from SingleLog import LogLevel
+__version__ = '1.2.1'
 
 from .PTT import API
 from .data_type import *
 from .exceptions import *
+from .log import LogLevel
 from .service import Service
 
 LOG_LEVEL = LogLevel
 
-_main_version = '1.1'
+_main_version = '1.2'

{PyPtt-1.1.2.dev95668 → PyPtt-1.2.1}/PyPtt/_api_call_status.py

@@ -1,9 +1,8 @@
-from SingleLog import LogLevel
-
 from . import command
 from . import connect_core
 from . import data_type
 from . import exceptions
+from . import log
 from . import screens
 
 
@@ -19,12 +18,12 @@ def get_call_status(api) -> None:
     cmd = ''.join(cmd_list)
 
     target_list = [
-        connect_core.TargetUnit('[呼叫器]打開', log_level=LogLevel.DEBUG, break_detect=True),
-        connect_core.TargetUnit('[呼叫器]拔掉', log_level=LogLevel.DEBUG, break_detect=True),
-        connect_core.TargetUnit('[呼叫器]防水', log_level=LogLevel.DEBUG, break_detect=True),
-        connect_core.TargetUnit('[呼叫器]好友', log_level=LogLevel.DEBUG, break_detect=True),
-        connect_core.TargetUnit('[呼叫器]關閉', log_level=LogLevel.DEBUG, break_detect=True),
-        connect_core.TargetUnit('★', log_level=LogLevel.DEBUG, response=cmd),
+        connect_core.TargetUnit('[呼叫器]打開', log_level=log.DEBUG, break_detect=True),
+        connect_core.TargetUnit('[呼叫器]拔掉', log_level=log.DEBUG, break_detect=True),
+        connect_core.TargetUnit('[呼叫器]防水', log_level=log.DEBUG, break_detect=True),
+        connect_core.TargetUnit('[呼叫器]好友', log_level=log.DEBUG, break_detect=True),
+        connect_core.TargetUnit('[呼叫器]關閉', log_level=log.DEBUG, break_detect=True),
+        connect_core.TargetUnit('★', log_level=log.DEBUG, response=cmd),
     ]
 
     for i in range(2):

{PyPtt-1.1.2.dev95668 → PyPtt-1.2.1}/PyPtt/_api_change_pw.py

@@ -1,20 +1,17 @@
-from SingleLog import DefaultLogger
-
 from . import command, _api_util
 from . import connect_core
 from . import exceptions
 from . import i18n
+from . import log
 
 
 def change_pw(api, new_password: str) -> None:
     _api_util.one_thread(api)
 
-    logger = DefaultLogger('api', api.config.log_level)
-
     if not api._is_login:
         raise exceptions.RequireLogin(i18n.require_login)
 
-    logger.info(i18n.change_pw)
+    log.logger.info(i18n.change_pw)
 
     new_password = new_password[:8]
 
@@ -48,4 +45,4 @@ def change_pw(api, new_password: str) -> None:
 
     api._ptt_pw = new_password
 
-    logger.info(i18n.success)
+    log.logger.info(i18n.change_pw, '...', i18n.success)

{PyPtt-1.1.2.dev95668 → PyPtt-1.2.1}/PyPtt/_api_comment.py

@@ -1,8 +1,6 @@
 import collections
 import time
 
-from SingleLog import LogLevel
-
 from . import _api_util
 from . import check_value
 from . import command
@@ -11,6 +9,7 @@ from . import data_type
 from . import exceptions
 from . import i18n
 from . import lib_util
+from . import log
 from . import screens
 
 comment_option = [
@@ -27,7 +26,6 @@ def _comment(api,
              push_content: str,
              post_aid: str,
              post_index: int) -> None:
-
     _api_util.goto_board(api, board)
 
     cmd_list = []
@@ -45,16 +43,16 @@ def _comment(api,
     cmd = ''.join(cmd_list)
 
     target_list = [
-        connect_core.TargetUnit('您覺得這篇', log_level=LogLevel.DEBUG, break_detect=True),
-        connect_core.TargetUnit(f'→ {api.ptt_id}: ', log_level=LogLevel.DEBUG, break_detect=True),
-        connect_core.TargetUnit('加註方式', log_level=LogLevel.DEBUG, break_detect=True),
-        connect_core.TargetUnit('禁止快速連續推文', log_level=LogLevel.INFO, break_detect=True,
+        connect_core.TargetUnit('您覺得這篇', log_level=log.DEBUG, break_detect=True),
+        connect_core.TargetUnit(f'→ {api.ptt_id}: ', log_level=log.DEBUG, break_detect=True),
+        connect_core.TargetUnit('加註方式', log_level=log.DEBUG, break_detect=True),
+        connect_core.TargetUnit('禁止快速連續推文', log_level=log.INFO, break_detect=True,
                                 exceptions_=exceptions.NoFastComment()),
-        connect_core.TargetUnit('禁止短時間內大量推文', log_level=LogLevel.INFO, break_detect=True,
+        connect_core.TargetUnit('禁止短時間內大量推文', log_level=log.INFO, break_detect=True,
                                 exceptions_=exceptions.NoFastComment()),
-        connect_core.TargetUnit('使用者不可發言', log_level=LogLevel.INFO, break_detect=True,
+        connect_core.TargetUnit('使用者不可發言', log_level=log.INFO, break_detect=True,
                                 exceptions_=exceptions.NoPermission(i18n.no_permission)),
-        connect_core.TargetUnit('◆ 抱歉, 禁止推薦', log_level=LogLevel.INFO, break_detect=True,
+        connect_core.TargetUnit('◆ 抱歉, 禁止推薦', log_level=log.INFO, break_detect=True,
                                 exceptions_=exceptions.CantComment()),
     ]
 
@@ -65,7 +63,7 @@ def _comment(api,
     if index == -1:
         raise exceptions.UnknownError('unknown error in comment')
 
-    api.logger.info(i18n.has_comment_permission)
+    log.logger.debug(i18n.has_comment_permission)
 
     cmd_list = []
 
@@ -73,7 +71,7 @@ def _comment(api,
         push_option_line = api.connect_core.get_screen_queue()[-1]
         push_option_line = push_option_line.split('\n')[-1]
 
-        api.logger.debug('comment option line', push_option_line)
+        log.logger.debug('comment option line', push_option_line)
 
         available_push_type = collections.defaultdict(lambda: False)
         first_available_push_type = None
@@ -96,7 +94,7 @@ def _comment(api,
             if first_available_push_type is None:
                 first_available_push_type = data_type.CommentType.BOO
 
-        api.logger.debug('available_push_type', available_push_type)
+        log.logger.debug('available_push_type', available_push_type)
 
         if available_push_type[push_type] is False:
             if first_available_push_type:
@@ -113,7 +111,7 @@ def _comment(api,
     cmd = ''.join(cmd_list)
 
     target_list = [
-        connect_core.TargetUnit(screens.Target.InBoard, log_level=LogLevel.DEBUG, break_detect=True),
+        connect_core.TargetUnit(screens.Target.InBoard, log_level=log.DEBUG, break_detect=True),
     ]
 
     api.connect_core.send(
@@ -123,7 +121,6 @@ def _comment(api,
 
 def comment(api, board: str, push_type: data_type.CommentType, push_content: str, post_aid: str,
             post_index: int) -> None:
-
     if not api.is_registered_user:
         raise exceptions.UnregisteredUser(lib_util.get_current_func_name())
 
@@ -160,20 +157,20 @@ def comment(api, board: str, push_type: data_type.CommentType, push_content: str
     board_info = api._board_info_list[board.lower()]
 
     if board_info[data_type.BoardField.is_comment_record_ip]:
-        api.logger.debug(i18n.record_ip)
+        log.logger.debug(i18n.record_ip)
         if board_info[data_type.BoardField.is_comment_aligned]:
-            api.logger.debug(i18n.push_aligned)
+            log.logger.debug(i18n.push_aligned)
             max_push_length = 32
         else:
-            api.logger.debug(i18n.not_push_aligned)
+            log.logger.debug(i18n.not_push_aligned)
             max_push_length = 43 - len(api.ptt_id)
     else:
-        api.logger.debug(i18n.not_record_ip)
+        log.logger.debug(i18n.not_record_ip)
         if board_info[data_type.BoardField.is_comment_aligned]:
-            api.logger.debug(i18n.push_aligned)
+            log.logger.debug(i18n.push_aligned)
             max_push_length = 46
         else:
-            api.logger.debug(i18n.not_push_aligned)
+            log.logger.debug(i18n.not_push_aligned)
             max_push_length = 58 - len(api.ptt_id)
 
     push_content = push_content.strip()
@@ -200,7 +197,7 @@ def comment(api, board: str, push_type: data_type.CommentType, push_content: str
 
     for comment in push_list:
 
-        api.logger.info(i18n.comment)
+        log.logger.info(i18n.comment)
 
         for _ in range(2):
             try:
@@ -208,7 +205,7 @@ def comment(api, board: str, push_type: data_type.CommentType, push_content: str
                 break
             except exceptions.NoFastComment:
                 # screens.show(api.config, api.connect_core.getScreenQueue())
-                api.logger.info(i18n.wait_for_no_fast_comment)
+                log.logger.info(i18n.wait_for_no_fast_comment)
                 time.sleep(5.2)
 
-        api.logger.info(i18n.success)
+        log.logger.info(i18n.comment, '...', i18n.success)

{PyPtt-1.1.2.dev95668 → PyPtt-1.2.1}/PyPtt/_api_del_post.py

@@ -10,6 +10,7 @@ from . import data_type
 from . import exceptions
 from . import i18n
 from . import lib_util
+from . import log
 from . import screens
 
 
@@ -45,6 +46,8 @@ def del_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
             post_index,
             newest_index)
 
+    log.logger.info(i18n.delete_post)
+
     board_info = _api_util.check_board(api, board)
 
     check_author = True
@@ -53,16 +56,17 @@ def del_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
             check_author = False
             break
 
-    api.logger.info(i18n.delete_post)
+    log.logger.info(i18n.delete_post)
 
     post_info = api.get_post(board, aid=post_aid, index=post_index, query=True)
     if post_info[data_type.PostField.post_status] != data_type.PostStatus.EXISTS:
         # delete success
-        api.logger.info(i18n.success)
+        log.logger.info(i18n.success)
         return
 
     if check_author:
         if api.ptt_id.lower() != post_info[data_type.PostField.author].lower():
+            log.logger.info(i18n.delete_post, '...', i18n.fail)
             raise exceptions.NoPermission(i18n.no_permission)
 
     _api_util.goto_board(api, board)
@@ -97,13 +101,9 @@ def del_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
         cmd,
         target_list)
 
-    # last_screen = api.connect_core.get_screen_queue()[-1]
-    # print(api.confirm)
-    # print(last_screen)
-    # print(index)
-
     if index == 1:
         if not api.confirm:
+            log.logger.info(i18n.delete_post, '...', i18n.fail)
             raise exceptions.NoPermission(i18n.no_permission)
 
-    api.logger.info(i18n.success)
+    log.logger.info(i18n.delete_post, '...', i18n.success)

{PyPtt-1.1.2.dev95668 → PyPtt-1.2.1}/PyPtt/_api_get_board_info.py

@@ -1,21 +1,19 @@
 import re
 from typing import Dict
 
-from SingleLog import DefaultLogger
-from SingleLog import LogLevel
-
 from . import _api_util
 from . import check_value
 from . import command
 from . import connect_core
 from . import exceptions
 from . import i18n
+from . import log
 from . import screens
 from .data_type import BoardField
 
 
 def get_board_info(api, board: str, get_post_kind: bool, call_by_others: bool) -> Dict:
-    logger = DefaultLogger('get_board_info', LogLevel.DEBUG if call_by_others else LogLevel.INFO)
+    logger = log.init(log.DEBUG if call_by_others else log.INFO)
 
     _api_util.one_thread(api)
 
@@ -24,6 +22,9 @@ def get_board_info(api, board: str, get_post_kind: bool, call_by_others: bool) -
 
     check_value.check_type(board, str, 'board')
 
+    logger.info(
+        i18n.replace(i18n.get_board_info, board))
+
     _api_util.goto_board(api, board, refresh=True)
 
     ori_screen = api.connect_core.get_screen_queue()[-1]
@@ -62,7 +63,7 @@ def get_board_info(api, board: str, get_post_kind: bool, call_by_others: bool) -
     logger.debug('人氣', online_user)
 
     target_list = [
-        connect_core.TargetUnit('任意鍵繼續', log_level=LogLevel.DEBUG if call_by_others else LogLevel.INFO,
+        connect_core.TargetUnit('任意鍵繼續', log_level=log.DEBUG if call_by_others else log.INFO,
                                 break_detect=True),
     ]
 
@@ -229,6 +230,11 @@ def get_board_info(api, board: str, get_post_kind: bool, call_by_others: bool) -
             cmd,
             target_list)
 
+    logger.info(
+        i18n.replace(i18n.get_board_info, board),
+        '...', i18n.success
+    )
+
     return {
         BoardField.board: boardname,
         BoardField.online_user: online_user,

{PyPtt-1.1.2.dev95668 → PyPtt-1.2.1}/PyPtt/_api_get_board_list.py

@@ -1,11 +1,11 @@
 import progressbar
-from SingleLog import LogLevel
 
 from . import _api_util
 from . import command
 from . import connect_core
 from . import exceptions
 from . import i18n
+from . import log
 from . import screens
 
 
@@ -51,7 +51,7 @@ def get_board_list(api) -> list:
         # print(f'FrontPartList =>{FrontPartList}<=')
         max_no = int(front_part_list[0].rstrip(')'))
 
-    if api.config.log_level == LogLevel.INFO:
+    if api.config.log_level == log.INFO:
         pb = progressbar.ProgressBar(
             max_value=max_no,
             redirect_stdout=True)
@@ -101,14 +101,14 @@ def get_board_list(api) -> list:
 
             board_list.append(board_name)
 
-            if api.config.log_level == LogLevel.INFO:
+            if api.config.log_level == log.INFO:
                 pb.update(no)
 
         if no >= max_no:
             break
         cmd = command.ctrl_f
 
-    if api.config.log_level == LogLevel.INFO:
+    if api.config.log_level == log.INFO:
         pb.finish()
 
     return board_list

{PyPtt-1.1.2.dev95668 → PyPtt-1.2.1}/PyPtt/_api_get_bottom_post_list.py

@@ -1,12 +1,11 @@
-from SingleLog import DefaultLogger
-from SingleLog import LogLevel
-
 from . import _api_util
 from . import check_value
 from . import command
 from . import connect_core
+from . import data_type
 from . import exceptions
 from . import i18n
+from . import log
 from . import screens
 
 
@@ -17,19 +16,20 @@ def get_bottom_post_list(api, board):
         raise exceptions.RequireLogin(i18n.require_login)
 
     check_value.check_type(board, str, 'board')
+
+    log.logger.info(i18n.catch_bottom_post)
+
     _api_util.check_board(api, board)
 
     _api_util.goto_board(api, board, end=True)
 
-    logger = DefaultLogger('get_bottom_post_list')
-
     last_screen = api.connect_core.get_screen_queue()[-1]
 
     bottom_screen = [line for line in last_screen.split('\n') if '★' in line[:8]]
     bottom_length = len(bottom_screen)
 
     if bottom_length == 0:
-        logger.info(i18n.catch_bottom_post_success)
+        log.logger.info(i18n.catch_bottom_post_success)
         return list()
 
     cmd_list = []
@@ -37,8 +37,10 @@ def get_bottom_post_list(api, board):
     cmd = ''.join(cmd_list)
 
     target_list = [
-        connect_core.TargetUnit(screens.Target.QueryPost, log_level=LogLevel.DEBUG, break_detect=True, refresh=False),
-        connect_core.TargetUnit(screens.Target.InBoard, log_level=LogLevel.DEBUG, break_detect=True),
+        connect_core.TargetUnit(
+            screens.Target.PTT1_QueryPost if api.config.host == data_type.HOST.PTT1 else screens.Target.PTT2_QueryPost,
+            log_level=log.DEBUG, break_detect=True, refresh=False),
+        connect_core.TargetUnit(screens.Target.InBoard, log_level=log.DEBUG, break_detect=True),
         connect_core.TargetUnit(screens.Target.MainMenu_Exiting, exceptions_=exceptions.NoSuchBoard(api.config, board)),
     ]
 
@@ -68,6 +70,6 @@ def get_bottom_post_list(api, board):
         current_post = api.get_post(board=board, aid=post_aid, query=True)
         result.append(current_post)
 
-    logger.info(i18n.catch_bottom_post_success)
+    log.logger.info(i18n.catch_bottom_post, '...', i18n.success)
 
     return list(reversed(result))