PyPtt 1.2.13.dev90917__tar.gz → 1.2.15__tar.gz

{pyptt-1.2.13.dev90917 → pyptt-1.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPtt
-Version: 1.2.13.dev90917
+Version: 1.2.15
 Summary: PyPtt
 Home-page: https://pyptt.cc/
 Author: CodingMan
@@ -61,7 +61,7 @@ pip install PyPtt
 #### 你可以在 Telegram 上找到 PyPtt 社群 [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/PyPtt)
 
 ## 贊助
-#### 如果這個專案對你有幫助，贊助我一杯咖啡吧!!
+#### issue 解太慢嗎？幫我增加一點動力吧！
 ####
 #### [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](http://paypal.me/CodingMan)
 

{pyptt-1.2.13.dev90917 → pyptt-1.2.15}/PyPtt/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '1.2.13.dev90917'
+__version__ = '1.2.15'
 
 from .PTT import API
 from .data_type import *

{pyptt-1.2.13.dev90917 → pyptt-1.2.15}/PyPtt/_api_comment.py

@@ -174,26 +174,31 @@ def comment(api, board: str, push_type: data_type.CommentType, push_content: str
             max_push_length = 58 - len(api.ptt_id)
 
     push_content = push_content.strip()
-
     push_list = []
+    
     while push_content:
-        index = 0
-        jump = 0
-
-        while len(push_content[:index].encode('big5uao', 'replace')) < max_push_length:
-
-            if index == len(push_content):
-                break
-            if push_content[index] == '\n':
-                jump = 1
+        # 先找出符合長度限制的最大子字串
+        test_content = push_content
+        while test_content:
+            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:
+            # 如果有換行，就切到換行為止
+            push_list.append(push_content[:newline_pos])
+            push_content = push_content[newline_pos + 1:]
+        else:
+            # 沒有換行就用符合長度的最大子字串
+            if not test_content:
+                # 保險起見，避免無限迴圈
+                test_content = push_content[:1]
+            push_list.append(test_content)
+            push_content = push_content[len(test_content):]
 
-            index += 1
-
-        push_list.append(push_content[:index])
-        push_content = push_content[index + jump:]
-
-    push_list = filter(None, push_list)
+    push_list = list(filter(None, push_list))
 
     for comment in push_list:
 
@@ -208,4 +213,4 @@ def comment(api, board: str, push_type: data_type.CommentType, push_content: str
                 log.logger.info(i18n.wait_for_no_fast_comment)
                 time.sleep(5.2)
 
-        log.logger.info(i18n.comment, '...', i18n.success)
+        log.logger.info(f"{i18n.comment}...{i18n.success}")

{pyptt-1.2.13.dev90917 → pyptt-1.2.15}/PyPtt/_api_get_post.py

@@ -50,10 +50,14 @@ def get_post(api, board: str, aid: Optional[str] = None, index: Optional[int] =
     if len(board) == 0:
         raise ValueError(f'board error parameter: {board}')
 
-    if index is not None and isinstance(aid, str):
+    if index > 0 and aid is not None:
         raise ValueError('wrong parameter index and aid can\'t both input')
 
-    if index is None and aid is None:
+    if aid is not None:
+        pass
+    elif index > 0:
+        pass
+    else:
         raise ValueError('wrong parameter index or aid must input')
 
     search_cmd = None
@@ -63,7 +67,7 @@ def get_post(api, board: str, aid: Optional[str] = None, index: Optional[int] =
     else:
         current_index = api.get_newest_index(data_type.NewIndex.BOARD, board=board)
 
-    if index is not None:
+    if index is not None and index > 0:
         check_value.check_index('index', index, current_index)
 
     max_retry = 2

{pyptt-1.2.13.dev90917 → pyptt-1.2.15}/PyPtt/_api_loginout.py

@@ -45,7 +45,7 @@ def logout(api) -> None:
     log.logger.info(i18n.logout, '...', i18n.success)
 
 
-def login(api, ptt_id: str, ptt_pw: str, kick_other_session: bool):
+def login(api, ptt_id: str, ptt_pw: str, kick_other_session: bool) -> None:
     _api_util.one_thread(api)
 
     check_value.check_type(ptt_id, str, 'ptt_id')
@@ -57,34 +57,17 @@ def login(api, ptt_id: str, ptt_pw: str, kick_other_session: bool):
 
     api.config.kick_other_session = kick_other_session
 
-    def kick_other_login_display_msg():
-        if api.config.kick_other_session:
-            return i18n.kick_other_login
-        return i18n.not_kick_other_login
-
     def kick_other_login_response(screen):
-        if api.config.kick_other_session:
-            return 'y' + command.enter
-        return 'n' + command.enter
+        return ('y' if api.config.kick_other_session else 'n') + command.enter
 
     api.is_mailbox_full = False
 
-    # def is_mailbox_full():
-    #     log.log(
-    #         api.config,
-    #         LogLevel.INFO,
-    #         i18n.MailBoxFull)
-    #     api.is_mailbox_full = True
-
     def register_processing(screen):
         pattern = re.compile(r'[\d]+')
         api.process_picks = int(pattern.search(screen).group(0))
-
-    if len(ptt_pw) > 8:
-        ptt_pw = ptt_pw[:8]
-
-    ptt_id = ptt_id.strip()
-    ptt_pw = ptt_pw.strip()
+        
+    ptt_id = ptt_id[:12].strip()
+    ptt_pw = ptt_pw[:8].strip()
 
     api.ptt_id = ptt_id
     api._ptt_pw = ptt_pw
@@ -108,11 +91,7 @@ def login(api, ptt_id: str, ptt_pw: str, kick_other_session: bool):
         connect_core.TargetUnit('有一篇文章尚未完成', response='Q' + command.enter),
         connect_core.TargetUnit(
             '請重新設定您的聯絡信箱', break_detect=True, exceptions_=exceptions.ResetYourContactEmail()),
-        # connect_core.TargetUnit(
-        #     i18n.in_login_process_please_wait,
-        #     '登入中，請稍候'),
         connect_core.TargetUnit('密碼正確'),
-        # 密碼正確
         connect_core.TargetUnit('您想刪除其他重複登入的連線嗎', response=kick_other_login_response),
         connect_core.TargetUnit('◆ 您的註冊申請單尚在處理中', response=command.enter, handler=register_processing),
         connect_core.TargetUnit('任意鍵', response=' '),
@@ -162,7 +141,6 @@ def login(api, ptt_id: str, ptt_pw: str, kick_other_session: bool):
 
         if current_capacity > max_capacity:
             api.is_mailbox_full = True
-
             log.logger.info(i18n.mail_box_full)
 
         if api.is_mailbox_full:
@@ -182,12 +160,7 @@ def login(api, ptt_id: str, ptt_pw: str, kick_other_session: bool):
 
     ori_screen = api.connect_core.get_screen_queue()[-1]
 
-    is_login = True
-
-    for t in screens.Target.MainMenu:
-        if t not in ori_screen:
-            is_login = False
-            break
+    is_login = all(t in ori_screen for t in screens.Target.MainMenu)
 
     if not is_login:
         raise exceptions.LoginError()

pyptt-1.2.15/PyPtt/ssl_config.py

@@ -0,0 +1,24 @@
+key = """-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIOyDTLND3RsmE5QK1ZLy4X0J11ANZL2kg7vCAhbUu+jfoAoGCCqGSM49
+AwEHoUQDQgAE7G3geMo6gWleTxHcT6YM53cUZOBhvZnNjqa8ryFY/72JDE8iwDyg
+dE2GV/m+7v/ZqSrGWaCJvqGIHviz8vqFew==
+-----END EC PRIVATE KEY-----
+"""
+
+cert = """-----BEGIN CERTIFICATE-----
+MIIB6TCCAY8CFApGApebO1nE8H1SGJZqLo92zC75MAoGCCqGSM49BAMCMHcxCzAJ
+BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
+CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
+EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNDEyMjQwOTM4NThaFw0zNDEyMjIwOTM4
+NThaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
+eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
+bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABOxt4HjKOoFpXk8R3E+mDOd3FGTgYb2ZzY6mvK8hWP+9iQxPIsA8oHRN
+hlf5vu7/2akqxlmgib6hiB74s/L6hXswCgYIKoZIzj0EAwIDSAAwRQIhALv/VqZ7
+brO5uTieVKL/HX1G1m41DHNQj/jvLUtGXVQsAiBYzqP95jiNt7Bc0NgzaqFns2xG
+Dt2SjgFsmmChyXLyuA==
+-----END CERTIFICATE-----
+"""

{pyptt-1.2.13.dev90917 → pyptt-1.2.15}/PyPtt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPtt
-Version: 1.2.13.dev90917
+Version: 1.2.15
 Summary: PyPtt
 Home-page: https://pyptt.cc/
 Author: CodingMan
@@ -61,7 +61,7 @@ pip install PyPtt
 #### 你可以在 Telegram 上找到 PyPtt 社群 [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/PyPtt)
 
 ## 贊助
-#### 如果這個專案對你有幫助，贊助我一杯咖啡吧!!
+#### issue 解太慢嗎？幫我增加一點動力吧！
 ####
 #### [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](http://paypal.me/CodingMan)
 

{pyptt-1.2.13.dev90917 → pyptt-1.2.15}/README.md

@@ -28,10 +28,10 @@ pip install PyPtt
 #### 你可以在 Telegram 上找到 PyPtt 社群 [![chatroom icon](https://patrolavia.github.io/telegram-badge/chat.png)](https://t.me/PyPtt)
 
 ## 贊助
-#### 如果這個專案對你有幫助，贊助我一杯咖啡吧!!
+#### issue 解太慢嗎？幫我增加一點動力吧！
 ####
 #### [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](http://paypal.me/CodingMan)
 
 ## 贊助清單
 
-#### leftc
+#### leftc

{pyptt-1.2.13.dev90917 → pyptt-1.2.15}/setup.py

@@ -7,7 +7,9 @@ from setuptools import setup
 
 def version_automation_script():
     is_merged = os.environ.get('GITHUB_EVENT_NAME') == 'pull_request'
+    branch = os.environ.get('GITHUB_REF_NAME')
     print('is_merged:', is_merged)
+    print('branch:', branch)
 
     # read the main version from __init__.py
     with open('PyPtt/__init__.py', 'r', encoding='utf-8') as f:
@@ -37,7 +39,7 @@ def version_automation_script():
     if version is None or pypi_version is None:
         raise ValueError('Can not get version from pypi')
 
-    if not is_merged:
+    if 'master' not in branch:
         commit_file = '/tmp/commit_hash.txt'
         if os.path.exists(commit_file):
             with open(commit_file, 'r', encoding='utf-8') as f:

pyptt-1.2.13.dev90917/PyPtt/ssl_config.py

@@ -1,24 +0,0 @@
-key = """-----BEGIN EC PARAMETERS-----
-BggqhkjOPQMBBw==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIHit9XnExnupbNahUy2w9r8KAfoW7VPHxnuutRLSWzUvoAoGCCqGSM49
-AwEHoUQDQgAE0Sk6fmqeDy5x8q3D9+ziWwZon/pQoL5z3H6NzwZr4g7Q5MdBYsIp
-/D/4EQit0oAImedt20nNs5V7yg7bMNpnNQ==
------END EC PRIVATE KEY-----
-"""
-
-cert = """-----BEGIN CERTIFICATE-----
-MIIB6DCCAY8CFBldwwA6lE9CoSWVmt8Z5h9I3F0mMAoGCCqGSM49BAMCMHcxCzAJ
-BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
-CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
-EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNDA5MDkwMjUyMDdaFw0zNDA5MDcwMjUy
-MDdaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
-eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
-bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABNEpOn5qng8ucfKtw/fs4lsGaJ/6UKC+c9x+jc8Ga+IO0OTHQWLCKfw/
-+BEIrdKACJnnbdtJzbOVe8oO2zDaZzUwCgYIKoZIzj0EAwIDRwAwRAIgUUkdxyJ3
-bycxT//S4wWMB16suAlzL0io+f01B0In5XoCID+JAIvxU+CT2nfpaL43KMYTr7C5
-aTq2gJjVhDAxA1i6
------END CERTIFICATE-----
-"""