reywechat 1.0.30__py3-none-any.whl → 1.0.32__py3-none-any.whl

reywechat/rclient.py

@@ -211,7 +211,7 @@ class WeChatClient(BaseWeChat):
         Inject DLL file of start API into the WeChat client process.
         """
 
-        # Get parameter.
+        # Handle parameter.
         dll_file_relpath = './data/client_api.dll'
         dll_file_path = find_relpath(__file__, dll_file_relpath)
 
@@ -250,10 +250,9 @@ class WeChatClient(BaseWeChat):
         Client response content dictionary.
         """
 
-        # Get parameter.
+        # Handle parameter.
         url = f'http://127.0.0.1:{self.client_api_port}/api/{api}'
-        if data is None:
-            data = {}
+        data = data or {}
         if type(success_code) == int:
             success_code = [success_code]
         if type(fail_code) == int:
@@ -299,7 +298,7 @@ class WeChatClient(BaseWeChat):
         Check result.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'checkLogin'
 
         # Request.
@@ -352,7 +351,7 @@ class WeChatClient(BaseWeChat):
             - `Key 'decrypt_key'`: WeChatDatabase decrypt key.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'userInfo'
 
         # Request.
@@ -402,7 +401,7 @@ class WeChatClient(BaseWeChat):
         timeout : Request timeout seconds.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'hookSyncMsg'
         port = str(port)
         timeout_ms_str = str(int(timeout * 1000))
@@ -440,7 +439,7 @@ class WeChatClient(BaseWeChat):
         Unhook the message.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'unhookSyncMsg'
 
         # Request.
@@ -462,7 +461,7 @@ class WeChatClient(BaseWeChat):
         id\\_ : Message ID.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'downloadAttach'
         data = {'msgId': id_}
 
@@ -484,7 +483,7 @@ class WeChatClient(BaseWeChat):
         dir\\_ : Save directory.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'getVoiceByMsgId'
         dir_ = os_abspath(dir_)
         data = {
@@ -517,7 +516,7 @@ class WeChatClient(BaseWeChat):
             - `Key 'name'`: User nickname or chat room name.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'getContactList'
         filter_names = {
             'filehelper': '朋友推荐消息',
@@ -586,7 +585,7 @@ class WeChatClient(BaseWeChat):
         User nickname or chat room name.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'getContactProfile'
         data = {'wxid': id_}
 
@@ -619,7 +618,7 @@ class WeChatClient(BaseWeChat):
         List of chat room member user ID.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'getMemberFromChatRoom'
         data = {'chatRoomId': room_id}
 
@@ -679,7 +678,7 @@ class WeChatClient(BaseWeChat):
         text : Message text.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'sendTextMsg'
         data = {
             'wxid': receive_id,
@@ -709,7 +708,7 @@ class WeChatClient(BaseWeChat):
         text : Message text.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'sendAtText'
         if type(user_id) != str:
             user_id = ','.join(user_id)
@@ -737,7 +736,7 @@ class WeChatClient(BaseWeChat):
         path : Message file path.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'sendFileMsg'
         data = {
             'wxid': receive_id,
@@ -762,7 +761,7 @@ class WeChatClient(BaseWeChat):
         path : Message image file path.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'sendImagesMsg'
         data = {
             'wxid': receive_id,
@@ -787,7 +786,7 @@ class WeChatClient(BaseWeChat):
         path : Message emotion file path.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'sendCustomEmotion'
         data = {
             'wxid': receive_id,
@@ -812,7 +811,7 @@ class WeChatClient(BaseWeChat):
         user_id : User ID of pat.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'sendPatMsg'
         data = {
             'wxid': receive_id,
@@ -847,15 +846,11 @@ class WeChatClient(BaseWeChat):
         public_id : Control public account ID.
         """
 
-        # Get parameter.
-        if text is None:
-            text = ''
-        if image_url is None:
-            image_url = ''
-        if public_name is None:
-            public_name = ''
-        if public_id is None:
-            public_id = ''
+        # Handle parameter.
+        text = text or ''
+        image_url = image_url or ''
+        public_name = public_name or ''
+        public_id = public_id or ''
         api = 'forwardPublicMsg'
         data = {
             'wxid': receive_id,
@@ -885,7 +880,7 @@ class WeChatClient(BaseWeChat):
         message_id : Forward message ID.
         """
 
-        # Get parameter.
+        # Handle parameter.
         api = 'sendImagesMsg'
         data = {
             'wxid': receive_id,

reywechat/rdb.py

@@ -934,7 +934,7 @@ class WeChatDatabase(BaseWeChat):
             sendparam : `WeChatSendParameter` instance.
             """
 
-            # Get parameter.
+            # Handle parameter.
             if sendparam.exc_reports == []:
                 status = 2
             else:
@@ -1001,7 +1001,7 @@ class WeChatDatabase(BaseWeChat):
             Read record from table `message_send`, put send queue.
             """
 
-            # Get parameter.
+            # Handle parameter.
             conn = self.rdatabase_wechat.connect()
 
             # Read.
@@ -1220,7 +1220,7 @@ class WeChatDatabase(BaseWeChat):
         params : Send parameters.
         """
 
-        # Get parameter.
+        # Handle parameter.
         data = {
             'status': 0,
             'type': send_type,

reywechat/rlog.py

@@ -118,7 +118,7 @@ class WeChatLog(BaseWeChat):
         Result.
         """
 
-        # Get parameter.
+        # Handle parameter.
         result = self.rrlog.print_colour
 
         return result

reywechat/rreceive.py

@@ -20,7 +20,7 @@ from reykit.rbase import throw
 from reykit.rimage import decode_qrcode
 from reykit.rnet import listen_socket
 from reykit.ros import File, os_exists
-from reykit.rre import search, findall
+from reykit.rre import search, search_batch, findall
 from reykit.rtask import ThreadPool
 from reykit.rtime import sleep, wait
 from reykit.rwrap import wrap_thread, wrap_exc
@@ -134,6 +134,7 @@ class WeChatMessage(BaseWeChat):
         self._is_at: bool | None = None
         self._is_at_self: bool | None = None
         self._is_call: bool | None = None
+        self._call_text: str | None = None
         self._is_new_user: bool | None = None
         self._is_new_room: bool | None = None
         self._is_new_room_user: bool | None = None
@@ -165,7 +166,7 @@ class WeChatMessage(BaseWeChat):
         Parameters dictionary.
         """
 
-        # Get parameter.
+        # Handle parameter.
         params: MessageParameter = {
             'time': self.time,
             'id': self.id,
@@ -414,7 +415,7 @@ class WeChatMessage(BaseWeChat):
             text = self.data
         elif self.is_quote:
             text = self.quote_params['text']
-        pattern = r'@\w+\u2005'
+        pattern = r'@(\w+)\u2005'
         self._at_names = findall(pattern, text)
 
         return self._at_names
@@ -455,8 +456,7 @@ class WeChatMessage(BaseWeChat):
             return self._is_at_self
 
         # Judge.
-        pattern = '@%s\u2005' % self.receiver.wechat.client.login_info['name']
-        self._is_at_self = pattern in self.at_names
+        self._is_at_self = self.receiver.wechat.client.login_info['name'] in self.at_names
 
         return self._is_at_self
 
@@ -464,7 +464,7 @@ class WeChatMessage(BaseWeChat):
     @property
     def is_call(self) -> bool:
         """
-        Whether if is message of call self.
+        Whether if is message of call self name.
 
         Returns
         -------
@@ -475,39 +475,83 @@ class WeChatMessage(BaseWeChat):
         if self._is_call is not None:
             return self._is_call
 
+        # Text.
+        if self.type == 1:
+            text = self.data
+        elif self.is_quote:
+            text = self.quote_params['text']
+        else:
+            self._is_call = False
+            self._call_text = None
+            return self._is_call
+        text = text.strip()
+
+        ## At self.
+        at_self_keyword = '@%s\u2005' % self.receiver.wechat.client.login_info['name']
+        if at_self_keyword in text:
+            is_at_self = True
+            text = text.replace(at_self_keyword, '')
+        else:
+            is_at_self = False
+
+        ## Call self.
+        pattern = fr'^{self.receiver.call_name}[\s,，]*(.*)$'
+        result: str | None = search(pattern, text)
+        if result is not None:
+            is_call_name = True
+            text = result
+        else:
+            is_call_name = False
+
         # Judge.
-        is_call = False
         if (
 
             ## Private chat.
             self.room is None
 
             ## At self.
-            or self.is_at_self
+            or is_at_self
+
+            ## Call self.
+            or is_call_name
 
             ## Quote self.
             or self.is_quote_self
+
         ):
             is_call = True
-
-        ## Call name.
-        if self.type == 1:
-            text = self.data
-        elif self.is_quote:
-            text = self.quote_params['text']
+            call_text = text
         else:
-            self._is_call = False
-            return self._is_call
-        pattern = fr'^\s*{self.receiver.call_name}[\s,，]*(.*?)\s*$'
-        result: str | None = search(pattern, text)
-        if result is not None:
-            is_call = True
+            is_call = False
+            call_text = None
 
         self._is_call = is_call
+        self._call_text = call_text
 
         return self._is_call
 
 
+    @property
+    def call_text(self) -> str:
+        """
+        Message call text of call self name.
+
+        Returns
+        -------
+        Call text.
+        """
+
+        # Cache.
+        if self._call_text is not None:
+            return self._call_text
+
+        # Check.
+        if not self.is_call:
+            throw(AssertionError, self.is_call)
+
+        return self._call_text
+
+
     @property
     def is_new_user(self) -> bool:
         """
@@ -845,6 +889,50 @@ class WeChatMessage(BaseWeChat):
         return self._valid
 
 
+    @property
+    def check_call(self) -> None:
+        """
+        Check if is call self name, if not, throw exception `WeChatTriggerContinueExit`.
+        """
+
+        # Check.
+        if not self.is_call:
+            self.trigger_continue()
+
+
+    def check_search_text(self, *patterns: str, text: str | None = None) -> str | tuple[str | None, ...]:
+        """
+        Regular search text, return first successful match.
+        When no match, then throw exception `WeChatTriggerContinueExit`.
+
+        Parameters
+        ----------
+        pattern : Regular pattern, period match any character.
+        text : Match text.
+            - `None`: Use `self.data`.
+
+        Returns
+        -------
+        Matching result.
+            - When match to and not use `group`, then return `str`.
+            - When match to and use `group`, then return tuple with value `str` or `None`.
+                If tuple length is `1`, extract and return `str`.
+            - When no match, then return `None`.
+        """
+
+        # Handle parameter.
+        text = text or self.data
+
+        # Search.
+        result = search_batch(text, *patterns)
+
+        # Check.
+        if result is None:
+            self.trigger_continue
+
+        return result
+
+
     @overload
     def reply(
         self,
@@ -975,8 +1063,7 @@ class WechatReceiver(BaseWeChat):
         # Set attribute.
         self.wechat = wechat
         self.max_receiver = max_receiver
-        if call_name is None:
-            call_name = self.wechat.client.login_info['name']
+        call_name = call_name or self.wechat.client.login_info['name']
         self.call_name = call_name
         self.queue: Queue[WeChatMessage] = Queue()
         self.handlers: list[Callable[[WeChatMessage], Any]] = []
@@ -1258,8 +1345,7 @@ class WechatReceiver(BaseWeChat):
 
             ## Cache.
             download_file = File(download_path)
-            if file_name is None:
-                file_name = f'{download_file.md5}.{file_name_suffix}'
+            file_name = file_name or f'{download_file.md5}.{file_name_suffix}'
             cache_path = self.wechat.cache.store(download_path, file_name, delete=True)
 
         # Set parameter.

reywechat/rschedule.py

@@ -63,7 +63,7 @@ class WeChatSchedule(BaseWeChat):
         trigger_kwargs : Trigger keyword arguments.
         """
 
-        # Get parameter.
+        # Handle parameter.
         args = (self,)
 
         # Add.

reywechat/rsend.py

@@ -389,7 +389,7 @@ class WeChatSender(BaseWeChat):
         Added text.
         """
 
-        # Get parameter.
+        # Handle parameter.
         member_dict = self.wechat.client.get_room_member_dict(room_id)
         login_id = self.wechat.client.login_info['id']
         if login_id in member_dict:

reywechat/rtrigger.py

@@ -135,7 +135,7 @@ class WeChatTrigger(BaseWeChat):
         is_reply : Whehter is reply function, allow call `WeChatMessage.reply`, can only reply once function.
         """
 
-        # Get parameter.
+        # Handle parameter.
         rule: TriggerRule = {
             'level': level,
             'execute': execute,

reywechat/rwechat.py

@@ -149,7 +149,7 @@ class WeChat(BaseWeChat):
         Result.
         """
 
-        # Get parameter.
+        # Handle parameter.
         result = self.log.rrlog.print_colour
 
         return result

{reywechat-1.0.30.dist-info → reywechat-1.0.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reywechat
-Version: 1.0.30
+Version: 1.0.32
 Summary: WeChat method set.
 Project-URL: homepage, https://github.com/reyxbo/reywechat/
 Author-email: Rey <reyxbo@163.com>

reywechat-1.0.32.dist-info/RECORD

@@ -0,0 +1,17 @@
+reywechat/__init__.py,sha256=BL4PUpTguszJ612qsZf4-sOXxRIsiYRQ_m__FGMd1RQ,513
+reywechat/rall.py,sha256=zEW-mLL2uP8aT2_foCMFGmMi_3RCrGl8qutnSVkmY1E,397
+reywechat/rbase.py,sha256=0NunIUIXra2ML2N6odwMk5oENTE0r6VSBHWXUvgI-lc,1124
+reywechat/rcache.py,sha256=Hh_HE-t_KUMlrz4gEFPh1AjmhnrSgH520IFJPumWb7A,908
+reywechat/rclient.py,sha256=MEvQB3pHb5ORukKbKntalRtFcKIOP9BGtDsMt5ihQfM,22524
+reywechat/rdb.py,sha256=euMCZBYz6b4Pw27zPUKYOwPHxK7g47pYfWFfNZMh0mU,40342
+reywechat/rlog.py,sha256=x4WFLNoeKqGjPVoI81ZZNEd9ctdYToSg5hEFuESmCQY,5254
+reywechat/rreceive.py,sha256=fcuCOehzKY3kNDZsUa4_wA4trwmIved-T09Q7z5EpNg,35175
+reywechat/rschedule.py,sha256=bZEEZV3K4zrJvupe1Eq6kGR7kunbVq5dfGnqFKYF3JI,1857
+reywechat/rsend.py,sha256=UmdKCOb1cPKEmBPHt9htjxB8fPyi5jW5pGwpRQIZdKA,13720
+reywechat/rtrigger.py,sha256=n8kUNovh62r7crlXrp33uaKvbILT-wcfvUqeyGt7YhM,4956
+reywechat/rwechat.py,sha256=d9yNnLLz0YI1buatf5j4YMhj6tUH6yWsDnx91EyAhow,4926
+reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
+reywechat-1.0.32.dist-info/METADATA,sha256=W0Z4P7Aq_AhtwznYsbnW_y-8XJuddfOEgFw-IkLBu5E,1551
+reywechat-1.0.32.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.32.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.32.dist-info/RECORD,,

reywechat-1.0.30.dist-info/RECORD

@@ -1,17 +0,0 @@
-reywechat/__init__.py,sha256=BL4PUpTguszJ612qsZf4-sOXxRIsiYRQ_m__FGMd1RQ,513
-reywechat/rall.py,sha256=zEW-mLL2uP8aT2_foCMFGmMi_3RCrGl8qutnSVkmY1E,397
-reywechat/rbase.py,sha256=0NunIUIXra2ML2N6odwMk5oENTE0r6VSBHWXUvgI-lc,1124
-reywechat/rcache.py,sha256=Hh_HE-t_KUMlrz4gEFPh1AjmhnrSgH520IFJPumWb7A,908
-reywechat/rclient.py,sha256=gtTYaoqhgh9kRFslETKjBJiAAdzJfeOxIJbdCkGAFhM,22577
-reywechat/rdb.py,sha256=Gcj3d-uIospaacjHY8B4HHdru5OwiS9PO6cceAWvXqY,40333
-reywechat/rlog.py,sha256=d3S0eHMUZ92OLE7fjP3zzikIYANtnbAxhnE_DIV_1OY,5251
-reywechat/rreceive.py,sha256=VgDMNc_Lrnnm-eYinK-aCt1qXK1bEuyGYePSGrZtObk,32892
-reywechat/rschedule.py,sha256=fn11rH0HqxbnJYxARCBBiSdzBpYfQFhcjNmkvihVMTc,1854
-reywechat/rsend.py,sha256=s2sR6l74reDShBAu_MwpavVunz0g42pIga0zX4ElIuI,13717
-reywechat/rtrigger.py,sha256=GHfkhNrS8rV4uXWC3N54UTjak7nKGfqJWX6pe57Hsgg,4953
-reywechat/rwechat.py,sha256=igeG0XhfBN1BRQ9RDmYrPZIKdnIK2tmS05wb-eMdlzs,4923
-reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.30.dist-info/METADATA,sha256=ajAREqSPl0WJjajG78Ogwz7dftRrwy1-BtQykfUMqLg,1551
-reywechat-1.0.30.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.30.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.30.dist-info/RECORD,,