PyPtt 2.1.5__tar.gz → 2.1.6__tar.gz

{pyptt-2.1.5 → pyptt-2.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.1.5
+Version: 2.1.6
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)

{pyptt-2.1.5 → pyptt-2.1.6}/PyPtt/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.1.5'
+__version__ = '2.1.6'
 __author__ = 'CodingMan'
 __email__ = 'pttcodingman@gmail.com'
 

{pyptt-2.1.5 → pyptt-2.1.6}/PyPtt/_api_get_newest_index.py

@@ -65,6 +65,7 @@ def get_newest_index(api, index_type: data_type.NewIndex, board: Optional[str] =
         search_list = []
     else:
         check_value.check_type(search_list, list, 'search_list')
+        search_list = list(search_list)  # 別就地改到呼叫端傳進來的 list
 
     if (search_type, search_condition) != (None, None):
         search_list.insert(0, (search_type, search_condition))

{pyptt-2.1.5 → pyptt-2.1.6}/PyPtt/_api_get_post.py

@@ -39,6 +39,7 @@ def get_post(api, board: str, aid: Optional[str] = None, index: Optional[int] =
         search_list = []
     else:
         check_value.check_type(search_list, list, 'search_list')
+        search_list = list(search_list)  # 別就地改到呼叫端傳進來的 list
 
     if (search_type, search_condition) != (None, None):
         search_list.insert(0, (search_type, search_condition))

{pyptt-2.1.5 → pyptt-2.1.6}/PyPtt/_api_mail.py

@@ -146,6 +146,21 @@ def get_mail(api, index: int, search_type: Optional[data_type.SearchType] = None
     cmd_list.append(command.ctrl_z)
     cmd_list.append('m')
 
+    # search_type/search_condition 併入 search_list（比照 get_post），
+    # 否則單獨使用 search_type 搜尋會被忽略。
+    if search_list is None:
+        search_list = []
+    else:
+        check_value.check_type(search_list, list, 'search_list')
+        search_list = list(search_list)  # 別就地改到呼叫端傳進來的 list
+
+    if (search_type, search_condition) != (None, None):
+        search_list.insert(0, (search_type, search_condition))
+
+    for search_type, search_condition in search_list:
+        check_value.check_type(search_type, data_type.SearchType, 'search_type')
+        check_value.check_type(search_condition, str, 'search_condition')
+
     # 處理條件整理出指令
     _cmd_list = _api_util.get_search_condition_cmd(data_type.NewIndex.MAIL, search_list)
 

pyptt-2.1.6/PyPtt/ssl_config.py

@@ -0,0 +1,24 @@
+key = """-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIFGaW2sWvlg2R4UP5e4CNg4hpmJ2+AH1p+ZDaE2L4ZfzoAoGCCqGSM49
+AwEHoUQDQgAEMNlx7QJJjC6RbB9mPHUMmGK0uwUaTJ53DMzaFb4/DD1dhYpOvKcu
+qZaNpQbvNCaBN5Zz+uJm78zyJXxXl6uTgw==
+-----END EC PRIVATE KEY-----
+"""
+
+cert = """-----BEGIN CERTIFICATE-----
+MIIB6TCCAY8CFAKFPO04kcFNRJPUCM1H8KteAaEwMAoGCCqGSM49BAMCMHcxCzAJ
+BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
+CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
+EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNjA3MTgwMjMyMjdaFw0zNjA3MTUwMjMy
+MjdaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
+eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
+bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABDDZce0CSYwukWwfZjx1DJhitLsFGkyedwzM2hW+Pww9XYWKTrynLqmW
+jaUG7zQmgTeWc/riZu/M8iV8V5erk4MwCgYIKoZIzj0EAwIDSAAwRQIgMOY/7UHn
+waVAljYZrhuUwCQxcibRzy006NsenvmTLLwCIQDuQAAsbdtAfswclkrDHBtoCeCl
+VphR8OhIzsjJE7SKjA==
+-----END CERTIFICATE-----
+"""

{pyptt-2.1.5 → pyptt-2.1.6}/PyPtt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.1.5
+Version: 2.1.6
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)

{pyptt-2.1.5 → pyptt-2.1.6}/tests/test_get_mail.py

@@ -1,6 +1,8 @@
 import PyPtt
 import pytest
 
+from PyPtt import _api_mail, _api_util, data_type
+
 
 def _handle_empty_mailbox(ptt_bot):
     """On LOCALHOST, scripts/bootstrap_local_pttbbs.py always sends each bot a
@@ -14,6 +16,52 @@ def _handle_empty_mailbox(ptt_bot):
                     "so this indicates a real regression, not an environment quirk.")
 
 
+def test_get_mail_search_type_is_honored(monkeypatch):
+    """Regression: get_mail must merge search_type/search_condition into the
+    mail search command, the same way get_newest_index does. They were
+    previously ignored, so `get_mail(index, search_type=AUTHOR, ...)` returned
+    the unfiltered mail at that index instead of the author-filtered one.
+
+    Offline unit test: captures the search_list handed to the command builder
+    and stops before any PTT navigation. (log/i18n are initialised by the
+    autouse ptt_bots fixture, which constructs PyPtt.API before this runs.)"""
+
+    class _StopBeforeNetwork(Exception):
+        pass
+
+    captured = {}
+
+    def fake_cmd(index_type, search_list):
+        captured["search_list"] = search_list
+        raise _StopBeforeNetwork
+
+    monkeypatch.setattr(_api_util, "one_thread", lambda api: None)
+    monkeypatch.setattr(_api_util, "get_search_condition_cmd", fake_cmd)
+
+    class _FakeAPI:
+        _is_login = True
+        is_registered_user = True
+
+        def get_newest_index(self, *a, **k):
+            return 999
+
+    # search_type/search_condition alone (no search_list) must reach the builder.
+    # Both the enum and its string name are accepted (SearchType._MagicMeta lets
+    # isinstance('AUTHOR', SearchType) pass), matching get_post's validation loop.
+    for st in ("AUTHOR", data_type.SearchType.AUTHOR):
+        captured.clear()
+        with pytest.raises(_StopBeforeNetwork):
+            _api_mail.get_mail(_FakeAPI(), index=3, search_type=st,
+                               search_condition="someone")
+        assert captured["search_list"] == [(st, "someone")]
+
+    # no search -> no filter (unchanged behaviour)
+    captured.clear()
+    with pytest.raises(_StopBeforeNetwork):
+        _api_mail.get_mail(_FakeAPI(), index=1)
+    assert captured["search_list"] == []
+
+
 def test_get_newest_mail(ptt_bots):
     """Tests getting the newest mail from the mailbox."""
     verified = False

pyptt-2.1.5/PyPtt/ssl_config.py

@@ -1,24 +0,0 @@
-key = """-----BEGIN EC PARAMETERS-----
-BggqhkjOPQMBBw==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIF0fyzVzlWVfbwf0IkWdOi1DD6g4dl2Wf2MSaPKS2pRtoAoGCCqGSM49
-AwEHoUQDQgAEvsTkmHxvh9EMh+1wFd+Z8bN0bLOWisGv3uNP0qeV0jy88cmPTWRl
-OzU8emmKTJZpuoOEGqi/Ow4vo+WTxMPynQ==
------END EC PRIVATE KEY-----
-"""
-
-cert = """-----BEGIN CERTIFICATE-----
-MIIB6TCCAY8CFGi0fucoS9ysCrt9pKAu9BgMAULWMAoGCCqGSM49BAMCMHcxCzAJ
-BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
-CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
-EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNjA3MTgwMTIwNTlaFw0zNjA3MTUwMTIw
-NTlaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
-eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
-bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABL7E5Jh8b4fRDIftcBXfmfGzdGyzlorBr97jT9KnldI8vPHJj01kZTs1
-PHppikyWabqDhBqovzsOL6Plk8TD8p0wCgYIKoZIzj0EAwIDSAAwRQIgYTfmCpJN
-abcPTvASZb/a7vanhO1vpafJ6Hlff6pAxh0CIQCl/Vvrx6DV21rUC3rkHBOFeqev
-I9Izuv9PxfLpnxoFcw==
------END CERTIFICATE-----
-"""