PyPtt 1.2.13.dev90917__tar.gz → 1.2.14__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPtt
-Version: 1.2.13.dev90917
+Version: 1.2.14
 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.14}/PyPtt/__init__.py

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

{pyptt-1.2.13.dev90917 → pyptt-1.2.14}/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.14/PyPtt/ssl_config.py

@@ -0,0 +1,24 @@
+key = """-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIHQKR027PpIL3jmuBY5pi1vyf2rPKrwD82nunY3W3TMmoAoGCCqGSM49
+AwEHoUQDQgAEfytUFoMyXqYe6oxI6aEnlC1Dus/7BwNUF+nIImcZfu4FsB5MABaY
+eAcizNFQoYjdraGBnzf5jTrq6e1RpPXp1w==
+-----END EC PRIVATE KEY-----
+"""
+
+cert = """-----BEGIN CERTIFICATE-----
+MIIB6jCCAY8CFCxDTDYHKrP92XJ2rvne0cPov0MwMAoGCCqGSM49BAMCMHcxCzAJ
+BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
+CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
+EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNDExMTgwNjMzMDBaFw0zNDExMTYwNjMz
+MDBaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
+eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
+bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABH8rVBaDMl6mHuqMSOmhJ5QtQ7rP+wcDVBfpyCJnGX7uBbAeTAAWmHgH
+IszRUKGI3a2hgZ83+Y066untUaT16dcwCgYIKoZIzj0EAwIDSQAwRgIhAJVuVStG
+fi//wdAZFxzyRDltvFzKRbaCevD+roKvQU1cAiEAldq+ezbZqZ+PTDnDfHhWVaat
+L3s8iEZU0khAttFpXVo=
+-----END CERTIFICATE-----
+"""

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPtt
-Version: 1.2.13.dev90917
+Version: 1.2.14
 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.14}/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.14}/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-----
-"""