reywechat 1.0.26__py3-none-any.whl → 1.0.27__py3-none-any.whl

reywechat/rdb.py

@@ -77,11 +77,11 @@ class WeChatDatabase(BaseWeChat):
         self.build()
 
         # Add handler.
-        self.__add_handler_to_contact_user()
-        self.__add_handler_to_contact_room()
-        self.__add_handler_to_contact_room_user()
-        self.__add_handler_to_message_receive()
-        self.__add_handler_update_send_status()
+        self.__add_receiver_handler_to_contact_user()
+        self.__add_receiver_handler_to_contact_room()
+        self.__add_receiver_handler_to_contact_room_user()
+        self.__add_receiver_handler_to_message_receive()
+        self.__add_sender_handler_update_send_status()
 
         # Loop.
         self.__start_from_message_send()
@@ -714,14 +714,14 @@ class WeChatDatabase(BaseWeChat):
         conn.close()
 
 
-    def __add_handler_to_contact_user(self) -> None:
+    def __add_receiver_handler_to_contact_user(self) -> None:
         """
-        Add handler, write record to table `contact_user`.
+        Add receiver handler, write record to table `contact_user`.
         """
 
 
         # Define.
-        def handler_to_contact_user(message: WeChatMessage) -> None:
+        def receiver_handler_to_contact_user(message: WeChatMessage) -> None:
             """
             Write record to table `contact_user`.
 
@@ -750,17 +750,17 @@ class WeChatDatabase(BaseWeChat):
 
 
         # Add handler.
-        self.wechat.receiver.add_handler(handler_to_contact_user)
+        self.wechat.receiver.add_handler(receiver_handler_to_contact_user)
 
 
-    def __add_handler_to_contact_room(self) -> None:
+    def __add_receiver_handler_to_contact_room(self) -> None:
         """
-        Add handler, write record to table `contact_room`.
+        Add receiver handler, write record to table `contact_room`.
         """
 
 
         # Define.
-        def handler_to_contact_room(message: WeChatMessage) -> None:
+        def receiver_handler_to_contact_room(message: WeChatMessage) -> None:
             """
             Write record to table `contact_room`.
 
@@ -834,17 +834,17 @@ class WeChatDatabase(BaseWeChat):
 
 
         # Add handler.
-        self.wechat.receiver.add_handler(handler_to_contact_room)
+        self.wechat.receiver.add_handler(receiver_handler_to_contact_room)
 
 
-    def __add_handler_to_contact_room_user(self) -> None:
+    def __add_receiver_handler_to_contact_room_user(self) -> None:
         """
-        Add handler, write record to table `contact_room_user`.
+        Add receiver handler, write record to table `contact_room_user`.
         """
 
 
         # Define.
-        def handler_to_contact_room_user(message: WeChatMessage) -> None:
+        def receiver_handler_to_contact_room_user(message: WeChatMessage) -> None:
             """
             Write record to table `contact_room_user`.
 
@@ -864,17 +864,17 @@ class WeChatDatabase(BaseWeChat):
 
 
         # Add handler.
-        self.wechat.receiver.add_handler(handler_to_contact_room_user)
+        self.wechat.receiver.add_handler(receiver_handler_to_contact_room_user)
 
 
-    def __add_handler_to_message_receive(self) -> None:
+    def __add_receiver_handler_to_message_receive(self) -> None:
         """
-        Add handler, write record to table `message_receive`.
+        Add receiver handler, write record to table `message_receive`.
         """
 
 
         # Define.
-        def handler_to_message_receive(message: WeChatMessage) -> None:
+        def receiver_handler_to_message_receive(message: WeChatMessage) -> None:
             """
             Write record to table `message_receive`.
 
@@ -915,17 +915,17 @@ class WeChatDatabase(BaseWeChat):
 
 
         # Add handler.
-        self.wechat.receiver.add_handler(handler_to_message_receive)
+        self.wechat.receiver.add_handler(receiver_handler_to_message_receive)
 
 
-    def __add_handler_update_send_status(self) -> None:
+    def __add_sender_handler_update_send_status(self) -> None:
         """
-        In the thread, loop read record from table `message_send`, put send queue.
+        Add sender handler, update field `status` of table `message_send`.
         """
 
 
         # Define.
-        def handler_update_send_status(sendparam: WeChatSendParameter) -> None:
+        def sender_handler_update_send_status(sendparam: WeChatSendParameter) -> None:
             """
             Update field `status` of table `message_send`.
 
@@ -953,7 +953,7 @@ class WeChatDatabase(BaseWeChat):
 
 
         # Add handler.
-        self.wechat.sender.add_handler(handler_update_send_status)
+        self.wechat.sender.add_handler(sender_handler_update_send_status)
 
 
     def __download_file(
@@ -1068,7 +1068,7 @@ class WeChatDatabase(BaseWeChat):
                     send_id,
                     **parameter
                 )
-                self.wechat.sender.__send(sendparam)
+                self.wechat.sender.queue.put(sendparam)
 
             # Commit.
             conn.commit()

reywechat/rreceive.py

@@ -12,6 +12,7 @@
 from __future__ import annotations
 from typing import Any, TypedDict, Literal, overload
 from collections.abc import Callable
+from os.path import join as os_join
 from queue import Queue
 from json import loads as json_loads
 from bs4 import BeautifulSoup as BSBeautifulSoup
@@ -1011,21 +1012,22 @@ class WechatReceiver(BaseWeChat):
 
             # Set parameter.
             handlers = [
-                self.__handler_room,
-                self.__handler_file,
+                self.__receiver_handler_room,
+                self.__receiver_handler_file,
                 *self.handlers
             ]
 
             # Handle.
 
             ## Define.
-            def handle_handler_exception() -> None:
+            def handle_handler_exception(exc_report, *_) -> None:
                 """
                 Handle Handler exception.
-                """
 
-                # Catch exception.
-                exc_report, *_ = catch_exc()
+                Parameters
+                ----------
+                exc_report : Exception report text.
+                """
 
                 # Save.
                 message.exc_reports.append(exc_report)
@@ -1080,7 +1082,7 @@ class WechatReceiver(BaseWeChat):
         self.handlers.append(handler)
 
 
-    def __handler_room(
+    def __receiver_handler_room(
         self,
         message: WeChatMessage
     ) -> None:
@@ -1105,7 +1107,7 @@ class WechatReceiver(BaseWeChat):
             message.user = None
 
 
-    def __handler_file(
+    def __receiver_handler_file(
         self,
         message: WeChatMessage
     ) -> None:
@@ -1120,7 +1122,6 @@ class WechatReceiver(BaseWeChat):
 
             ## Image.
             case 3:
-
                 ### Get attribute.
                 file_name = f'{message.id}.jpg'
                 pattern = r'length="(\d+)".*?md5="([\da-f]{32})"'
@@ -1228,19 +1229,16 @@ class WechatReceiver(BaseWeChat):
 
             ## Move.
             rfile = File(generate_path)
-            cache_path = None
             if file_md5 is None:
                 file_md5 = rfile.md5
-
-                ### Exist.
                 pattern = f'^{file_md5}$'
                 cache_path = folder.search(pattern)
-
             if cache_path is None:
+                cache_path = os_join(self.wechat.dir_cache, file_md5)
                 rfile.move(cache_path)
 
         # Set parameter.
-        file: MessageParameter = {
+        file: MessageParameterFile = {
             'path': cache_path,
             'name': file_name,
             'md5': file_md5,

reywechat/rsend.py

@@ -73,7 +73,7 @@ class WeChatSendParameter(BaseWeChat):
         sender: WeChatSender,
         send_type: Literal[WeChatSendEnum.SEND_TEXT],
         receive_id: str,
-        send_id: int | None = None,
+        send_id: int,
         *,
         text: str
     ) -> None: ...
@@ -84,7 +84,7 @@ class WeChatSendParameter(BaseWeChat):
         sender: WeChatSender,
         send_type: Literal[WeChatSendEnum.SEND_TEXT_AT],
         receive_id: str,
-        send_id: int | None = None,
+        send_id: int,
         *,
         user_id: str | list[str] | Literal['notify@all'],
         text: str
@@ -96,7 +96,7 @@ class WeChatSendParameter(BaseWeChat):
         sender: WeChatSender,
         send_type: Literal[WeChatSendEnum.SEND_FILE, WeChatSendEnum.SEND_IMAGE, WeChatSendEnum.SEND_EMOTION],
         receive_id: str,
-        send_id: int | None = None,
+        send_id: int,
         *,
         file_path: str,
         file_name: str
@@ -108,7 +108,7 @@ class WeChatSendParameter(BaseWeChat):
         sender: WeChatSender,
         send_type: Literal[WeChatSendEnum.SEND_PAT],
         receive_id: str,
-        send_id: int | None = None,
+        send_id: int,
         *,
         user_id: str
     ) -> None: ...
@@ -119,7 +119,7 @@ class WeChatSendParameter(BaseWeChat):
         sender: WeChatSender,
         send_type: Literal[WeChatSendEnum.SEND_PUBLIC],
         receive_id: str,
-        send_id: int | None = None,
+        send_id: int,
         *,
         page_url: str,
         title: str,
@@ -135,7 +135,7 @@ class WeChatSendParameter(BaseWeChat):
         sender: WeChatSender,
         send_type: Literal[WeChatSendEnum.SEND_FORWARD],
         receive_id: str,
-        send_id: int | None = None,
+        send_id: int,
         *,
         message_id: str
     ) -> None: ...
@@ -145,7 +145,7 @@ class WeChatSendParameter(BaseWeChat):
         sender: WeChatSender,
         send_type: WeChatSendEnum,
         receive_id: str,
-        send_id: int | None = None,
+        send_id: int,
         **params: Any
     ) -> None:
         """
@@ -175,6 +175,7 @@ class WeChatSendParameter(BaseWeChat):
         self.send_id = send_id
         self.params = params
         self.exc_reports: list[str] = []
+        self.sent: bool = False
 
 
 class WeChatSender(BaseWeChat):
@@ -200,7 +201,6 @@ class WeChatSender(BaseWeChat):
 
         # Set attribute.
         self.wechat = wechat
-        self.send = self.__call__ = self.wechat.database.send
         self.queue: Queue[WeChatSendParameter] = Queue()
         self.handlers: list[Callable[[WeChatSendParameter], Any]] = []
         self.started: bool | None = False
@@ -215,6 +215,21 @@ class WeChatSender(BaseWeChat):
         Start sender, that will sequentially send message in the send queue.
         """
 
+
+        # Define.
+        def handle_handler_exception(exc_report, *_) -> None:
+            """
+            Handle Handler exception.
+
+            Parameters
+            ----------
+            exc_report : Exception report text.
+            """
+
+            # Save.
+            sendparam.exc_reports.append(exc_report)
+
+
         # Loop.
         while True:
             match self.started:
@@ -228,8 +243,14 @@ class WeChatSender(BaseWeChat):
                 case None:
                     break
 
-            ## Send.
             sendparam = self.queue.get()
+
+            ## Handler.
+            for handler in self.handlers:
+                handler = wrap_exc(handler, handler=handle_handler_exception)
+                handler(sendparam)
+
+            ## Send.
             try:
                 self.__send(sendparam)
 
@@ -242,23 +263,9 @@ class WeChatSender(BaseWeChat):
                 # Save.
                 sendparam.exc_reports.append(exc_report)
 
+            sendparam.sent = True
 
-            ## Handle.
-
-            ### Define.
-            def handle_handler_exception() -> None:
-                """
-                Handle Handler exception.
-                """
-
-                # Catch exception.
-                exc_report, *_ = catch_exc()
-
-                # Save.
-                sendparam.exc_reports.append(exc_report)
-
-
-            ### Loop.
+            ## Handler.
             for handler in self.handlers:
                 handler = wrap_exc(handler, handler=handle_handler_exception)
                 handler(sendparam)
@@ -362,6 +369,7 @@ class WeChatSender(BaseWeChat):
             file_path is not None
             and file_name is not None
         ):
+            sleep(1)
             file = File(file_path_rename)
             file.rename(file_old_name)
 

reywechat/rtrigger.py

@@ -48,15 +48,15 @@ class WeChatTrigger(BaseWeChat):
         self.rules: list[TriggerRule] = []
 
         # Add handler.
-        self.handler = self.__add_handler_trigger_by_rule()
+        self.handler = self.__add_receiver_handler_trigger_by_rule()
 
         # Add trigger.
         self.__add_trigger_valid()
 
 
-    def __add_handler_trigger_by_rule(self) -> Callable[[WeChatMessage], None]:
+    def __add_receiver_handler_trigger_by_rule(self) -> Callable[[WeChatMessage], None]:
         """
-        Add handler, trigger message by rules.
+        Add receiver handler, trigger message by rules.
 
         Returns
         -------
@@ -65,7 +65,7 @@ class WeChatTrigger(BaseWeChat):
 
 
         # Define.
-        def handler_trigger_by_rule(message: WeChatMessage) -> None:
+        def receiver_handler_trigger_by_rule(message: WeChatMessage) -> None:
             """
             Trigger message by rules.
 
@@ -111,9 +111,9 @@ class WeChatTrigger(BaseWeChat):
 
 
         # Add handler.
-        self.receiver.add_handler(handler_trigger_by_rule)
+        self.receiver.add_handler(receiver_handler_trigger_by_rule)
 
-        return handler_trigger_by_rule
+        return receiver_handler_trigger_by_rule
 
 
     def add_rule(
@@ -199,4 +199,4 @@ class WeChatTrigger(BaseWeChat):
 
 
         # Add.
-        self.add_rule(trigger_valid, float('inf'))
+        self.add_rule(trigger_valid, float('inf'), False)

reywechat/rwechat.py

@@ -98,15 +98,18 @@ class WeChat(BaseWeChat):
         self.receive_start = self.receiver.start
         self.receive_stop = self.receiver.stop
 
+        ## Trigger.
+        self.trigger_add_rule = self.trigger.add_rule
+
         ## Send.
         self.send_add_handler = self.sender.add_handler
-        self.send = self.sender.send
+        self.send = self.database.send
         self.send_start = self.sender.start
         self.send_stop = self.sender.stop
         self.wrap_try_send = self.sender.wrap_try_send
 
-        ## Trigger.
-        self.trigger_add_rule = self.trigger.add_rule
+        ## Database.
+        self.send = self.database.send
 
         ## Schedule.
         self.schedule_add_task = self.schedule.add_task

{reywechat-1.0.26.dist-info → reywechat-1.0.27.dist-info}/METADATA

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

reywechat-1.0.27.dist-info/RECORD

@@ -0,0 +1,16 @@
+reywechat/__init__.py,sha256=CBcaezJsuYnBzunuzRoRwz-q_HDQq7XsGKtNxCWAQoY,488
+reywechat/rall.py,sha256=KAHdmzvrmDel_ttvZKR0tkfg21Amm3sKMvGJDkNA14U,374
+reywechat/rbase.py,sha256=0NunIUIXra2ML2N6odwMk5oENTE0r6VSBHWXUvgI-lc,1124
+reywechat/rclient.py,sha256=gtTYaoqhgh9kRFslETKjBJiAAdzJfeOxIJbdCkGAFhM,22577
+reywechat/rdb.py,sha256=JBrJw-Xev9BNogOg2G31-da80y7edpSjtAzFHZkDs3g,40313
+reywechat/rlog.py,sha256=rIl3fy1SFuAAiUnxVnOFJv-gK51AunDljJgsFUx6I50,4745
+reywechat/rreceive.py,sha256=pgo--mHTSpCtb_ScIreoiiWAtIVsqe2Tut88W7MrBc8,32403
+reywechat/rschedule.py,sha256=fn11rH0HqxbnJYxARCBBiSdzBpYfQFhcjNmkvihVMTc,1854
+reywechat/rsend.py,sha256=q1stNggg40WPqI5h8_coAXsbFRM6M6dxsDxq2-L3CJs,14286
+reywechat/rtrigger.py,sha256=GHfkhNrS8rV4uXWC3N54UTjak7nKGfqJWX6pe57Hsgg,4953
+reywechat/rwechat.py,sha256=Niu2TTyElpzXtb6fn-xzwa1QjkwrvLwFyP3U-2ALrl4,5595
+reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
+reywechat-1.0.27.dist-info/METADATA,sha256=Y9h0Dr56SY6w5krZ163ufW6FdT3-kgdUkOD5jw6O7JM,1551
+reywechat-1.0.27.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.27.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.27.dist-info/RECORD,,

reywechat-1.0.26.dist-info/RECORD

@@ -1,16 +0,0 @@
-reywechat/__init__.py,sha256=CBcaezJsuYnBzunuzRoRwz-q_HDQq7XsGKtNxCWAQoY,488
-reywechat/rall.py,sha256=KAHdmzvrmDel_ttvZKR0tkfg21Amm3sKMvGJDkNA14U,374
-reywechat/rbase.py,sha256=0NunIUIXra2ML2N6odwMk5oENTE0r6VSBHWXUvgI-lc,1124
-reywechat/rclient.py,sha256=gtTYaoqhgh9kRFslETKjBJiAAdzJfeOxIJbdCkGAFhM,22577
-reywechat/rdb.py,sha256=R1IFo5qeMAm2YYMpmp_HmChv6sNWyBhYco6aLpb2KJQ,40110
-reywechat/rlog.py,sha256=rIl3fy1SFuAAiUnxVnOFJv-gK51AunDljJgsFUx6I50,4745
-reywechat/rreceive.py,sha256=fOepHDQ0TSIGUE1LojOk8zvXEnDMtn-Tqx1v0nPxPvE,32279
-reywechat/rschedule.py,sha256=fn11rH0HqxbnJYxARCBBiSdzBpYfQFhcjNmkvihVMTc,1854
-reywechat/rsend.py,sha256=rzxFWTtivhLW-rejgJNJ-xxswLHiliEKpG10vXXJ5Rs,14193
-reywechat/rtrigger.py,sha256=dgoj0YLW9-jOpwC70L6-sNopqw_f0mNcKfgsBU9h2E0,4892
-reywechat/rwechat.py,sha256=btTwfVP0Ovo18D6XJGXKIKEOrdcIZiq8umWvgfqvr0s,5529
-reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.26.dist-info/METADATA,sha256=ijvubTWYfoiTkNDKNGw6Ttixn82pOn-DMc8ovJ-a1fI,1551
-reywechat-1.0.26.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.26.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.26.dist-info/RECORD,,