PyPtt 1.2.18__tar.gz → 1.2.19__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 1.2.18
+Version: 1.2.19
 Summary: PyPtt
 Home-page: https://pyptt.cc/
 Author: CodingMan

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

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

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

@@ -130,7 +130,7 @@ def comment(api, board: str, push_type: data_type.CommentType, push_content: str
     check_value.check_type(board, str, 'board')
 
     if not isinstance(push_type, data_type.CommentType):
-        raise TypeError(f'CommentType must be data_type.CommentType')
+        raise TypeError('CommentType must be data_type.CommentType')
 
     check_value.check_type(push_content, str, 'push_content')
     if post_aid is not None:

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

@@ -129,7 +129,7 @@ def _get_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
     ]
 
     index = api.connect_core.send(cmd, target_list)
-    ori_screen = api.connect_core.get_screen_queue()[-1]
+    last_screen = api.connect_core.get_screen_queue()[-1]
 
     post = {
         PostField.board: None,
@@ -158,13 +158,13 @@ def _get_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
     if index < 0 or index == 1:
         # 文章被刪除
         log.logger.debug(i18n.post_deleted)
-        log.logger.debug('OriScreen', ori_screen)
+        log.logger.debug('OriScreen', last_screen)
 
-        cursor_line = [line for line in ori_screen.split(
+        cursor_line = [line for line in last_screen.split(
             '\n') if line.startswith(api.cursor)]
 
         if len(cursor_line) != 1:
-            raise exceptions.UnknownError(ori_screen)
+            raise exceptions.UnknownError(last_screen)
 
         cursor_line = cursor_line[0]
         log.logger.debug('CursorLine', cursor_line)
@@ -214,7 +214,7 @@ def _get_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
         lock_post, post_author, post_title, post_aid, post_web, post_money, list_date, push_number, post_index = \
             _api_util.parse_query_post(
                 api,
-                ori_screen)
+                last_screen)
 
         if lock_post:
             post.update({

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

@@ -21,7 +21,7 @@ def mark_post(api, mark_type: int, board: str, post_aid: str, post_index: int, s
         raise exceptions.UnregisteredUser(lib_util.get_current_func_name())
 
     if not isinstance(mark_type, data_type.MarkType):
-        raise TypeError(f'mark_type must be data_type.MarkType')
+        raise TypeError('mark_type must be data_type.MarkType')
 
     check_value.check_type(board, str, 'board')
     if post_aid is not None:
@@ -29,7 +29,7 @@ def mark_post(api, mark_type: int, board: str, post_aid: str, post_index: int, s
     check_value.check_type(post_index, int, 'PostIndex')
 
     if not isinstance(search_type, data_type.SearchType):
-        raise TypeError(f'search_type must be data_type.SearchType')
+        raise TypeError('search_type must be data_type.SearchType')
 
     if search_condition is not None:
         check_value.check_type(search_condition, str, 'SearchCondition')

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

@@ -17,7 +17,7 @@ def reply_post(api, reply_to: data_type.ReplyTo, board: str, content: str, sign_
         raise exceptions.RequireLogin(i18n.require_login)
 
     if not isinstance(reply_to, data_type.ReplyTo):
-        raise TypeError(f'ReplyTo must be data_type.ReplyTo')
+        raise TypeError('ReplyTo must be data_type.ReplyTo')
 
     check_value.check_type(board, str, 'board')
     check_value.check_type(content, str, 'content')

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

@@ -33,8 +33,7 @@ def get_content(api, post_mode: bool = True):
         connect_core.TargetUnit(screens.Target.InPost, log_level=log.DEBUG, break_detect=True),
         connect_core.TargetUnit(screens.Target.PostNoContent, log_level=log.DEBUG, break_detect=True),
         # 動畫文章
-        connect_core.TargetUnit(screens.Target.Animation, response=command.go_main_menu_type_q,
-                                break_detect_after_send=True),
+        connect_core.TargetUnit(screens.Target.Animation, response='n'),
     ]
 
     line_from_pattern = re.compile(r'[\d]+~[\d]+')
@@ -395,7 +394,7 @@ def goto_board(api, board: str, refresh: bool = False, end: bool = False) -> Non
     # 這裡可能因為發現第一次進入看板會有進版畫面，一般來說都可以在 target_list 找到對應的標的
     # 但某些看板會卡在進版動畫中，但沒有顯示任意鍵繼續或互動是動畫，所以當 index == -1 (表示找不到標的 timeout 了)
     # 可以嘗試修改 cmd_list
-    index = api.connect_core.send(cmd, target_list, refresh=current_refresh)
+    api.connect_core.send(cmd, target_list, refresh=current_refresh)
 
     if end:
         cmd_list = []

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

@@ -95,8 +95,13 @@ class TargetUnit:
                 if target == cursor:
                     if not any(line.startswith(target) for line in screen.split('\n')):
                         return False
-                elif target not in screen:
-                    return False
+                elif isinstance(target, str):
+                    if target not in screen:
+                        return False
+                elif isinstance(target, list):
+                    if not any(t in screen for t in target):
+                        return False
+
             self._current_match += 1
             return True
 
@@ -211,7 +216,7 @@ class API(object):
                 if self.config.connect_mode == data_type.ConnectMode.TELNET:
                     self._core = telnetlib.Telnet(telnet_host, self.config.port)
                 else:
-                    if not threading.current_thread() is threading.main_thread():
+                    if threading.current_thread() is not threading.main_thread():
                         loop = asyncio.new_event_loop()
                         asyncio.set_event_loop(loop)
 

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

@@ -23,7 +23,7 @@ class Target:
     PTT1_QueryPost = [
         '請按任意鍵繼續',
         '文章代碼(AID):',
-        '文章網址:'
+        ('文章網址:', '本看板目前不提供文章網址')
     ]
 
     PTT2_QueryPost = [

pyptt-1.2.19/PyPtt/ssl_config.py

@@ -0,0 +1,24 @@
+key = """-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIG4BOpPiAtfiRgc2DydA/wkdxOGaxwH+exd4MXa4Cja8oAoGCCqGSM49
+AwEHoUQDQgAEDS/OWw/BDHH2l2pZO6LPmWqNUKmuPNSJ7xbtVxsIpuJwNxntrch6
+qbU2VrVjYuzRAjQvjff9rgC9kJLGi+Z2OQ==
+-----END EC PRIVATE KEY-----
+"""
+
+cert = """-----BEGIN CERTIFICATE-----
+MIIB6DCCAY8CFAnIVb8H7lNPfebaSJJTQ0vn9OfhMAoGCCqGSM49BAMCMHcxCzAJ
+BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
+CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
+EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNTA3MTAwNjM3MDNaFw0zNTA3MDgwNjM3
+MDNaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
+eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
+bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABA0vzlsPwQxx9pdqWTuiz5lqjVCprjzUie8W7VcbCKbicDcZ7a3Ieqm1
+Nla1Y2Ls0QI0L433/a4AvZCSxovmdjkwCgYIKoZIzj0EAwIDRwAwRAIgWFa5O1DU
+knIrEdqRN1AoSccEbIVQM9q3W+IC0xFHeU8CIDOfBI4Tn40oE+85IslFMVLZaXGK
+eD4SF5N8kWIN6UxT
+-----END CERTIFICATE-----
+"""

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 1.2.18
+Version: 1.2.19
 Summary: PyPtt
 Home-page: https://pyptt.cc/
 Author: CodingMan

pyptt-1.2.18/PyPtt/ssl_config.py

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