reywechat 1.0.19__py3-none-any.whl → 1.0.21__py3-none-any.whl

reywechat/rdb.py

@@ -77,12 +77,12 @@ class WeChatDatabase(BaseWeChat):
         self.build()
 
         # Add handler.
-        self._to_contact_user()
-        self._to_contact_room()
-        self._to_contact_room_user()
-        self._to_message_receive()
-        self._to_message_send()
-        self._from_message_send_loop()
+        self.__to_contact_user()
+        self.__to_contact_room()
+        self.__to_contact_room_user()
+        self.__to_message_receive()
+        self.__to_message_send()
+        self.__from_message_send_loop()
 
 
     def build(self) -> None:
@@ -709,7 +709,7 @@ class WeChatDatabase(BaseWeChat):
         conn.close()
 
 
-    def _to_contact_user(self) -> None:
+    def __to_contact_user(self) -> None:
         """
         Add handler, write record to table `contact_user`.
         """
@@ -748,7 +748,7 @@ class WeChatDatabase(BaseWeChat):
         self.rwechat.receiver.add_handler(handler_to_contact_user)
 
 
-    def _to_contact_room(self) -> None:
+    def __to_contact_room(self) -> None:
         """
         Add handler, write record to table `contact_room`.
         """
@@ -832,7 +832,7 @@ class WeChatDatabase(BaseWeChat):
         self.rwechat.receiver.add_handler(handler_to_contact_room)
 
 
-    def _to_contact_room_user(self) -> None:
+    def __to_contact_room_user(self) -> None:
         """
         Add handler, write record to table `contact_room_user`.
         """
@@ -862,7 +862,7 @@ class WeChatDatabase(BaseWeChat):
         self.rwechat.receiver.add_handler(handler_to_contact_room_user)
 
 
-    def _to_message_receive(self) -> None:
+    def __to_message_receive(self) -> None:
         """
         Add handler, write record to table `message_receive`.
         """
@@ -913,7 +913,7 @@ class WeChatDatabase(BaseWeChat):
         self.rwechat.receiver.add_handler(handler_to_message_receive)
 
 
-    def _to_message_send(self) -> None:
+    def __to_message_send(self) -> None:
         """
         Add handler, write record to table `message_send`.
         """
@@ -975,7 +975,7 @@ class WeChatDatabase(BaseWeChat):
         self.rwechat.sender.add_handler(handler_to_message_send)
 
 
-    def _download_file(
+    def __download_file(
         self,
         file_id: int
     ) -> tuple[str, str]:
@@ -1017,7 +1017,7 @@ class WeChatDatabase(BaseWeChat):
         return save_path, file_name
 
 
-    def _from_message_send(self) -> None:
+    def __from_message_send(self) -> None:
         """
         Read record from table `message_send`, put send queue.
         """
@@ -1045,7 +1045,7 @@ class WeChatDatabase(BaseWeChat):
         # Convert.
         if result.empty:
             return
-        table = result.fetch_table()
+        table = result.to_table()
 
         # Update.
         send_ids = [
@@ -1071,7 +1071,7 @@ class WeChatDatabase(BaseWeChat):
             ## Save file.
             file_id = parameter.get('file_id')
             if file_id is not None:
-                file_path, file_name = self._download_file(file_id)
+                file_path, file_name = self.__download_file(file_id)
                 parameter['path'] = file_path
                 parameter['file_name'] = file_name
 
@@ -1087,7 +1087,7 @@ class WeChatDatabase(BaseWeChat):
 
 
     @wrap_thread
-    def _from_message_send_loop(self) -> None:
+    def __from_message_send_loop(self) -> None:
         """
         In the thread, loop read record from table `message_send`, put send queue.
         """
@@ -1132,7 +1132,7 @@ class WeChatDatabase(BaseWeChat):
         while True:
 
             # Put.
-            self._from_message_send()
+            self.__from_message_send()
 
             # Wait.
             sleep(1)

reywechat/rlog.py

@@ -50,10 +50,10 @@ class WeChatLog(BaseWeChat):
         self.rrlog_file = Log('WeChat.WeChatFile')
 
         # Add handler.
-        self._add_handler()
+        self.__add_handler()
 
 
-    def _add_handler(self) -> None:
+    def __add_handler(self) -> None:
         """
         Add log handler.
         """

reywechat/rreceive.py

@@ -856,8 +856,8 @@ class WechatReceiver(BaseWeChat):
         self.trigger = WeChatTrigger(self)
 
         # Start.
-        self._start_callback()
-        self._start_receiver(self.max_receiver)
+        self.__start_callback()
+        self.__start_receiver(self.max_receiver)
         self.rwechat.client.hook_message(
             '127.0.0.1',
             self.rwechat.client.message_callback_port,
@@ -866,7 +866,7 @@ class WechatReceiver(BaseWeChat):
 
 
     @wrap_thread
-    def _start_callback(self) -> None:
+    def __start_callback(self) -> None:
         """
         Start callback socket.
         """
@@ -914,7 +914,7 @@ class WechatReceiver(BaseWeChat):
 
 
     @wrap_thread
-    def _start_receiver(
+    def __start_receiver(
         self,
         max_receiver: int
     ) -> None:
@@ -939,8 +939,8 @@ class WechatReceiver(BaseWeChat):
 
             # Set parameter.
             handlers = [
-                self._handler_room,
-                self._handler_file,
+                self.__handler_room,
+                self.__handler_file,
                 *self.handlers
             ]
 
@@ -1011,7 +1011,7 @@ class WechatReceiver(BaseWeChat):
         self.handlers.append(handler)
 
 
-    def _handler_room(
+    def __handler_room(
         self,
         message: WeChatMessage
     ) -> None:
@@ -1036,7 +1036,7 @@ class WechatReceiver(BaseWeChat):
             message.user = None
 
 
-    def _handler_file(
+    def __handler_file(
         self,
         message: WeChatMessage
     ) -> None:

reywechat/rsend.py

@@ -67,6 +67,8 @@ class WeChatSendParameter(BaseWeChat):
     WeChat send parameters type.
     """
 
+    SendEnum = WeChatSendEnum
+
 
     def __init__(
         self,
@@ -115,7 +117,7 @@ class WeChatSender(BaseWeChat):
     WeChatSendEnum : Send type enumeration.
     """
 
-    WeChatSendEnum = WeChatSendEnum
+    SendEnum = WeChatSendEnum
 
 
     def __init__(
@@ -140,12 +142,12 @@ class WeChatSender(BaseWeChat):
         self.started: bool | None = False
 
         # Start.
-        self._delete_cache_file()
-        self._start_sender()
+        self.__delete_cache_file()
+        self.__start_sender()
 
 
     @wrap_thread
-    def _start_sender(self) -> None:
+    def __start_sender(self) -> None:
         """
         Start sender, that will sequentially send message in the send queue.
         """
@@ -166,7 +168,7 @@ class WeChatSender(BaseWeChat):
             ## Send.
             sendparam = self.queue.get()
             try:
-                self._send(sendparam)
+                self.__send(sendparam)
 
             ## Exception.
             except:
@@ -205,7 +207,7 @@ class WeChatSender(BaseWeChat):
             self.rwechat.log.log_send(sendparam)
 
 
-    def _delete_cache_file(self) -> None:
+    def __delete_cache_file(self) -> None:
         """
         Add handler, Delete cache file.
         """
@@ -234,7 +236,7 @@ class WeChatSender(BaseWeChat):
         self.add_handler(handler_delete_cache_file)
 
 
-    def _send(
+    def __send(
         self,
         sendparam: WeChatSendParameter
     ) -> None:
@@ -257,7 +259,7 @@ class WeChatSender(BaseWeChat):
 
         ## From file ID.
         if (file_id := sendparam.params.get('file_id')) is not None:
-            sendparam.params['path'], sendparam.params['file_name'] = self.rwechat.database._download_file(file_id)
+            sendparam.params['path'], sendparam.params['file_name'] = self.rwechat.database.__download_file(file_id)
 
         ## Set file name.
         if (
@@ -340,10 +342,10 @@ class WeChatSender(BaseWeChat):
                 throw(ValueError, sendparam.send_type)
 
         # Wait.
-        self._wait(sendparam)
+        self.__wait(sendparam)
 
 
-    def _wait(
+    def __wait(
         self,
         sendparam: WeChatSendParameter
     ) -> None:

reywechat/rtrigger.py

@@ -48,13 +48,13 @@ class WeChatTrigger(BaseWeChat):
         self.rules: list[TriggerRule] = []
 
         # Add handler.
-        self.handler = self._trigger_by_rule()
+        self.handler = self.__trigger_by_rule()
 
         # Add trigger.
-        self._add_trigger_valid()
+        self.__add_trigger_valid()
 
 
-    def _trigger_by_rule(self) -> Callable[[WeChatMessage], None]:
+    def __trigger_by_rule(self) -> Callable[[WeChatMessage], None]:
         """
         Add handler, trigger message by rules.
 
@@ -169,7 +169,7 @@ class WeChatTrigger(BaseWeChat):
         raise WeChatTriggerBreakExit
 
 
-    def _add_trigger_valid(self) -> None:
+    def __add_trigger_valid(self) -> None:
         """
         Add trigger, trigger rule judge valid.
 

reywechat/rwechat.py

@@ -76,7 +76,7 @@ class WeChat(BaseWeChat):
 
         # Create folder.
         project_dir = project_dir or os_getcwd()
-        self._create_folder(project_dir)
+        self.__create_folder(project_dir)
 
         # Set attribute.
 
@@ -118,7 +118,7 @@ class WeChat(BaseWeChat):
         self.schedule_resume = self.schedule.resume
 
 
-    def _create_folder(
+    def __create_folder(
         self,
         project_dir: str
     ) -> None:

{reywechat-1.0.19.dist-info → reywechat-1.0.21.dist-info}/METADATA

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

reywechat-1.0.21.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=pE5gZyjQA1gLJroSKiSwUWOruWkST5LDqTURQcOeCeI,22571
+reywechat/rdb.py,sha256=W-gNO9r7vB3pBD8c_wq8iXwsMxfMpWRMQfIJi5an_aw,37700
+reywechat/rlog.py,sha256=hauobai1dxNruvohhyXHXcop3iKU88ogDAb2VstD5HM,4750
+reywechat/rreceive.py,sha256=VpvY_hTXx434ns-G5rfZyYOJa9O9ZNrylS_6qF0pAGg,31387
+reywechat/rschedule.py,sha256=gO5TbSDiOavwlZF2AAqJAcUMJ6ME0257z5UdY9HjEGI,3730
+reywechat/rsend.py,sha256=zwuvuSKg5iAGb_4EYsvQFw2Qs_5yHO1Ygbgxb7kj9NA,17946
+reywechat/rtrigger.py,sha256=ZYHRzAWVSxHz9gvK5tZQmZpjOCtl6vAuU3HmU_Tqflw,4773
+reywechat/rwechat.py,sha256=U8f8cNHJVYi1yOg0BdVM9GhYt6hcg6-SRw7itHkalvQ,5778
+reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
+reywechat-1.0.21.dist-info/METADATA,sha256=G0ztl46m8KQT27EDP6J83-lBeFoQ5di2HnIX_hTHJcA,1551
+reywechat-1.0.21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.21.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.21.dist-info/RECORD,,

reywechat-1.0.19.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=pE5gZyjQA1gLJroSKiSwUWOruWkST5LDqTURQcOeCeI,22571
-reywechat/rdb.py,sha256=sWeI7-yq87TNWZyyrNABsYIrnALC4NklpTncGtIxdiI,37687
-reywechat/rlog.py,sha256=cP1182Ax46ItSMHtq4OAAKBZvXnUcN5NXfDT_eZeHNo,4748
-reywechat/rreceive.py,sha256=iUhR4MmdP_LCA8QTjvbQ8gui30_hfezSzhKCEAwud74,31379
-reywechat/rschedule.py,sha256=gO5TbSDiOavwlZF2AAqJAcUMJ6ME0257z5UdY9HjEGI,3730
-reywechat/rsend.py,sha256=N5QkrPy67EHQIsHYJd0MCJQNSdCtYwvY9LdRSiozbjE,17910
-reywechat/rtrigger.py,sha256=5bj4_bSQn8dT2_uvFIbI0M4ngOxEvvWxi5WU6SBE4nU,4769
-reywechat/rwechat.py,sha256=dwdnjamo9h5ecLgrl-cFGEk7diwu3YZRP2zQXXynRM0,5776
-reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.19.dist-info/METADATA,sha256=nIlF8iPQ_w36b9aTsUwVRRrg5GjSk36msxtS68IJkak,1551
-reywechat-1.0.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.19.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.19.dist-info/RECORD,,